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
bin
config.tests	Fix building of the C++11 config.test on Windows with ICL	2014-06-27 08:28:01 +02:00
dist	update changelog for QtSql 5.3.1	2014-06-23 12:54:53 +02:00
doc	QDoc: Introduce a variable to set table of contents depth.	2014-06-11 15:13:29 +02:00
examples	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-01 16:25:19 +02:00
lib
mkspecs	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-01 16:25:19 +02:00
qmake	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-01 16:25:19 +02:00
src	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-01 16:25:19 +02:00
tests	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-01 16:25:19 +02:00
tools	Add the -qreal option to the Qt ABI information	2014-06-17 17:20:10 +02:00
util
.gitattributes
.gitignore
.qmake.conf
.tag
configure	Add the -qreal option to the Qt ABI information	2014-06-17 17:20:10 +02:00
configure.bat
header.BSD
header.FDL
header.LGPL
header.LGPL-ONLY
INSTALL
LGPL_EXCEPTION.txt
LICENSE.FDL
LICENSE.GPL
LICENSE.LGPL
LICENSE.PREVIEW.COMMERCIAL
qtbase.pro
sync.profile