AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40d528d9fd
qt5base-lts/qmake
History
Liang Qi 096e37910d Merge remote-tracking branch 'origin/5.11' into dev 
Conflicts:
	.qmake.conf
	src/corelib/kernel/qeventdispatcher_cf.mm
	src/gui/kernel/qguiapplication_p.h
	src/gui/kernel/qwindowsysteminterface.cpp
	src/gui/kernel/qwindowsysteminterface.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/ios/qioseventdispatcher.mm
	src/plugins/platforms/windows/qwindowsdrag.h
	src/plugins/platforms/windows/qwindowsinternalmimedata.h
	src/plugins/platforms/windows/qwindowsmime.cpp
	src/plugins/platforms/winrt/qwinrtscreen.cpp

Change-Id: Ic817f265c2386e83839d2bb9ef7419cb29705246
2018-06-07 19:10:53 +02:00
..
doc Detect C standard and try using the most recent one (take 2) 2018-04-21 09:05:14 +00:00
generators qmake: Don't map Xcode SYMROOT to output directory 2018-04-26 14:19:21 +00:00
library Merge remote-tracking branch 'origin/5.11' into dev 2018-06-07 19:10:53 +02:00
cachekeys.h
main.cpp Win: Handle installation of read-only target files correctly 2017-09-13 12:45:35 +00:00
Makefile.unix Create corelib/serialization and move existing file formats into it 2018-01-26 20:59:50 +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 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 QFileSystemEngine: Remove the remainder of Windows XP functions 2017-07-25 01:01:02 +00:00
Makefile.win32 Create corelib/serialization and move existing file formats into it 2018-01-26 20:59:50 +00:00
meta.cpp
meta.h
option.cpp Merge remote-tracking branch 'origin/5.9' into 5.11 2018-02-14 12:51:24 +01:00
option.h bump qmake version 2016-11-15 22:43:51 +00:00
project.cpp qmake: make VFS aware of exact vs. cumulative evaluation 2018-03-29 18:15:10 +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
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 Create corelib/serialization and move existing file formats into it 2018-01-26 20:59:50 +00:00