Frederik Gladhorn aaff94c2df Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/tools/qbytearray.cpp src/gui/kernel/qplatformsystemtrayicon.cpp src/gui/kernel/qplatformsystemtrayicon.h src/plugins/platforms/xcb/xcb-plugin.pro Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79		2014-12-29 16:37:38 +01:00
..
doc	Mention the c++14 CONFIG option in the qmake variable reference	2014-12-20 07:48:01 +01:00
generators	remove unsupported winrt mkspecs	2014-12-16 11:56:26 +01:00
library	work around MSVC2010 ICE	2014-10-29 09:37:17 +01: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 detection of and support for Visual Studio 2015	2014-12-13 05:11:25 +01: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