qt6-bb10/tests/auto/corelib/kernel/qcoreapplication
Liang Qi d0a0a3c041 Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	examples/network/fortuneclient/client.cpp
	examples/network/fortuneserver/server.cpp
	src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h
	src/plugins/platforms/cocoa/qcocoabackingstore.h
	src/plugins/platforms/cocoa/qcocoaintegration.h
	src/plugins/platforms/cocoa/qcocoascreen.h
	src/plugins/platforms/ios/qiosbackingstore.h
	src/plugins/sqldrivers/oci/qsql_oci.cpp
	src/widgets/kernel/qwidgetwindow.cpp

Change-Id: Ia6dd2c52d4a691b671cf9a2ffca70deccece8f10
2017-10-17 10:34:24 +02:00
..
.gitignore Moving relevant tests to corelib/kernel 2011-09-01 12:42:14 +02:00
Info.plist Provide sensible defaults for QCoreApplication::applicationVersion 2017-01-12 02:13:21 +00:00
qcoreapplication.pro qmake: Allow non-bundle apps and libs to have an Info.plist 2017-09-29 10:08:08 +00:00
tst_qcoreapplication.cpp Replace Q_DECL_OVERRIDE with override where possible 2017-09-19 11:53:42 +00:00
tst_qcoreapplication.h Merge remote-tracking branch 'origin/5.8' into 5.9 2017-03-13 15:55:44 +01:00