AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a1ad9a74eb
qt5base-lts/tests/auto/other
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
..
android Update copyright headers 2015-02-11 06:49:51 +00:00
atwrapper Update copyright headers 2015-02-11 06:49:51 +00:00
compiler Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
gestures Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
lancelot Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
languagechange Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
macgui Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
macnativeevents Various tests: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b). 2015-07-28 13:18:55 +00:00
macplist Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
modeltest qtbase tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0 for simple cases. 2015-08-31 19:56:59 +00:00
networkselftest Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qaccessibility Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
qaccessibilitylinux Update copyright headers 2015-02-11 06:49:51 +00:00
qaccessibilitymac Link to AppKit instead of Cocoa. 2015-09-05 11:49:17 +00:00
qcomplextext Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qfocusevent Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qnetworkaccessmanager_and_qprogressdialog Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qobjectperformance Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qobjectrace Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qprocess_and_guieventloop Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qsharedpointer_and_qwidget Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qtokenautomaton Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qvariant_common Update copyright headers 2015-02-11 06:49:51 +00:00
toolsupport Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
windowsmobile Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
other.pro fix usage of wince scope 2015-06-05 10:29:10 +00:00