Frederik Gladhorn c608ec8254 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/io/qsavefile_p.h src/corelib/tools/qregularexpression.cpp src/gui/util/qvalidator.cpp src/gui/util/qvalidator.h Change-Id: I58fdf0358bd86e2fad5d9ad0556f3d3f1f535825		2013-01-22 18:40:13 +01:00
..
bic/data	tst_bic: Add linux-gcc-ia32 bic data for QtXml	2013-01-16 08:25:28 +01:00
cmake	Generate instances of types in the CMake tests.	2012-10-31 07:16:03 +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-01-22 18:40:13 +01:00
dbus	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
gui	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
guiapplauncher
network	QNetworkReply auto test: also test uploading data via HTTPS	2013-01-18 17:58:48 +01:00
opengl	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
other	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +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	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
testlib	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
tools	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
widgets	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
xml	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
auto.pro	add and use qtHaveModule() function	2012-12-21 19:05:02 +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