Frederik Gladhorn 49a2ec05b4 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/plugins/platforms/qnx/qqnxscreen.cpp src/plugins/platforms/windows/qwindowsdialoghelpers.cpp Change-Id: Ib64f21c077b54f2291d19187590bfe869b98477a		2013-03-06 14:38:07 +01:00
..
android	Add missing license header	2013-03-05 08:31:23 +01:00
bic/data	Remove QPointerBase bic check.	2013-02-13 15:06:53 +01:00
cmake	Merge remote-tracking branch 'origin/stable' into dev	2013-03-05 13:42:11 +01:00
compilerwarnings/data	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
concurrent	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
corelib	Merge remote-tracking branch 'origin/stable' into dev	2013-03-06 14:38:07 +01:00
dbus	Add QDBusReply::error() const.	2013-03-01 09:39:23 +01:00
gui	Merge remote-tracking branch 'origin/stable' into dev	2013-03-05 13:42:11 +01:00
guiapplauncher	Update the documentation after moving examples.	2011-07-05 21:19:08 +02:00
network	Merge remote-tracking branch 'origin/stable' into dev	2013-03-06 14:38:07 +01:00
opengl	Merge remote-tracking branch 'origin/stable' into dev	2013-03-05 13:42:11 +01:00
other	Check for network module when building according auto tests	2013-02-19 19:20:53 +01:00
printsupport	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
shared	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
sql	Merge remote-tracking branch 'origin/stable' into dev	2013-02-18 16:14:52 +01:00
testlib	Merge remote-tracking branch 'origin/stable' into dev	2013-01-28 11:10:29 +01:00
tools	Merge remote-tracking branch 'origin/stable' into dev	2013-03-05 13:42:11 +01:00
widgets	Merge remote-tracking branch 'origin/stable' into dev	2013-03-05 13:42:11 +01:00
xml	Check for network module when building according auto tests	2013-02-19 19:20:53 +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	Fix test script	2013-02-27 18:02:22 +01:00