Frederik Gladhorn dcb710dd87 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: mkspecs/features/unix/separate_debug_info.prf src/gui/kernel/qwindow_p.h src/plugins/platforms/cocoa/qcocoacursor.mm tests/auto/tools/moc/tst_moc.cpp Change-Id: Ieb57834c00f961a747ffe51e6eb9fc9612cebccf		2013-02-20 22:08:29 +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-01-28 11:10:29 +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	Check for network module when building according auto tests	2013-02-19 19:20:53 +01:00
dbus	Merge remote-tracking branch 'origin/stable' into dev	2013-01-28 11:10:29 +01:00
gui	Removed unneeded printsupport dependency from qpainter autotest	2013-02-19 19:21:03 +01:00
guiapplauncher	Update the documentation after moving examples.	2011-07-05 21:19:08 +02:00
network	Add an encrypted() signal to QNetworkAccessManager and QNetworkReply.	2013-02-19 21:37:32 +01:00
opengl	Remove duplicated code for handling OpenGL extensions in QtOpenGL	2013-02-17 20:31:30 +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	Don't run qmake test that requires macx makespec on non Mac OS platforms	2013-02-20 00:46:50 +01:00
widgets	Merge remote-tracking branch 'origin/stable' into dev	2013-02-20 22:08:29 +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	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00