qt5base-lts/qmake
Gabriel de Dietrich d38fe875c7 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
    src/widgets/widgets/qmainwindowlayout.cpp

Change-Id: I306b4f5ad11bceb336c9091241b468d455fe6bb6
2017-07-13 16:36:10 -07:00
..
doc Merge remote-tracking branch 'origin/5.9' into dev 2017-04-07 10:24:33 +02:00
generators Merge remote-tracking branch 'origin/5.9' into dev 2017-07-13 16:36:10 -07:00
library Merge remote-tracking branch 'origin/5.9' into dev 2017-05-07 13:08:18 +02:00
cachekeys.h Updated license headers 2016-01-21 18:55:18 +00:00
main.cpp Simplify built-in qmake install command 2017-05-04 09:40:48 +00:00
Makefile.unix Move the readlink(2) wrapper to qcore_unix.cpp 2017-07-08 02:18:16 +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 Move the readlink(2) wrapper to qcore_unix.cpp 2017-07-08 02:18:16 +00:00
Makefile.unix.win32 Merge remote-tracking branch 'origin/5.8' into dev 2017-01-25 20:06:06 +01:00
Makefile.win32 Move qrand() & qsrand() to qrandom.cpp 2017-06-12 06:14:37 +00: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 Mark an unlikely test as such and condition in positive order 2017-07-07 18:09:44 +00:00
option.h bump qmake version 2016-11-15 22:43:51 +00:00
project.cpp qmake: use new QString::arg(QStringView) overload 2017-04-07 18:33:23 +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 qmake: Add test functions for comparing version numbers 2017-03-20 21:56:01 +00:00
qmake.pro configure: delete some dead code and outdated comments 2016-11-23 09:38:09 +00:00