AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a732576a66
qt5base-lts/tests/auto/corelib/io
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
..
largefile QtCore: Remove Windows CE. 2016-03-30 11:22:47 +00:00
qabstractfileengine Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
qbuffer Updated license headers 2016-01-21 18:55:18 +00:00
qdatastream Merge remote-tracking branch 'origin/5.7' into dev 2016-08-01 18:20:00 +02:00
qdataurl Updated license headers 2016-01-21 18:55:18 +00:00
qdebug Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02:00
qdir Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
qdiriterator Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
qfile Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
qfileinfo Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
qfileselector Fix QFileSelectorPrivate::addStatics() 2016-02-12 14:10:29 +00:00
qfilesystementry Updated license headers 2016-01-21 18:55:18 +00:00
qfilesystemwatcher Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
qiodevice Revert blacklisting of two tests now the fix is in 2016-05-30 17:39:37 +00:00
qipaddress Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-13 06:55:37 +02:00
qlockfile Add support for Apple tvOS 2016-05-17 16:11:23 +00:00
qloggingcategory Updated license headers 2016-01-21 18:55:18 +00:00
qloggingregistry Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
qnodebug Updated license headers 2016-01-21 18:55:18 +00:00
qprocess Merge remote-tracking branch 'origin/5.7' into dev 2016-08-16 07:58:32 +02:00
qprocess-noapplication Updated license headers 2016-01-21 18:55:18 +00:00
qprocessenvironment QtCore: Remove Windows CE. 2016-03-30 11:22:47 +00:00
qresourceengine Remove the traces of the discontinued android-no-sdk platform 2016-03-30 10:12:34 +00:00
qsavefile Updated license headers 2016-01-21 18:55:18 +00:00
qsettings Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-22 21:19:57 +02:00
qstandardpaths Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
qstorageinfo Merge remote-tracking branch 'origin/5.7' into dev 2016-05-23 21:09:46 +02:00
qtemporarydir Merge remote-tracking branch 'origin/5.7' into dev 2016-08-01 18:20:00 +02:00
qtemporaryfile Merge remote-tracking branch 'origin/5.7' into dev 2016-08-01 18:20:00 +02:00
qtextstream Revert blacklisting of two tests now the fix is in 2016-05-30 17:39:37 +00:00
qurl Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-05 08:58:48 +02:00
qurlinternal Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00
qurlquery Updated license headers 2016-01-21 18:55:18 +00:00
qwinoverlappedionotifier Updated license headers 2016-01-21 18:55:18 +00:00
io.pro Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00