qt5base-lts/qmake
Liang Qi bf58c70546 Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
	src/corelib/io/qdir.cpp
	src/corelib/kernel/qtimer.cpp
	src/corelib/kernel/qtimer.h

Done-With: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: I683d897760ec06593136d77955f8bc87fdef3f9f
2018-11-22 01:53:29 +01:00
..
doc Enable users to specify WindowsTargetPlatform[Min]Version in VS projects 2018-11-16 10:55:16 +00:00
generators Merge remote-tracking branch 'origin/5.12' into dev 2018-11-22 01:53:29 +01:00
library qmake: fix return type of toLongLong() 2018-11-21 05:37:02 +00:00
cachekeys.h Updated license headers 2016-01-21 18:55:18 +00:00
main.cpp qmake: Apply modernize-use-nullptr 2018-08-08 17:30:32 +00:00
Makefile.unix Merge remote-tracking branch 'origin/5.11' into 5.12 2018-11-09 10:34:33 +01:00
Makefile.unix.macos Merge remote-tracking branch 'origin/5.8' into dev 2016-12-13 09:39:20 +01:00
Makefile.unix.mingw fix "make clean" of qmake in a builddir with spaces on mingw 2017-12-14 18:06:31 +00:00
Makefile.unix.unix Move the readlink(2) wrapper to qcore_unix.cpp 2017-07-08 02:18:16 +00:00
Makefile.unix.win32 Fix builds with some MinGW distributions 2018-08-02 07:10:00 +00:00
Makefile.win32 Merge remote-tracking branch 'origin/5.11' into 5.12 2018-11-09 10:34:33 +01:00
meta.cpp qmake: refactor QMakeMetaInfo::findLib() interface 2018-07-16 15:44:23 +00:00
meta.h qmake: refactor QMakeMetaInfo::findLib() interface 2018-07-16 15:44:23 +00:00
option.cpp qmake: Apply modernize-use-nullptr 2018-08-08 17:30:32 +00:00
option.h qmake: Apply modernize-use-nullptr 2018-08-08 17:30:32 +00:00
project.cpp qmake: make argument validation of built-ins data driven 2018-06-27 17:23:57 +00:00
project.h Merge remote-tracking branch 'origin/5.7' into dev 2016-07-19 20:14:40 +02:00
property.cpp qmake: Apply modernize-use-nullptr 2018-08-08 17:30:32 +00:00
property.h move generation of qconfig.cpp (and qt.conf) to qmake-based configure 2016-12-13 18:56:12 +00:00
qmake_pch.h Updated license headers 2016-01-21 18:55:18 +00:00
qmake-aux.pro revert to building qmake with qconfig.cpp 2017-01-06 20:09:08 +00:00
qmake.pro Modernize the "textcodec" feature 2018-11-07 13:19:54 +00:00