whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/widgets/dialogs
History
Liang Qi a1ad9a74eb Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	src/corelib/io/io.pri
	src/corelib/io/qdatastream.cpp
	src/corelib/io/qdatastream.h
	src/network/socket/qabstractsocket.cpp
	src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
	src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
	src/widgets/styles/qgtkstyle.cpp
	tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro
	tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro
	tests/auto/dbus/qdbusconnection/qdbusconnection.pro
	tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp

Change-Id: I347549a024eb5bfa986699e0a11f96cc55c797a7
 		2015-09-25 14:02:04 +02:00
..
qcolordialog Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qdialog Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
qerrormessage Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qfiledialog tests/auto/widgets: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). 2015-07-31 11:50:10 +00:00
qfiledialog2 Tests: Harmonize code checking on platform name. 2015-09-24 07:49:30 +00:00
qfilesystemmodel tests/auto/widgets: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). 2015-07-31 11:50:10 +00:00
qfontdialog Link to AppKit instead of Cocoa. 2015-09-05 11:49:17 +00:00
qinputdialog Update copyright headers 2015-02-11 06:49:51 +00:00
qmessagebox Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qprogressdialog Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qsidebar Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qwizard Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
dialogs.pro Replace win32-g++ with mingw scope 2014-01-17 12:08:24 +01:00