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
..
moc	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-01 16:25:19 +02:00
qdbuscpp2xml	Test that Qt tools can handle ' as a digit separator.	2013-10-30 09:44:07 +01:00
qdbusxml2cpp	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
qmake	Add JSON parsing support to qmake.	2013-10-17 08:07:25 +02:00
rcc	Make RCC handle bigger binaries	2014-06-06 15:41:00 +02:00
uic	uic: Accept an -include argument to generate a #include.	2013-11-11 15:56:52 +01:00
tools.pro	test: Disable tst_uic when -no-widgets is used	2013-04-22 16:24:44 +02:00