AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34b14a8472
qt5base-lts/qmake/library
History
Frederik Gladhorn 34b14a8472 Merge remote-tracking branch 'origin/5.4' into 5.5 
Conflicts:
	examples/xml/htmlinfo/simpleexample.html
	examples/xml/rsslisting/rsslisting.cpp
	qmake/generators/win32/msbuild_objectmodel.cpp
	src/3rdparty/harfbuzz-ng/src/hb-private.hh
	src/corelib/global/qlogging.cpp
	src/corelib/io/qstorageinfo_unix.cpp
	src/corelib/thread/qwaitcondition_unix.cpp
	src/gui/kernel/qguiapplication.cpp
	src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
	src/testlib/doc/src/qt-webpages.qdoc
	tests/auto/other/qaccessibility/tst_qaccessibility.cpp

Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff
2015-02-24 21:02:08 +01: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 some functions into ProStringList for saner OO design 2015-02-12 19:00:36 +00:00
proitems.h move some functions into ProStringList for saner OO design 2015-02-12 19:00:36 +00:00
qmake_global.h Update copyright headers 2015-02-11 06:49:51 +00:00
qmakebuiltins.cpp move some functions into ProStringList for saner OO design 2015-02-12 19:00:36 +00:00
qmakeevaluator_p.h Update copyright headers 2015-02-11 06:49:51 +00:00
qmakeevaluator.cpp Merge remote-tracking branch 'origin/5.4' into 5.5 2015-02-24 21:02:08 +01:00
qmakeevaluator.h move some functions into ProStringList for saner OO design 2015-02-12 19:00:36 +00:00
qmakeglobals.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
qmakeglobals.h Update copyright headers 2015-02-11 06:49:51 +00:00
qmakeparser.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
qmakeparser.h Update copyright headers 2015-02-11 06:49:51 +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