Lars Knoll 96232be146 Merge remote-tracking branch 'origin/api_changes' ... Conflicts: dist/changes-5.0.0 mkspecs/features/qt_module_config.prf qmake/project.cpp qmake/property.cpp Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296		2012-03-04 21:45:05 +01:00
..
moc	Allow moc to handle symbols that have been redefined.	2012-02-27 00:18:53 +01:00
qmake	qmake-test: Fix jom/nmake handling on Windows.	2012-03-01 12:16:57 +01:00
rcc	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
uic	uic: use QStringLiteral() instead of QString::fromUtf8() where applicable	2012-02-20 15:17:08 +01:00
tools.pro	Moved autotests in category 'tools' into new directory structure	2011-09-12 10:08:29 +02:00