Lars Knoll 9bd0323551 Merge remote-tracking branch 'origin/master' into api_changes ... Conflicts: configure src/corelib/io/qurl.cpp src/gui/kernel/qwindow.cpp src/tools/moc/generator.cpp src/widgets/kernel/qwidget_qpa.cpp src/widgets/styles/qstyle.h src/widgets/widgets/qtabbar.cpp tests/auto/corelib/codecs/utf8/tst_utf8.cpp Change-Id: Ia457228d6f684ec8184e13e8fcc9d25857b1751e		2012-04-16 12:04:34 +02:00
..
generators	Merge remote-tracking branch 'origin/master' into api_changes	2012-04-16 12:04:34 +02:00
cachekeys.h	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
CHANGES	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
main.cpp	look for mkspecs in the project root, not next to every project	2012-02-29 00:05:38 +01:00
Makefile.unix	Remove -DQT_NO_STL from the bootstrapped builds	2012-04-07 05:19:56 +02:00
Makefile.win32	Remove -DQT_NO_STL from the bootstrapped builds	2012-04-07 05:19:56 +02:00
Makefile.win32-g++	Remove -DQT_NO_STL from the bootstrapped builds	2012-04-07 05:19:56 +02:00
meta.cpp	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
meta.h	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
option.cpp	don't add bogus /mkspecs to QMAKE_MKSPECS	2012-03-06 21:50:25 +01:00
option.h	Merge remote-tracking branch 'origin/api_changes'	2012-03-04 21:45:05 +01:00
project.cpp	Merge remote-tracking branch 'origin/master' into api_changes	2012-04-10 15:31:45 +02:00
project.h	do not re-evaluate spec+cache in build passes	2012-03-06 06:34:49 +01:00
property.cpp	QT_RAW_INSTALL_FOO => QT_INSTALL_FOO/raw	2012-03-12 11:01:02 +01:00
property.h	optimize QMakeProperty	2012-03-01 21:00:23 +01:00
qmake_pch.h	QHash security fix (1/2): add global QHash seed	2012-04-03 19:12:13 +02:00
qmake.pri	Remove -DQT_NO_STL from the bootstrapped builds	2012-04-07 05:19:56 +02:00
qmake.pro	qmake: remove symbian support	2011-11-07 13:26:41 +01:00