Frederik Gladhorn 190fa97c83 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: examples/widgets/doc/src/addressbook-fr.qdoc Change-Id: Id1196e8e0c6445f1616c3f29234c974d809f8e48		2013-08-27 22:51:09 +02:00
..
doc	Merge remote-tracking branch 'origin/stable' into dev	2013-08-27 22:51:09 +02:00
generators	remove support for Qtopia's QOM_OBJECT macro	2013-08-26 12:21:40 +02:00
library	avoid deadlock in cache() during spec/cache loading	2013-08-27 13:36:34 +02:00
cachekeys.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
main.cpp	implement simple VFS to support caching during project parsing	2013-08-07 13:58:41 +02:00
Makefile.unix	Merge remote-tracking branch 'origin/stable' into dev	2013-08-21 11:03:18 +02:00
Makefile.win32	Merge remote-tracking branch 'origin/stable' into dev	2013-08-21 11:03:18 +02: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	implement simple VFS to support caching during project parsing	2013-08-07 13:58:41 +02:00
option.h	implement simple VFS to support caching during project parsing	2013-08-07 13:58:41 +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	introduce /src qmake property variants	2013-06-12 16:27:21 +02: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	Merge remote-tracking branch 'origin/stable' into dev	2013-08-21 11:03:18 +02:00
qmake.pro	Merge remote-tracking branch 'origin/stable' into dev	2013-06-20 16:45:12 +02:00