Frederik Gladhorn d3a8bc803c Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/io/qdatastream.cpp src/corelib/io/qdatastream.h src/corelib/json/qjsonwriter.cpp src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbkeyboard.cpp Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62		2013-05-23 21:27:07 +02:00
..
android	Fix Qt tests for Android.	2013-04-03 10:15:40 +02:00
bic/data	Get rid of this hack where QAccessible inherits from QObject.	2013-04-26 23:27:18 +02:00
cmake	Only expect EGL libraries in the cmake files if Qt is configured to use it.	2013-05-07 22:43:14 +02:00
compilerwarnings/data	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
concurrent	QtConcurrent tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:25 +01:00
corelib	Merge remote-tracking branch 'origin/stable' into dev	2013-05-23 21:27:07 +02:00
dbus	QDBus: Add test for a{sv} and an annotation pointing to QVariantHash.	2013-05-10 09:03:29 +02:00
gui	Merge remote-tracking branch 'origin/stable' into dev	2013-05-23 21:27:07 +02:00
guiapplauncher	Update the documentation after moving examples.	2011-07-05 21:19:08 +02:00
network	QSslConfiguration: add API to persist and resume SSL sessions	2013-05-10 09:15:55 +02:00
opengl	Process initial expose events immediately.	2013-05-23 12:49:39 +02:00
other	Do not include the treeview header if its hidden	2013-04-25 17:56:26 +02:00
printsupport	QPrintPreviewDialog: Prevent changing of page in resize handling.	2013-05-23 09:31:27 +02:00
shared	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
sql	Cleanup the SQL tests	2013-04-25 19:59:16 +02:00
testlib	QtTest tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:20 +01:00
tools	moc: Fix Generator::registerableMetaType	2013-05-20 12:06:48 +02:00
widgets	Merge remote-tracking branch 'origin/stable' into dev	2013-05-23 21:27:07 +02:00
xml	QtXml tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:48 +01:00
auto.pro	Check for printsupport module when building according auto tests	2013-02-19 19:20:58 +01:00
network-settings.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtest-config.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
test.pl	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00