AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
71388c37d2
qt5base-lts/qmake/library
History
Simon Hausmann e2f66f9215 Merge remote-tracking branch 'origin/5.5' into dev 
Conflicts:
	src/corelib/global/qnamespace.qdoc
	src/corelib/io/qwindowspipereader.cpp
	src/corelib/io/qwindowspipereader_p.h
	src/corelib/statemachine/qstatemachine.cpp
	src/corelib/statemachine/qstatemachine_p.h
	src/plugins/platforms/xcb/qxcbconnection.h
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/tools/qmake/tst_qmake.cpp
	tests/manual/touch/main.cpp

Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
2015-06-03 10:23:56 +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-06-03 10:23:56 +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