Go to file
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
bin Merge remote-tracking branch 'origin/stable' into dev 2013-02-14 14:24:57 +01:00
config.tests Clean up how we build against SDKs on Mac OS 2013-02-19 07:56:34 +01:00
dist Merge remote-tracking branch 'origin/stable' into dev 2013-02-18 16:14:52 +01:00
doc Merge remote-tracking branch 'origin/stable' into dev 2013-02-18 16:14:52 +01:00
examples Merge remote-tracking branch 'origin/stable' into dev 2013-02-14 14:24:57 +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-02-20 22:08:29 +01:00
qmake Unify win32-g++ and Unix qmake Makefiles. 2013-02-19 10:35:06 +01:00
src Merge remote-tracking branch 'origin/stable' into dev 2013-02-20 22:08:29 +01:00
tests Merge remote-tracking branch 'origin/stable' into dev 2013-02-20 22:08:29 +01:00
tools Merge remote-tracking branch 'origin/stable' into dev 2013-02-20 22:08:29 +01:00
util Merge remote-tracking branch 'origin/stable' into dev 2013-02-14 14:24:57 +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-02-20 22:08:29 +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 syncqt: Don't check for QT_{BEGIN,END}_HEADER macros 2013-01-26 18:18:46 +01:00