AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72f700edd6
qt5base-lts/qmake
History
Liang Qi 112a4af107 Merge remote-tracking branch 'origin/5.9' into dev 
Conflicts:
	examples/examples.pro
	qmake/library/qmakebuiltins.cpp
	src/corelib/global/qglobal.cpp
		Re-apply b525ec2 to qrandom.cpp(code movement in 030782e)
	src/corelib/global/qnamespace.qdoc
	src/corelib/global/qrandom.cpp
	src/gui/kernel/qwindow.cpp
		Re-apply a3d59c7 to QWindowPrivate::setVisible() (code movement in d7a9e08)
	src/network/ssl/qsslkey_openssl.cpp
	src/plugins/platforms/android/androidjniinput.cpp
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/widgets/widgets/qmenu.cpp
	tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp

Change-Id: If7ab427804408877a93cbe02079fca58e568bfd3
2017-08-31 14:31:31 +02:00
..
doc Introduce OBJECTIVE_HEADERS 2017-08-25 12:15:36 +00:00
generators Merge remote-tracking branch 'origin/5.9' into dev 2017-08-31 14:31:31 +02:00
library Merge remote-tracking branch 'origin/5.9' into dev 2017-08-31 14:31:31 +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 QFileSystemEngine: Remove the remainder of Windows XP functions 2017-07-25 01:01:02 +00:00
Makefile.win32 QFileSystemEngine: Remove the remainder of Windows XP functions 2017-07-25 01:01:02 +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 QFileSystemEngine: Remove the remainder of Windows XP functions 2017-07-25 01:01:02 +00:00
qmake.pro configure: delete some dead code and outdated comments 2016-11-23 09:38:09 +00:00