Created
April 11, 2017 09:06
-
-
Save liangqi/afd4dea47e7ee84e017f4113844df5b1 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
~/dev/git/qt5$ ./qtrepotools/bin/git-qt-merge-mainlines -f 5.8 -t 5.9 -s | |
Qt Project merge tool | |
WARNING: qtdocgallery is not checked out | |
WARNING: qtenginio is not checked out | |
WARNING: qtfeedback is not checked out | |
WARNING: qtpim is not checked out | |
skipping qtqa | |
WARNING: qtquick1 is not checked out | |
skipping qtrepotools | |
WARNING: qtsystems is not checked out | |
WARNING: qtwebkit is not checked out | |
WARNING: qtwebkit-examples is not checked out | |
Submodules: ['qt3d', 'qtactiveqt', 'qtandroidextras', 'qtbase', 'qtcanvas3d', 'qtcharts', 'qtconnectivity', 'qtdatavis3d', 'qtdeclarative', 'qtdoc', 'qtgamepad', 'qtgraphicaleffects', 'qtimageformats', 'qtlocation', 'qtmacextras', 'qtmultimedia', 'qtnetworkauth', 'qtpurchasing', 'qtquickcontrols', 'qtquickcontrols2', 'qtremoteobjects', 'qtscript', 'qtscxml', 'qtsensors', 'qtserialbus', 'qtserialport', 'qtspeech', 'qtsvg', 'qttools', 'qttranslations', 'qtvirtualkeyboard', 'qtwayland', 'qtwebchannel', 'qtwebengine', 'qtwebsockets', 'qtwebview', 'qtwinextras', 'qtx11extras', 'qtxmlpatterns'] | |
Ignored submodules: ['qtdocgallery', 'qtenginio', 'qtfeedback', 'qtpim', 'qtquick1', 'qtsystems', 'qtwebkit', 'qtwebkit-examples'] | |
Module: qt3d | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qt3d | |
Module: qtactiveqt | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qtactiveqt | |
Module: qtandroidextras | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qtandroidextras | |
Module: qtbase | |
Merge from origin/5.8 to origin/5.9 : | |
+ 5e76cb16924a42cb020786f45cc3494dd5836c5c Fix menu position when highdpi scaling | |
+ 872bff5b24ded4a5dfecad96df907f32830a980a Enable a given SIMD feature if the compiler has enabled it | |
+ 4a6cb89f2944b5d8ee3e50fd3a2085eba9189680 Fix reusing FTP connection after abort | |
+ 944bf6867f8360e7ec79f542f65b4ea556ecc4e5 Add more information about how to get a QString from qgetenv | |
+ 07bd5a90a3dccaa31940e3b1a78069f55e25405a Fix hidpi support for opengl window grabbing | |
+ 75cdf654bcc192ba73a8834e507583a59140e7e4 QMap: fix UB (invalid cast) in QMapData::end() | |
+ 9d1203bf02abec8b5ab73c4c8a81eb4627336ad8 QVariant: fix docs regarding QUuid | |
+ 2099709a721e2bc72350a02757099df6629475ca Fix build: Remove unused variable | |
+ 6c4cbd4122edf8b78f34778400d485b11da98404 Android: Fix crash at exit | |
+ 187427c0aec83deb08c9bd6466b5803089bd2c93 Use latest stable version of the android:gradle plugin | |
10 patches to be merged in qtbase | |
Module: qtcanvas3d | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qtcanvas3d | |
Module: qtcharts | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qtcharts | |
Module: qtconnectivity | |
Merge from origin/5.8 to origin/5.9 : | |
+ 42496770e96334efdce9c29410051695be3310fb QBluetoothSocket/bluez: fix QString::arg() usage | |
+ 519ac44fbbeed7ab74fc1f733fcf9057075d0946 LE/Android: fix status code descriptions | |
2 patches to be merged in qtconnectivity | |
Module: qtdatavis3d | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qtdatavis3d | |
Module: qtdeclarative | |
Merge from origin/5.8 to origin/5.9 : | |
+ c2ca2cbf04071ffb3aee6af8d5ab9084dfa1c091 Fix touch event delivery in childMouseEventFilter | |
+ 29bf17dee1497972152566af6916fd0a20b784ee Fix build with GCC 7 | |
+ 3caf24c514e7b5dfe62dc656d48282f3816dd6cc Prospective fix for static builds on Windows with QtQuickCompiler | |
+ ab0c47e5ef03eab9c80246e4d5c1af53a29ab0e1 Add missing override specifiers | |
+ 617d6dc2017f49a84e4aeb15a40d78462be62326 Fix hidpi support for opengl window grabbing | |
+ d438be92dd7068fef94ce98e1ec039fe0ef4f3b3 Avoid access to declarativeData when isDeletingChildren is set | |
6 patches to be merged in qtdeclarative | |
Module: qtdoc | |
Merge from origin/5.8 to origin/5.9 : | |
+ 2337a01600ec81a70c8711a7c37a8e55bc14d121 Improve “Adding OpenSSL Support” page | |
1 patches to be merged in qtdoc | |
Module: qtgamepad | |
Merge from origin/5.8 to origin/5.9 : | |
+ 752d4319660daf69c725103dae5325cf898adbb5 Fix build with -no-feature-library | |
1 patches to be merged in qtgamepad | |
Module: qtgraphicaleffects | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qtgraphicaleffects | |
Module: qtimageformats | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qtimageformats | |
Module: qtlocation | |
Merge from origin/5.8 to origin/5.9 : | |
+ 06c473d9dfe162a1e55a1ebbc68ff89f4cd9a8ea Doc: corrected link to Models and Views in Qt Quick | |
+ 0023c72390d7055a1446f8fb38e0415be134f501 example: use the compiler | |
2 patches to be merged in qtlocation | |
Module: qtmacextras | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qtmacextras | |
Module: qtmultimedia | |
Merge from origin/5.8 to origin/5.9 : | |
+ dded5ca17812123cea3b6566891376f83036aab8 Don't set library paths if !QT_CONFIG(library) | |
+ d8f055f8940b8ae2b1196ea0968ce0a942bab8ab DirectShow: support audio and video codec metadata | |
+ 70365a798c95db8ccf2c52def3f2d0da6199a8cf Android: Add logging category | |
+ 4da8ca2397f0b5ca87c1915fc29e185d57e9020c Android: Add convenience method for checking and requesting permissions | |
+ fb1c0b7448ca48c1b1f21dfc1cd7cfed8b7d8c07 GStreamer: Fix position value at EndOfMedia | |
+ ceedee9a933697ef6a3db758adb57e03f42189eb GStreamer: improve the list of default recording formats | |
+ 954a85a1b3fb704a2b8590467e010300faee6798 Android: Add run-time permission check for recording | |
+ d5d7dcfb15c0b5c5e9009b83fba922ea0b7e86f5 OpenSL ES: Added run-time permission checks for recording on Android | |
8 patches to be merged in qtmultimedia | |
Module: qtnetworkauth | |
Merge from origin/5.8 to origin/5.9 : | |
+ decac344458ddd45ec8f03d721d40795c7095404 Fix HTML response when using multibyte characters | |
+ 034b35a3bcbc34509f77b46d3754196c9d53552d Let the users change the path for the callback-url | |
2 patches to be merged in qtnetworkauth | |
Module: qtpurchasing | |
Merge from origin/5.8 to origin/5.9 : | |
+ 1e16d026f1081ce132b999f0704ceeec269f3afd Doc: language review Qt Purchasing | |
1 patches to be merged in qtpurchasing | |
Module: qtquickcontrols | |
Merge from origin/5.8 to origin/5.9 : | |
+ edc24e3cd75eaf02a587f50b14dbd0288447179d Fix "Unable to assign Object to QString" warning | |
+ 378bd7b4454a5a049072ae1043981984f30e8329 Add NOTIFY signals for WheelArea | |
2 patches to be merged in qtquickcontrols | |
Module: qtquickcontrols2 | |
Merge from origin/5.8 to origin/5.9 : | |
+ eba62334a9b646f61e73b5b734ec5971e56d672a Material: use proper layout of the buttons in the DialogButtonBox | |
+ 91e29613f9671989455345a01da9f840a98d06f9 Material: fix vertical paddings of the DialogButtonBox | |
2 patches to be merged in qtquickcontrols2 | |
Module: qtremoteobjects | |
Merge from origin/5.8 to origin/5.9 : | |
fatal: Unknown commit origin/5.8 | |
ERROR: Command execution failed: Command '['git', 'cherry', 'origin/5.9', 'origin/5.8', '-v']' returned non-zero exit status 128 | |
Traceback (most recent call last): | |
File "./qtrepotools/bin/git-qt-merge-mainlines", line 289, in process_modules | |
File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/subprocess.py", line 573, in check_output | |
raise CalledProcessError(retcode, cmd, output=output) | |
CalledProcessError: Command '['git', 'cherry', 'origin/5.9', 'origin/5.8', '-v']' returned non-zero exit status 128 | |
Module: qtscript | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qtscript | |
Module: qtscxml | |
Merge from origin/5.8 to origin/5.9 : | |
+ 75cb3ffebcc7c1e617e3ba4b85adb147e30ca36e Kill the timer when we no longer need it | |
1 patches to be merged in qtscxml | |
Module: qtsensors | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qtsensors | |
Module: qtserialbus | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qtserialbus | |
Module: qtserialport | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qtserialport | |
Module: qtspeech | |
Merge from origin/5.8 to origin/5.9 : | |
+ 4320724b8acd83aa4a398e7e7f42e8c1e0ee1976 hello_speak example: Fix enum value used in boolean context | |
1 patches to be merged in qtspeech | |
Module: qtsvg | |
Merge from origin/5.8 to origin/5.9 : | |
+ 02ed4c65618b0f27b9ccb6867ab4d633612415c8 QSvgIconEngine: Paint correct size if device pixel ratio is fractional | |
1 patches to be merged in qtsvg | |
Module: qttools | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qttools | |
Module: qttranslations | |
Merge from origin/5.8 to origin/5.9 : | |
+ d90ae3caa88eeed99d70eb08873316e8432a64a6 Update some danish Qt translations | |
1 patches to be merged in qttranslations | |
Module: qtvirtualkeyboard | |
Merge from origin/5.8 to origin/5.9 : | |
+ 750030a93549b89ad5840faffd472b77c21e5780 pinyin: depends on pthread | |
+ 19c3a43e8a7d3ea1298099aa733f734a6224ac81 switch to new way to refer to libdl | |
2 patches to be merged in qtvirtualkeyboard | |
Module: qtwayland | |
Merge from origin/5.8 to origin/5.9 : | |
+ 53c1cbcdae80f7036f0d1b8bd8dffbdc70ff3a9e Fix brcm-egl build by correcting commit() usage | |
+ 4ad9b883e6db3af33ccbc87326cd162827af1393 Fix crash when assigning nullptr to ShellSurfaceItem.shellSurface | |
+ 67a4ac258e63bb38a4efe3109e1de1a7733127c9 Doc: Fix external links to wayland-ivi project | |
+ a92eab837f7a7088ddd26bda2bb10d47c9c12142 switch to new way to refer to libdl | |
4 patches to be merged in qtwayland | |
Module: qtwebchannel | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qtwebchannel | |
Module: qtwebengine | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qtwebengine | |
Module: qtwebsockets | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qtwebsockets | |
Module: qtwebview | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qtwebview | |
Module: qtwinextras | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qtwinextras | |
Module: qtx11extras | |
Merge from origin/5.8 to origin/5.9 : | |
0 patches to be merged in qtx11extras | |
Module: qtxmlpatterns | |
Merge from origin/5.8 to origin/5.9 : | |
+ 2e07221d52162231755d1bd521478a899f47da19 Mark missing implicit fallthroughs | |
+ f799a226b1025bf7158bc00dff35ee060f57a137 Cleanup implicit fallthroughs in xmlpatterns | |
2 patches to be merged in qtxmlpatterns | |
Submodules that are not checked out and are ignored: | |
qtdocgallery qtenginio qtfeedback qtpim qtquick1 qtsystems qtwebkit qtwebkit-examples |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment