Liang Qi 18934bcb0c Merge remote-tracking branch 'origin/5.8' into 5.9 ... Conflicts: src/corelib/global/qglobal.cpp Change-Id: I375fa4afa662fa411a15f212ebd5f2f0dffdba7f		2017-04-18 10:46:22 +02:00
bin
config.tests	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-04-06 14:16:31 +02:00
dist	Add changes file for 5.8.0	2017-01-02 06:50:47 +00:00
doc	Doc: Add Creating C++ Classes to externalsites/qtcreator.qdoc	2017-03-29 12:31:13 +00:00
examples	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-04-18 10:46:22 +02:00
lib
mkspecs	Fix precompiled headers on Apple platforms, with multiple architectures	2017-04-14 00:00:56 +00:00
qmake	Fix precompiled headers on Apple platforms, with multiple architectures	2017-04-14 00:00:56 +00:00
src	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-04-18 10:46:22 +02:00
tests	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-04-18 10:46:22 +02:00
util
.gitattributes
.gitignore	Overhaul .gitignore	2017-02-16 15:11:05 +00:00
.qmake.conf	Bump version	2017-01-03 13:25:46 +01:00
.tag
config_help.txt	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-02-24 20:01:42 +01:00
configure	complain about various invalid configuration attempts	2017-01-06 20:10:10 +00:00
configure.bat	reduce nesting in configure.bat	2017-01-10 12:44:21 +00:00
configure.json	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-04-06 14:16:31 +02:00
configure.pri	Make build ABI available as qmake variable	2017-03-28 06:51:42 +00:00
header.BSD
header.BSD-OLD
header.COMM
header.FDL
header.FDL-OLD
header.GPL
header.GPL-EXCEPT
header.LGPL
header.LGPL3
header.LGPL3-COMM
header.LGPL21
header.LGPL-NOGPL2
header.LGPL-ONLY
INSTALL
LGPL_EXCEPTION.txt
LICENSE.FDL
LICENSE.GPL2
LICENSE.GPL3
LICENSE.GPL3-EXCEPT
LICENSE.GPLv3
LICENSE.LGPL3
LICENSE.LGPLv3
LICENSE.LGPLv21
LICENSE.PREVIEW.COMMERCIAL
qtbase.pro	nuke configure -host-option	2016-12-13 18:55:59 +00:00
sync.profile	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-03-13 15:55:44 +01:00