Oswald Buddenhagen 189dc655bb Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/tools/qbytearray.cpp src/gui/image/qimage.cpp src/gui/image/qppmhandler.cpp src/gui/kernel/qguiapplication.cpp src/gui/painting/qpaintengine_raster.cpp Change-Id: I7c1a8e7ebdfd7f7ae767fdb932823498a7660765		2014-09-29 14:08:49 +02:00
..
doc	Doc: Fixed broken links introduced by "OS X" doc change.	2014-09-11 21:45:46 +02:00
generators	remove pointless initializations	2014-09-25 11:23:31 +02:00
library	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
cachekeys.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
main.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
Makefile.unix	Use new, supported APIs in OS X 10.10 and iOS 8.0 to get the OS version.	2014-09-12 22:01:58 +02:00
Makefile.win32	Add a way for qmake + configure to link dynamically to the CRT	2014-09-25 22:14:31 +02:00
meta.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
meta.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
option.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
option.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
project.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
project.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
property.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
property.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qmake_pch.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qmake-docs.pro	move qmake docs into qtbase	2013-06-17 15:41:55 +02:00
qmake.pri	Use new, supported APIs in OS X 10.10 and iOS 8.0 to get the OS version.	2014-09-12 22:01:58 +02:00
qmake.pro	bring fake qmake project up to snuff	2013-11-04 19:50:07 +01:00