Go to file
Samuel Rødal 2ab9b747fc Merge remote-tracking branch 'gerrit/release' into stable
Conflicts:
	configure
	mkspecs/features/qt_module_headers.prf
	mkspecs/features/qt_tool.prf
	src/angle/angle.pro
	src/tools/bootstrap/bootstrap.pro
	tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp

Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0
2013-03-21 08:49:01 +01:00
bin Merge remote-tracking branch 'gerrit/release' into stable 2013-03-21 08:49:01 +01:00
config.tests Whitespace cleanup: remove trailing whitespace 2013-03-16 20:22:50 +01:00
dist Merge remote-tracking branch 'origin/stable' into dev 2013-03-05 13:42:11 +01:00
doc Whitespace cleanup: remove trailing whitespace 2013-03-16 20:22:50 +01:00
examples PaintedWindow example: Use standard window flags. 2013-03-18 21:59:31 +01:00
lib Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
mkspecs Merge remote-tracking branch 'gerrit/release' into stable 2013-03-21 08:49:01 +01:00
qmake Merge remote-tracking branch 'gerrit/release' into stable 2013-03-21 08:49:01 +01:00
src Merge remote-tracking branch 'gerrit/release' into stable 2013-03-21 08:49:01 +01:00
tests Merge remote-tracking branch 'gerrit/release' into stable 2013-03-21 08:49:01 +01:00
tools Merge remote-tracking branch 'gerrit/release' into stable 2013-03-21 08:49:01 +01:00
util Whitespace cleanup: remove trailing whitespace 2013-03-16 20:22:50 +01:00
.gitattributes Update the git-archive export options 2012-09-07 15:39:31 +02:00
.gitignore Long live QLockFile 2013-03-05 06:26:33 +01:00
.qmake.conf require modules to define their version 2013-03-06 18:01:13 +01:00
.tag Update the git-archive export options 2012-09-07 15:39:31 +02:00
configure Merge remote-tracking branch 'gerrit/release' into stable 2013-03-21 08:49:01 +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 create tool pri file for syncqt 2013-02-11 18:00:12 +01:00
sync.profile Hide Harfbuzz from the outer world 2013-03-13 14:46:26 +01:00