João Abecasis d065dfd454 Merge remote-tracking branch 'gerrit/master' into containers ... Conflicts: src/corelib/tools/qstring.cpp Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb		2012-02-05 21:26:33 +01:00
..
3rdparty	Remove Symbian specific code in 3rdparty.	2012-02-01 19:06:18 +01:00
concurrent	Move QtConcurrent into its own module	2012-02-05 17:49:16 +01:00
corelib	Merge remote-tracking branch 'gerrit/master' into containers	2012-02-05 21:26:33 +01:00
dbus	Adapt QtDBus to QVariant property type change	2012-02-03 15:09:03 +01:00
gui	SIC: QLocale: Remove base argument from conversion to number api	2012-02-05 17:49:56 +01:00
modules	Move QtConcurrent into its own module	2012-02-05 17:49:16 +01:00
network	MinGW: Fix warnings.	2012-02-04 08:43:38 +01:00
opengl	Revert "Put the generated <module>version.h into build tree"	2012-02-01 10:48:09 +01:00
platformsupport	Move QString <-> NSString conversion to QtCore	2012-02-02 14:18:36 +01:00
plugins	MinGW: Fix warnings.	2012-02-04 08:43:38 +01:00
printsupport	Windows: Fix inclusion of <windows.h>	2012-02-01 11:06:19 +01:00
sql	reduce cost of checking cache for data() and headerData()	2012-02-05 17:50:44 +01:00
testlib	Revert "Put the generated <module>version.h into build tree"	2012-02-01 10:48:09 +01:00
tools	Bring qmetaobjectbuilder in sync with moc	2012-02-03 15:09:03 +01:00
widgets	SIC: QLocale: Remove base argument from conversion to number api	2012-02-05 17:49:56 +01:00
winmain	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
xml	Revert "Put the generated <module>version.h into build tree"	2012-02-01 10:48:09 +01:00
qbase.pri	Moved common module profiles to be feature profiles.	2011-06-05 14:47:14 +02:00
qt_install.pri	Moved common module profiles to be feature profiles.	2011-06-05 14:47:14 +02:00
qt_targets.pri	Moved common module profiles to be feature profiles.	2011-06-05 14:47:14 +02:00
src.pro	Move QtConcurrent into its own module	2012-02-05 17:49:16 +01:00