Frederik Gladhorn 9033977d39 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/global/qglobal.h src/corelib/tools/qstring.cpp src/gui/image/image.pri src/gui/image/qimage.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/qeglfshooks_stub.cpp tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp Change-Id: I3b9ba029c8f2263b011f204fdf68c3231c6d4ce5		2014-01-20 18:18:59 +01:00
..
doc	qdocconf: Remove nonexistent dependency	2014-01-15 08:57:19 +01:00
generators	Merge remote-tracking branch 'origin/stable' into dev	2014-01-20 18:18:59 +01:00
library	don't turn = into += in cumulative mode	2014-01-15 21:32:41 +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	Merge remote-tracking branch 'origin/stable' into dev	2013-12-24 00:56:59 +01:00
Makefile.win32	Windows/Windows CE: Do not dynamically load shell32/coredll.	2014-01-07 21:14:35 +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	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +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	qmake: cleanup DISTFILES	2014-01-17 14:32:19 +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	Replace win32-g++ with mingw scope	2014-01-17 12:08:24 +01:00
qmake.pro	bring fake qmake project up to snuff	2013-11-04 19:50:07 +01:00