qt5base-lts/tests/auto
Lars Knoll 1e49914fee Merge remote-tracking branch 'origin/api_changes'
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qlogging.cpp
	src/gui/kernel/qguiapplication.h
	src/gui/kernel/qwindow.cpp
	src/gui/kernel/qwindow.h
	tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp

Change-Id: I62a8805577a7940d4d36bed985eb3e7019d22f2e
2012-05-03 12:26:09 +02:00
..
cmake Never attempt to run the dbus tests on APPLE. 2012-05-01 07:10:23 +02:00
compilerwarnings/data Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
concurrent Remove insignification from QtConcurrentFilter test. 2012-04-19 13:26:51 +02:00
corelib Merge remote-tracking branch 'origin/api_changes' 2012-05-03 12:26:09 +02:00
dbus Fix unit confusion in ccf3b9e48b2d773999a9a88e249f79380618cde6 2012-05-02 22:49:26 +02:00
gui Don't use obsolete qVariantValue, qVariantCanConvert, etc. 2012-05-02 08:30:59 +02:00
guiapplauncher Update the documentation after moving examples. 2011-07-05 21:19:08 +02:00
network tst_qdnslookup: disabled broken testdata 2012-05-03 06:08:49 +02:00
opengl Re-enable QGLThreads autotest on Mac OS X. 2012-04-19 13:26:51 +02:00
other Don't use obsolete qVariantValue, qVariantCanConvert, etc. 2012-05-02 08:30:59 +02:00
printsupport Re-enable QPrinterInfo test on Mac OS X. 2012-04-19 04:13:04 +02:00
shared Added some convenience API for platform input contexts 2012-04-01 20:13:51 +02:00
sql Don't use obsolete qVariantValue, qVariantCanConvert, etc. 2012-05-02 08:30:59 +02:00
testlib Merge remote-tracking branch 'origin/master' into api_changes 2012-04-10 15:31:45 +02:00
tools Merge remote-tracking branch 'origin/api_changes' 2012-05-03 12:26:09 +02:00
widgets Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtWidgets] 2012-05-03 06:10:20 +02:00
xml Merge remote-tracking branch 'origin/master' into api_changes 2012-04-16 12:04:34 +02:00
auto.pro Re-enable network tests on Mac OS. 2012-04-24 16:06:28 +02:00
network-settings.h Don't require exact IMAP server version in autotests 2012-04-03 12:45:46 +02:00
platformquirks.h Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
test.pl Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00