AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
0aa2d318b1
qt5base-lts/qmake/library
History
Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev 
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qglobal.h
	src/corelib/global/qsysinfo.h
	src/corelib/global/qsystemdetection.h
	src/corelib/kernel/qobjectdefs.h
	src/plugins/plugins.pro
	tests/auto/widgets/itemviews/qlistview/qlistview.pro

Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c
2015-07-01 11:05:26 +02:00
..
ioutils.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
ioutils.h Update copyright headers 2015-02-11 06:49:51 +00:00
proitems.cpp move get{,Hash}Str from QMakeEvaluator to ProFile 2015-05-20 18:11:28 +00:00
proitems.h move get{,Hash}Str from QMakeEvaluator to ProFile 2015-05-20 18:11:28 +00:00
qmake_global.h Update copyright headers 2015-02-11 06:49:51 +00:00
qmakebuiltins.cpp remove bogus parens from error messages 2015-05-20 18:11:26 +00:00
qmakeevaluator_p.h Update copyright headers 2015-02-11 06:49:51 +00:00
qmakeevaluator.cpp Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +02:00
qmakeevaluator.h move get{,Hash}Str from QMakeEvaluator to ProFile 2015-05-20 18:11:28 +00:00
qmakeglobals.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
qmakeglobals.h add qmake evaluator test 2015-05-20 18:11:34 +00:00
qmakeparser.cpp add autotest for qmake parser 2015-02-25 13:55:12 +00:00
qmakeparser.h add autotest for qmake parser 2015-02-25 13:55:12 +00:00
qmakevfs.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
qmakevfs.h Update copyright headers 2015-02-11 06:49:51 +00:00