AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
0aa2d318b1
qt5base-lts/tests/auto
History
Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev 
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qglobal.h
	src/corelib/global/qsysinfo.h
	src/corelib/global/qsystemdetection.h
	src/corelib/kernel/qobjectdefs.h
	src/plugins/plugins.pro
	tests/auto/widgets/itemviews/qlistview/qlistview.pro

Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c
2015-07-01 11:05:26 +02:00
..
android Update copyright headers 2015-02-11 06:49:51 +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 CMake: Fix regression with quoted OPTIONS parameter 2015-03-11 07:31:33 +00:00
compilerwarnings/data Fixed license headers 2015-02-17 18:46:09 +00:00
concurrent Fix build of tests on QNX. 2015-03-14 07:05:34 +00:00
corelib Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +02:00
dbus Extend flakeyness of tst_QDBusAbstractAdaptor::overloadedSignalEmission(int) 2015-06-20 15:26:10 +00:00
gui Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +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.5' into dev 2015-07-01 11:05:26 +02:00
opengl Blacklist and skip various tests that are flakey 2015-06-14 10:50:45 +00:00
other Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +02:00
printsupport Update copyright headers 2015-02-11 06:49:51 +00:00
shared Update copyright headers 2015-02-11 06:49:51 +00:00
sql Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +02:00
testlib Output registered enumeration names in QCOMPARE. 2015-06-12 07:48:22 +00:00
tools Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +02:00
widgets Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +02:00
xml Remove exec bits from files that should not be executable 2015-06-07 22:50:19 +00:00
auto.pro fix usage of wince scope 2015-06-05 10:29:10 +00:00
network-settings.h Update copyright headers 2015-02-11 06:49:51 +00:00
qtest-config.h Update copyright headers 2015-02-11 06:49:51 +00:00
test.pl Update copyright headers 2015-02-11 06:49:51 +00:00