AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7920cfe46a
qt5base-lts/tests/auto/other
History
Liang Qi a732576a66 Merge remote-tracking branch 'origin/5.7' into 5.8 
Conflicts:
	config.tests/win/msvc_version.cpp
	configure.pri
	mkspecs/macx-ios-clang/features/default_post.prf
	mkspecs/macx-ios-clang/features/resolve_config.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/uikit/resolve_config.prf
	src/corelib/io/qsettings_mac.cpp
	src/corelib/json/qjsondocument.cpp
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/cocoa/qnswindowdelegate.h
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	src/plugins/platforms/ios/qiosintegration.h
	src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
	tests/auto/gui/painting/qpainter/tst_qpainter.cpp
	tools/configure/environment.cpp

Change-Id: I654845e54e40f5951fb78aab349ca667e9f27843
2016-11-01 06:02:55 +01:00
..
android Updated license headers 2016-01-21 18:55:18 +00:00
atwrapper Updated license headers 2016-01-21 18:55:18 +00:00
compiler Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-05 18:47:27 +02:00
gestures autotests: use QTest::createTouchDevice() 2016-06-10 13:07:17 +00:00
lancelot Change confusing Q_DEAD_CODE_FROM_QT4_FOO define 2016-10-14 08:19:29 +00:00
languagechange Remove Windows CE from tests (others). 2016-03-31 06:14:04 +00:00
macgui Updated license headers 2016-01-21 18:55:18 +00:00
macnativeevents Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-13 15:18:02 +02:00
macplist Updated license headers 2016-01-21 18:55:18 +00:00
modeltest Updated license headers 2016-01-21 18:55:18 +00:00
networkselftest Fix/adapt the uses of {to,set,from}Time_t in the qtbase source code 2016-07-06 06:28:13 +00:00
qaccessibility Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00
qaccessibilitylinux create modularized version of qtplatformsupport module 2016-10-15 18:45:33 +00:00
qaccessibilitymac Updated license headers 2016-01-21 18:55:18 +00:00
qcomplextext Updated license headers 2016-01-21 18:55:18 +00:00
qfocusevent Updated license headers 2016-01-21 18:55:18 +00:00
qnetworkaccessmanager_and_qprogressdialog Updated license headers 2016-01-21 18:55:18 +00:00
qobjectperformance Updated license headers 2016-01-21 18:55:18 +00:00
qobjectrace Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-01 10:03:21 +02:00
qprocess_and_guieventloop Remove the traces of the discontinued android-no-sdk platform 2016-03-30 10:12:34 +00:00
qsharedpointer_and_qwidget Updated license headers 2016-01-21 18:55:18 +00:00
qtokenautomaton Tests: Add more QChar::unicode() calls to brush over deprecation warning. 2016-04-08 09:26:40 +00:00
qvariant_common Updated license headers 2016-01-21 18:55:18 +00:00
toolsupport QDateTimePrivate: merge the time spec, DST status and validity flags 2016-06-10 17:56:18 +00:00
other.pro Modularize configure.json/.pri 2016-09-15 08:23:53 +00:00