AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
511790fd1a
qt5base-lts/tests/auto
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
..
android Updated license headers 2016-01-21 18:55:18 +00:00
bic/data
cmake Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
compilerwarnings/data Updated license headers 2016-01-21 18:55:18 +00:00
concurrent QtConcurrentRun: add unittest for polling for isFinished() 2016-02-15 13:53:57 +00:00
corelib Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
dbus Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
gui Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
guiapplauncher
installed_cmake
network Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
opengl Merge remote-tracking branch 'origin/5.6.1' into 5.6 2016-06-02 06:01:25 +02:00
other Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
printsupport Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-29 12:34:31 +01:00
shared Updated license headers 2016-01-21 18:55:18 +00:00
sql Adding notification feature to SQLite driver 2016-04-21 10:56:24 +00:00
testlib Merge remote-tracking branch 'origin/5.7' into dev 2016-05-23 21:09:46 +02:00
tools Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
widgets Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
xml Remove Windows CE from tests (others). 2016-03-31 06:14:04 +00:00
auto.pro Add support for Apple tvOS 2016-05-17 16:11:23 +00:00
network-settings.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
test.pl Updated license headers 2016-01-21 18:55:18 +00:00