Go to file
Liang Qi 50aeedd86c Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	mkspecs/features/qml_module.prf
	src/corelib/tools/qdatetimeparser_p.h

Change-Id: I5382cee3ddb33107dc61ee20f7a9188c4a68a882
2016-11-25 10:32:29 +01:00
bin Merge remote-tracking branch 'origin/5.6' into 5.7 2016-09-28 11:51:35 +02:00
config.tests Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-15 09:58:16 +01:00
dist Add changes file for 5.7.1 2016-11-03 05:12:00 +00:00
doc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-31 09:26:35 +01:00
examples Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-04 11:39:15 +01:00
lib Purge all fonts 2015-08-18 19:59:14 +00:00
mkspecs Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-25 10:32:29 +01:00
qmake Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-25 10:32:29 +01:00
src Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-25 10:32:29 +01:00
tests Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-23 09:24:36 +01:00
tools Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-23 09:24:36 +01:00
util Also release winmain, qopenglextensions under commercial licenses 2016-11-18 16:19:56 +00:00
.gitattributes
.gitignore Update gitignore 2016-08-19 10:43:26 +00:00
.qmake.conf Bump version 2016-07-28 13:50:04 +02:00
.tag
configure Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-15 09:58:16 +01:00
configure.bat Don't compile configure.exe with clang-cl.exe if cl.exe is available 2016-07-21 00:16:04 +00:00
header.BSD Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.BSD-OLD Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.COMM Add header template for commercial only modules 2015-10-19 10:37:18 +00:00
header.FDL Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.FDL-OLD Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.GPL Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.GPL-EXCEPT Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.LGPL Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.LGPL3 Update copyright headers 2015-02-11 06:49:51 +00:00
header.LGPL3-COMM Update copyright headers 2015-02-11 06:49:51 +00:00
header.LGPL21 Update copyright headers 2015-02-11 06:49:51 +00:00
header.LGPL-NOGPL2 Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.LGPL-ONLY Update copyright headers 2015-02-11 06:49:51 +00:00
INSTALL Doc: Update links in INSTALL file 2015-02-16 09:06:41 +00:00
LGPL_EXCEPTION.txt Update copyright headers 2015-02-11 06:49:51 +00:00
LICENSE.FDL
LICENSE.GPL2 Add new license header templates and license files 2016-01-14 20:43:46 +00:00
LICENSE.GPL3 Add new license header templates and license files 2016-01-14 20:43:46 +00:00
LICENSE.GPL3-EXCEPT Add new license header templates and license files 2016-01-14 20:43:46 +00:00
LICENSE.GPLv3 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" 2016-06-15 07:02:32 +00:00
LICENSE.LGPL3 Add new license header templates and license files 2016-01-14 20:43:46 +00:00
LICENSE.LGPLv3 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" 2016-06-15 07:02:32 +00:00
LICENSE.LGPLv21 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" 2016-06-15 07:02:32 +00:00
LICENSE.PREVIEW.COMMERCIAL Add new license header templates and license files 2016-01-14 20:43:46 +00:00
qtbase.pro Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-01 22:15:55 +02:00
sync.profile remove dependencies from sync.profile 2016-11-05 21:04:25 +00:00