AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ea438b2508
qt5base-lts/tests/auto
History
Liang Qi ea438b2508 Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qsysinfo.h
	src/corelib/kernel/qcoreapplication_win.cpp
	src/gui/text/qdistancefield.cpp
	src/gui/text/qdistancefield_p.h
	src/plugins/platforms/windows/qwindowsglcontext.cpp
	src/plugins/platforms/windows/qwindowsglcontext.h

Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978
2016-06-21 08:39:41 +02:00
..
android Updated license headers 2016-01-21 18:55:18 +00:00
bic/data bic: Add 5.{1,2,3,4}.0 bic data for linux-gcc-amd64 2015-02-14 06:54:20 +00:00
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-17 10:53:42 +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-21 08:39:41 +02:00
guiapplauncher Fix path to examples part of tst_GuiAppLauncher 2015-02-13 07:28:15 +00:00
installed_cmake
network Merge remote-tracking branch 'origin/5.7' into dev 2016-06-21 08:39:41 +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 Merge remote-tracking branch 'origin/5.7' into dev 2016-06-21 08:39:41 +02:00
testlib Merge remote-tracking branch 'origin/5.7' into dev 2016-05-23 21:09:46 +02:00
tools Improve error reporting when parsing JSON files 2016-06-17 16:11:11 +00:00
widgets Merge remote-tracking branch 'origin/5.7' into dev 2016-06-17 10:53:42 +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