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
..
mingw_make.cpp	qmake: Separate object_script by Makefile name	2017-07-07 08:11:44 +00:00
mingw_make.h	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01:00
msbuild_objectmodel.cpp	qmake: Delete unused variables in MSBuild object model	2017-06-12 10:47:13 +00:00
msbuild_objectmodel.h	Merge remote-tracking branch 'origin/5.8' into dev	2017-01-25 20:06:06 +01:00
msvc_nmake.cpp	VS 2017: Fall back to "x86" as arch if it is not "arm" or "x64"	2017-05-03 06:52:29 +00:00
msvc_nmake.h	qmake/nmake: Prevent overlong lines in link and lib response files	2017-02-13 14:48:15 +00:00
msvc_objectmodel.cpp	Merge remote-tracking branch 'origin/5.9' into dev	2017-06-19 16:12:34 +02:00
msvc_objectmodel.h	Remove support for WinRT 8.1 and Windows Phone 8.1	2017-01-18 12:38:56 +00:00
msvc_vcproj.cpp	Merge remote-tracking branch 'origin/5.9' into dev	2017-08-02 22:52:32 +02:00
msvc_vcproj.h	Fix unnecessary regeneration of mocables in VS projects	2016-12-21 16:35:22 +00:00
msvc_vcxproj.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
msvc_vcxproj.h	Updated license headers	2016-01-21 18:55:18 +00:00
registry_p.h	move "shared" registry reading code into qmake	2016-12-23 13:45:50 +00:00
registry.cpp	move "shared" registry reading code into qmake	2016-12-23 13:45:50 +00:00
winmakefile.cpp	make mkspecs not mess up library and include search paths	2017-05-31 12:57:09 +00:00
winmakefile.h	Updated license headers	2016-01-21 18:55:18 +00:00