AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40d528d9fd
qt5base-lts/qmake/library
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
..
ioutils.cpp qmake: minor fixups to ioutils for building in qt creator context 2018-03-29 18:15:35 +00:00
ioutils.h qmake: minor fixups to ioutils for building in qt creator context 2018-03-29 18:15:35 +00:00
proitems.cpp qmake: make yet more use of ProString::toQStringRef() 2017-08-26 12:11:35 +00:00
proitems.h Merge remote-tracking branch 'origin/5.9' into dev 2017-08-31 14:31:31 +02:00
qmake_global.h
qmakebuiltins.cpp Merge remote-tracking branch 'origin/5.11' into dev 2018-06-07 19:10:53 +02:00
qmakeevaluator_p.h qmake: make yet more use of ProString::toQStringRef() 2017-08-26 12:11:35 +00:00
qmakeevaluator.cpp qmake: skip empty parts when splitting strings in some more places 2018-06-01 09:09:35 +00:00
qmakeevaluator.h qmake: make VFS aware of exact vs. cumulative evaluation 2018-03-29 18:15:10 +00:00
qmakeglobals.cpp qmake: skip empty parts when splitting strings in some more places 2018-06-01 09:09:35 +00:00
qmakeglobals.h qmake: updates to the parsing code of external properties 2018-03-29 18:15:29 +00:00
qmakeparser.cpp qmake: make VFS aware of exact vs. cumulative evaluation 2018-03-29 18:15:10 +00:00
qmakeparser.h qmake: make VFS aware of exact vs. cumulative evaluation 2018-03-29 18:15:10 +00:00
qmakevfs.cpp qmake: add text codec support to VFS 2018-03-29 18:15:16 +00:00
qmakevfs.h qmake: add text codec support to VFS 2018-03-29 18:15:16 +00:00