qt5base-lts/qmake
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
..
generators Merge remote-tracking branch 'origin/api_changes' 2012-03-04 21:45:05 +01: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 some bogus include locations 2012-03-01 23:22:00 +01:00
Makefile.win32 remove some bogus include locations 2012-03-01 23:22:00 +01:00
Makefile.win32-g++ remove some bogus include locations 2012-03-01 23:22:00 +01: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 Merge remote-tracking branch 'origin/api_changes' 2012-03-04 21:45:05 +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/api_changes' 2012-03-04 21:45:05 +01:00
project.h remove now unused QMakeProject c'tors 2012-03-02 21:33:08 +01:00
property.cpp Merge remote-tracking branch 'origin/api_changes' 2012-03-04 21:45:05 +01:00
property.h optimize QMakeProperty 2012-03-01 21:00:23 +01:00
qmake_pch.h Remove "All rights reserved" line from license headers. 2012-01-30 03:54:59 +01:00
qmake.pri Drop file-engine abstraction from public API 2012-02-22 00:07:31 +01:00
qmake.pro qmake: remove symbian support 2011-11-07 13:26:41 +01:00