AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d0eaa737e1
qt5base-lts/qmake/generators
History
Liang Qi d0eaa737e1 Merge remote-tracking branch 'origin/5.5' into 5.6 
Conflicts:
	qmake/doc/src/qmake-manual.qdoc
	src/corelib/tools/qstring.h
	src/gui/image/qimagereader.cpp
	src/network/access/qnetworkaccessmanager.cpp
	src/tools/qdoc/doc/examples/examples.qdoc
	src/widgets/accessible/qaccessiblewidgetfactory_p.h
	src/widgets/doc/qtwidgets.qdocconf

Change-Id: I8fae62283aebefe24e5ca4b4abd97386560c0fcb
2015-10-02 16:59:55 +02:00
..
mac remove overuse of trimmed() 2015-10-01 16:19:15 +00:00
unix remove QMAKE_<lib>_SUFFIX support 2015-10-01 16:19:56 +00:00
win32 Merge remote-tracking branch 'origin/5.5' into 5.6 2015-10-02 16:59:55 +02:00
makefile.cpp qmake: Fix 'Libs:' line in .pc files on OS X 2015-09-28 13:10:42 +00:00
makefile.h make fileFixify() calling convention somewhat sane 2015-04-21 12:06:20 +00:00
makefiledeps.cpp replace incorrect uses of fixPathToLocalOS() (mostly) 2015-02-17 18:27:44 +00:00
makefiledeps.h Update copyright headers 2015-02-11 06:49:51 +00:00
metamakefile.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
metamakefile.h Update copyright headers 2015-02-11 06:49:51 +00:00
projectgenerator.cpp make fileFixify() calling convention somewhat sane 2015-04-21 12:06:20 +00:00
projectgenerator.h Update copyright headers 2015-02-11 06:49:51 +00:00
xmloutput.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
xmloutput.h Update copyright headers 2015-02-11 06:49:51 +00:00