qt5base-lts/tests/auto/corelib/tools/qlocale
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
..
syslocaleapp Updated license headers 2016-01-21 18:55:18 +00:00
test macOS: Don't build auto-tests as application bundles unless explicitly requested 2016-10-23 10:39:56 +00:00
.gitignore Moving relevant tests to corelib/tools 2011-09-01 13:07:23 +02:00
qlocale.pro Fix compilation for WinRT 2015-12-14 08:43:15 +00:00
tst_qlocale.cpp Merge remote-tracking branch 'origin/5.9' into dev 2017-08-02 22:52:32 +02:00