AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
511790fd1a
qt5base-lts/tests/auto/corelib
History
Liang Qi 511790fd1a Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	config_help.txt
	configure
	mkspecs/features/uikit/sdk.prf
	src/corelib/global/qhooks.cpp
	src/corelib/io/qfilesystemwatcher.cpp
	src/corelib/io/qlockfile_unix.cpp
	src/corelib/tools/qalgorithms.h
	src/gui/kernel/qwindowsysteminterface.h
	src/gui/text/qtextdocument_p.cpp
	src/network/access/access.pri
	src/network/access/qnetworkaccessmanager.cpp
	src/network/access/qnetworkreplynsurlconnectionimpl.mm
	src/src.pro
	src/testlib/qtestcase.cpp
	src/widgets/kernel/qwidgetbackingstore_p.h
	src/widgets/styles/qwindowscestyle.cpp
	src/widgets/styles/qwindowsmobilestyle.cpp
	tests/auto/corelib/io/qdiriterator/qdiriterator.pro
	tests/auto/corelib/io/qfileinfo/qfileinfo.pro
	tests/auto/gui/kernel/qwindow/BLACKLIST
	tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
	tools/configure/configureapp.cpp

Change-Id: Ibf7fb9c8cf263a810ade82f821345d0725c57c67
2016-06-13 12:46:46 +02:00
..
animation QtCore: Remove Windows CE. 2016-03-30 11:22:47 +00:00
codecs QtCore: Remove Windows CE. 2016-03-30 11:22:47 +00:00
global Merge remote-tracking branch 'origin/5.7' into dev 2016-04-05 14:22:45 +02:00
io Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
itemmodels QtCore: Remove Windows CE. 2016-03-30 11:22:47 +00:00
json QJsonObject: add some overloads taking QLatin1String 2016-05-10 21:18:46 +00:00
kernel Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
mimetypes Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-27 09:18:05 +02:00
plugin Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
statemachine Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev 2016-01-26 11:27:37 +00:00
thread Merge remote-tracking branch 'origin/5.7' into dev 2016-04-05 14:22:45 +02:00
tools Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
xml Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02:00
corelib.pro Add support for Apple tvOS 2016-05-17 16:11:23 +00:00