Go to file
Liang Qi 58437fb125 Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
	src/corelib/serialization/qcborcommon.h
	src/corelib/tools/qlocale_data_p.h
	tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp

Done-with: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: Ibed987f6d77a0294f78f67d78625237616082416
2018-11-10 11:38:40 +01:00
bin syncqt: fix forwarding injected headers, take ~3 2018-09-12 06:53:02 +00:00
config.tests Merge remote-tracking branch 'origin/5.11' into 5.12 2018-10-21 01:00:09 +02:00
dist Add change log about source incompatibility in moc output 2018-10-31 08:38:50 +00:00
doc Merge remote-tracking branch 'origin/5.12' into dev 2018-10-25 07:21:53 +02:00
examples Merge remote-tracking branch 'origin/5.12' into dev 2018-11-10 11:38:40 +01:00
lib
mkspecs Merge remote-tracking branch 'origin/5.12' into dev 2018-11-10 11:38:40 +01:00
qmake Merge remote-tracking branch 'origin/5.12' into dev 2018-11-10 11:38:40 +01:00
src Merge remote-tracking branch 'origin/5.12' into dev 2018-11-10 11:38:40 +01:00
tests Merge remote-tracking branch 'origin/5.12' into dev 2018-11-10 11:38:40 +01:00
util Make util/lexgen/ mention itself in its auto-gen line 2018-11-01 15:07:05 +00:00
.gitattributes
.gitignore gitignore: don't ignore Info.plist templates for libraries 2017-11-23 07:07:48 +00:00
.qmake.conf Bump version 2018-11-08 11:26:39 +01:00
.tag
config_help.txt configure: Add switch for adding coverage info 2018-10-31 15:08:59 +00:00
configure configure: Treat win32-clang-g++ the same as win32-g++ 2018-10-10 04:10:40 +00:00
configure.bat configure: Prefer cl.exe over clang-cl.exe 2018-01-04 21:22:42 +00:00
configure.json configure: Add switch for adding coverage info 2018-10-31 15:08:59 +00:00
configure.pri configure: Add switch for adding coverage info 2018-10-31 15:08:59 +00:00
header.BSD Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.COMM Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.FDL Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.GPL Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.GPL-EXCEPT Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.LGPL Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.LGPL3 Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.LGPL3-COMM Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.LGPL-NOGPL2 Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.LGPL-ONLY Use placeholder for year in header.* files 2018-04-16 11:02:22 +00:00
header.MIT qsimd: add support for new x86 CPU features 2018-05-05 06:20:07 +00:00
INSTALL
LICENSE.FDL
LICENSE.GPL2
LICENSE.GPL3
LICENSE.GPL3-EXCEPT
LICENSE.LGPL3
LICENSE.LGPLv3 Remove LICENSE.GPLv3, LICENSE.LGPLv21, LGPL_EXCEPTION.txt 2018-04-16 11:02:14 +00:00
LICENSE.QT-LICENSE-AGREEMENT-4.0 Replace commercial preview license with Qt License Agreement 4.0 2018-06-21 11:39:15 +00:00
qtbase.pro
sync.profile Fix build failed with ANGLE 2018-10-16 05:19:43 +00:00