AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
499f9b2abf
qt5base-lts/qmake/generators
History
Liang Qi afab1546a7 Merge remote-tracking branch 'origin/5.5' into 5.6 
Conflicts:
	qmake/doc/snippets/code/doc_src_qmake-manual.pro
	qmake/doc/src/qmake-manual.qdoc
	src/corelib/io/qstorageinfo_unix.cpp
	src/corelib/tools/qbytearray.cpp
	src/widgets/kernel/qwidgetwindow.cpp
	tests/auto/corelib/io/qprocess/tst_qprocess.cpp
	tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
	tests/auto/network/access/qnetworkreply/BLACKLIST

Change-Id: I9efcd7e1cce1c394eed425c43aa6fce7d2edf31c
2015-08-26 20:06:57 +02:00
..
mac Fix lookup of Info.plist from mkspecs when shadow-building 2015-08-25 11:38:34 +00:00
unix Merge remote-tracking branch 'origin/5.5' into 5.6 2015-08-26 20:06:57 +02:00
win32 Merge remote-tracking branch 'origin/5.5' into 5.6 2015-08-26 20:06:57 +02:00
makefile.cpp fix quoting of qmake parameters in 'qmake' target 2015-05-22 19:04:21 +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