AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
dfc177e3a9
qt5base-lts/tests/auto
History
Liang Qi dfc177e3a9 Merge remote-tracking branch 'origin/5.8' into dev 
Conflicts:
	qmake/library/qmakeevaluator.cpp
	(cherry picked from commit 1af6dc2c8fb4d91400fddc5050166f972ae57c9a in qttools)
	src/corelib/kernel/qcore_mac_objc.mm
	src/gui/painting/qcolor.h
	src/plugins/platforms/cocoa/qcocoawindow.mm

Change-Id: I5b3ec468a5a9a73911b528d3d24ff8e19f339f31
2016-10-13 09:49:38 +02:00
..
android Updated license headers 2016-01-21 18:55:18 +00:00
bic/data BIC data files for QtBase for Qt 5.7 2016-10-03 09:38:59 +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 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-25 16:12:11 +02:00
corelib Merge remote-tracking branch 'origin/5.8' into dev 2016-10-13 09:49:38 +02:00
dbus Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00
gui Revert "Combine device and point id into 32 bit point id" 2016-10-11 08:05:52 +00: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.8' into dev 2016-10-13 09:49:38 +02:00
opengl winrt: Add tests to blacklist 2016-09-07 04:54:28 +00:00
other Merge remote-tracking branch 'origin/5.8' into dev 2016-09-29 12:58:41 +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 5.8 2016-09-21 11:57:52 +02:00
testlib Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-21 11:57:52 +02:00
tools remove unnecessary references to $$QMAKE_CFLAGS_DBUS 2016-10-04 20:21:28 +00:00
widgets Merge remote-tracking branch 'origin/5.7' into 5.8 2016-10-11 07:40:32 +02:00
xml Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-29 00:38:01 +02:00
auto.pro Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +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