AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
261c6713bd
qt5base-lts/config.tests
History
Oswald Buddenhagen ee07b912a1 Merge remote-tracking branch 'origin/5.9' into dev 
Conflicts:
	src/plugins/platforms/xcb/qxcbconnection.h
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
	src/plugins/styles/mac/qmacstyle_mac.mm
	src/widgets/widgets/qdockarealayout.cpp
	src/widgets/widgets/qmainwindow.cpp
	src/widgets/widgets/qmainwindowlayout.cpp
	src/widgets/widgets/qmainwindowlayout_p.h
	tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
	tests/auto/other/macnativeevents/BLACKLIST
	tests/auto/widgets/widgets/qmenu/BLACKLIST

Change-Id: Ic8e724b80a65e7b1af25511b0e674d209265e567
2017-08-02 22:52:32 +02:00
..
arch configure: don't force debug build for arch & cpu feature tests 2017-08-02 16:36:32 +00:00
atomicfptr configure: un-namespace remaining non-inline configure tests 2017-08-02 16:38:00 +00:00
avx512 configure: un-namespace remaining non-inline configure tests 2017-08-02 16:38:00 +00:00
common Merge remote-tracking branch 'origin/5.9' into dev 2017-08-02 22:52:32 +02:00
corewlan configure: clean up projects of remaining non-inline tests 2017-08-02 16:38:06 +00:00
gnu-libiconv configure: clean up projects of remaining non-inline tests 2017-08-02 16:38:06 +00:00
iconv configure: clean up projects of remaining non-inline tests 2017-08-02 16:38:06 +00:00
openssl configure: clean up projects of remaining non-inline tests 2017-08-02 16:38:06 +00:00
qpa/vulkan Merge remote-tracking branch 'origin/5.9' into dev 2017-08-02 22:52:32 +02:00
stl configure: clean up projects of remaining non-inline tests 2017-08-02 16:38:06 +00:00
sun-libiconv configure: clean up projects of remaining non-inline tests 2017-08-02 16:38:06 +00:00
unix Merge remote-tracking branch 'origin/5.9' into dev 2017-08-02 22:52:32 +02:00
verifyspec configure: un-namespace remaining non-inline configure tests 2017-08-02 16:38:00 +00:00
win/angle_d3d11_qdtd ANGLE: Fix build for newer MinGW versions 2017-08-02 16:38:28 +00:00
x11/xrender Merge remote-tracking branch 'origin/5.9' into dev 2017-08-02 22:52:32 +02:00
xlocalescanprint configure: clean up projects of remaining non-inline tests 2017-08-02 16:38:06 +00:00
.gitignore Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
.qmake.conf make also configure tests not see %LIB% and %INCLUDE% under mingw 2016-10-17 13:44:43 +00:00