Frederik Gladhorn 733ace5a7a Merge remote-tracking branch 'origin/release' into stable ... Conflicts: configure mkspecs/macx-ios-clang/features/default_post.prf tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp Change-Id: Iaba97eed2272bccf54289640b8197d40e22f7bf5		2013-12-05 17:42:33 +01:00
..
doc	Doc: fixed invalid reference	2013-12-03 11:16:24 +01:00
generators	Merge remote-tracking branch 'origin/release' into stable	2013-12-05 17:42:33 +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	support s///i option in built-in sed	2013-12-04 17:18:38 +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