Frederik Gladhorn a09a8d509a Merge remote-tracking branch 'origin/5.3' into dev ... Conflicts: mkspecs/qnx-x86-qcc/qplatformdefs.h src/corelib/global/qglobal.h src/network/socket/qnativesocketengine_winrt.cpp src/plugins/platforms/android/androidjniaccessibility.cpp src/plugins/platforms/windows/qwindowswindow.cpp Manually adjusted: mkspecs/qnx-armle-v7-qcc/qplatformdefs.h to include 9ce697f2d5 Thanks goes to Sergio for the qnx mkspecs adjustments. Change-Id: I53b1fd6bc5bc884e5ee2c2b84975f58171a1cb8e		2014-07-01 16:25:19 +02:00
..
doc	winrt: Remove WP8.0 references from package manifest feature	2014-06-25 16:33:55 +02:00
generators	Merge remote-tracking branch 'origin/stable' into dev	2014-06-05 22:26:44 +02:00
library	pass a pointer instead of a reference to initFrom()	2014-06-20 11:47:19 +02:00
cachekeys.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
main.cpp	Ensure that there is no duplication of the output directory in output	2014-06-06 08:49:06 +02:00
Makefile.unix	De-inline QDebug destructor	2014-05-22 08:35:06 +02:00
Makefile.win32	De-inline QDebug destructor	2014-05-22 08:35:06 +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	don't make relative paths if we don't know the top-level build dir	2014-04-16 07:28:52 +02:00
option.h	qmake: Expose qmake arguments as QMAKE_ARGS	2013-10-24 20:20:59 +02:00
project.cpp	pass a pointer instead of a reference to initFrom()	2014-06-20 11:47:19 +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	move qlocale_mac.mm to OBJECTIVE_SOURCES	2014-05-08 21:28:45 +02:00
qmake.pro	bring fake qmake project up to snuff	2013-11-04 19:50:07 +01:00