Go to file
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
bin fixqt4headers: Fix typo in QtMultimedia headers module name 2013-01-18 17:58:48 +01:00
config.tests Merge remote-tracking branch 'origin/stable' into dev 2013-01-22 18:40:13 +01:00
dist Merge remote-tracking branch 'origin/stable' into dev 2013-01-16 01:22:45 +01:00
doc Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
examples Merge remote-tracking branch 'origin/stable' into dev 2013-01-22 18:40:13 +01:00
lib Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
mkspecs Merge remote-tracking branch 'origin/stable' into dev 2013-01-22 18:40:13 +01:00
qmake Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
src Merge remote-tracking branch 'origin/stable' into dev 2013-01-22 18:40:13 +01:00
tests Merge remote-tracking branch 'origin/stable' into dev 2013-01-22 18:40:13 +01:00
tools Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
util Merge remote-tracking branch 'origin/stable' into dev 2013-01-22 18:40:13 +01:00
.gitattributes Update the git-archive export options 2012-09-07 15:39:31 +02:00
.gitignore Add qmake generated files to .gitignore. 2012-12-19 21:31:58 +01:00
.qmake.conf don't auto-install example sources by default for all modules 2012-12-03 15:56:28 +01:00
.tag Update the git-archive export options 2012-09-07 15:39:31 +02:00
configure Merge remote-tracking branch 'origin/stable' into dev 2013-01-22 18:40:13 +01:00
configure.bat Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.BSD Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.FDL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.LGPL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.LGPL-ONLY Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
INSTALL fix links in INSTALL 2012-10-10 08:45:22 +02:00
LGPL_EXCEPTION.txt Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
LICENSE.FDL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.GPL Add the LICENSE.GPL file to the module referenced from license headers 2012-05-20 22:41:08 +02:00
LICENSE.LGPL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
LICENSE.PREVIEW.COMMERCIAL Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
qtbase.pro rewrite default spec handling 2012-11-01 20:17:57 +01:00
sync.profile Remove compat, obsolete headers 2012-12-19 23:43:25 +01:00