Go to file
Lars Knoll d5098f2802 Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
	tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp

Change-Id: I884afc3b6d65c6411733a897a1949e19393573a7
2012-03-12 21:03:49 +01:00
bin Fix qtmodule-configtests to honor error codes 2012-03-08 23:52:34 +01:00
config.tests Remove redundant wayland stuff from QtBase 2012-03-12 17:33:15 +01:00
dist Merge remote-tracking branch 'origin/master' into api_changes 2012-03-12 21:03:49 +01:00
doc/src Merge remote-tracking branch 'origin/api_changes' into containters 2012-03-08 12:02:41 +01:00
examples Re-add the Systray example. 2012-03-12 17:33:15 +01:00
lib Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
mkspecs Fix the QMAKE_LIBS_WAYLAND variable 2012-03-12 17:33:15 +01:00
qmake Merge remote-tracking branch 'origin/master' into api_changes 2012-03-12 21:03:49 +01:00
src Merge remote-tracking branch 'origin/master' into api_changes 2012-03-12 21:03:49 +01:00
tests Merge remote-tracking branch 'origin/master' into api_changes 2012-03-12 21:03:49 +01:00
tools Merge remote-tracking branch 'origin/master' into api_changes 2012-03-12 21:03:49 +01:00
util clean up qmake-generated projects 2012-02-24 05:18:30 +01:00
.gitattributes Added .tag file with Git revision. 2011-05-03 16:23:49 +02:00
.gitignore Add src/concurrent/qtconcurrentversion.h to .gitignore 2012-02-23 09:01:18 +01:00
.tag Added .tag file with Git revision. 2011-05-03 16:23:49 +02:00
configure Remove redundant wayland stuff from QtBase 2012-03-12 17:33:15 +01:00
configure.bat Remove Q_BYTE_ORDER and -*-endian arguments from configures 2012-03-02 14:48:00 +01:00
header.BSD Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
header.FDL Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
header.LGPL Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
header.LGPL-ONLY Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
INSTALL Remove Symbian specific code from qtbase. 2012-01-31 07:08:31 +01:00
LGPL_EXCEPTION.txt Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.FDL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.LGPL Update contact information in license headers. 2012-01-23 04:04:33 +01:00
LICENSE.PREVIEW.COMMERCIAL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
qtbase.pro remove obviously counterproductive uses of QT_SOURCE_TREE & QT_BUILD_TREE 2012-03-08 18:57:13 +01:00
sync.profile Add qprocessordetection.h 2012-02-08 12:33:11 +01:00