qt5base-lts/qmake
Liang Qi 0c034a649f Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	src/widgets/widgets/qpushbutton.cpp

Change-Id: I615de00e6e64540c50f658d4d8ab3e002d701a81
2017-03-14 10:52:24 +01:00
..
doc Add documentation for QMAKE_LINK variable 2017-03-08 07:56:29 +00:00
generators Fix MSVC Makefiles when SOURCES is empty 2017-03-07 13:54:57 +00:00
library Improve time stamp precision of qmake's touch function 2017-03-01 05:19:56 +00:00
cachekeys.h Updated license headers 2016-01-21 18:55:18 +00:00
main.cpp moc: get the system #defines from the compiler itself 2016-07-20 02:54:03 +00:00
Makefile.unix Tidy the long lists of files in Makefile.unix 2017-02-22 08:38:58 +00:00
Makefile.unix.macos Merge remote-tracking branch 'origin/5.8' into dev 2016-12-13 09:39:20 +01:00
Makefile.unix.mingw configure: put more of the makefile contents into template files 2016-11-23 09:38:14 +00:00
Makefile.unix.unix configure: put more of the makefile contents into template files 2016-11-23 09:38:14 +00:00
Makefile.unix.win32 Merge remote-tracking branch 'origin/5.8' into dev 2017-01-25 20:06:06 +01:00
Makefile.win32 Merge remote-tracking branch 'origin/5.8' into 5.9 2017-02-14 11:33:02 +01:00
meta.cpp qmake: eradicate Q_FOREACH loops [needing qAsConst()] 2016-01-28 20:25:18 +00:00
meta.h Updated license headers 2016-01-21 18:55:18 +00:00
option.cpp add a bunch of complementary options to -after 2017-02-06 16:34:17 +00:00
option.h bump qmake version 2016-11-15 22:43:51 +00:00
project.cpp make qmake abort when $$prompt() gets EOF 2016-12-13 18:55:19 +00:00
project.h Merge remote-tracking branch 'origin/5.7' into dev 2016-07-19 20:14:40 +02:00
property.cpp move generation of qconfig.cpp (and qt.conf) to qmake-based configure 2016-12-13 18:56:12 +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.pri Tidy the long lists of files in Makefile.unix 2017-02-22 08:38:58 +00:00
qmake.pro configure: delete some dead code and outdated comments 2016-11-23 09:38:09 +00:00