whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/qmake/library
History
Liang Qi ea438b2508 Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qsysinfo.h
	src/corelib/kernel/qcoreapplication_win.cpp
	src/gui/text/qdistancefield.cpp
	src/gui/text/qdistancefield_p.h
	src/plugins/platforms/windows/qwindowsglcontext.cpp
	src/plugins/platforms/windows/qwindowsglcontext.h

Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978
 		2016-06-21 08:39:41 +02:00
..
ioutils.cpp Updated license headers 2016-01-21 18:55:18 +00:00
ioutils.h Updated license headers 2016-01-21 18:55:18 +00:00
proitems.cpp make QMakeEvaluator::isActiveConfig() take a QStringRef argument 2016-05-24 12:38:53 +00:00
proitems.h add $$sorted() function. 2016-05-25 06:19:16 +00:00
qmake_global.h Updated license headers 2016-01-21 18:55:18 +00:00
qmakebuiltins.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-06-21 08:39:41 +02:00
qmakeevaluator.cpp make split_value_list() take a QStringRef as input 2016-05-24 12:39:05 +00:00
qmakeevaluator.h Improve error reporting when parsing JSON files 2016-06-17 16:11:11 +00:00
qmakeevaluator_p.h Updated license headers 2016-01-21 18:55:18 +00:00
qmakeglobals.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-06-21 08:39:41 +02:00
qmakeglobals.h introduce a new way to pass arbitrary arguments to the project file 2016-05-17 15:30:38 +00:00
qmakeparser.cpp make QMakeParser take a QStringRef as input 2016-05-24 12:38:59 +00:00
qmakeparser.h make QMakeParser take a QStringRef as input 2016-05-24 12:38:59 +00:00
qmakevfs.cpp Updated license headers 2016-01-21 18:55:18 +00:00
qmakevfs.h Updated license headers 2016-01-21 18:55:18 +00:00