qt5base-lts/qmake
Frederik Gladhorn f6dbdd9c16 Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
	src/sql/drivers/sqlite/qsql_sqlite.cpp

Change-Id: Ia7cffd2c99ae3d5eea6b5740683c06e921336dcd
2013-12-05 18:52:38 +01:00
..
doc Doc: fixed invalid reference 2013-12-03 11:16:24 +01:00
generators Merge remote-tracking branch 'origin/stable' into dev 2013-12-05 18:52:38 +01:00
library support a cache that is really just a cache 2013-11-14 19:26:20 +01:00
cachekeys.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
main.cpp fix handling of \\ in replacement string in s/// cmd of built-in sed 2013-11-23 23:31:18 +01:00
Makefile.unix Add JSON parsing support to qmake. 2013-10-17 08:07:25 +02:00
Makefile.win32 avoid vcX0.pdb files for qmake 2013-12-03 09:15:37 +01:00
meta.cpp Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
meta.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
option.cpp fix warnings about unused variables & parameters 2013-11-04 19:50:05 +01:00
option.h qmake: Expose qmake arguments as QMAKE_ARGS 2013-10-24 20:20:59 +02:00
project.cpp implement simple VFS to support caching during project parsing 2013-08-07 13:58:41 +02:00
project.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
property.cpp fix signedness warnings 2013-11-04 19:49:55 +01:00
property.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qmake_pch.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qmake-docs.pro move qmake docs into qtbase 2013-06-17 15:41:55 +02:00
qmake.pri bring fake qmake project up to snuff 2013-11-04 19:50:07 +01:00
qmake.pro bring fake qmake project up to snuff 2013-11-04 19:50:07 +01:00