AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e2f66f9215
qt5base-lts/qmake/generators
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
..
mac Merge remote-tracking branch 'origin/5.4' into 5.5 2015-06-01 17:46:58 +02:00
unix Merge remote-tracking branch 'origin/5.5' into dev 2015-06-03 10:23:56 +02:00
win32 Merge remote-tracking branch 'origin/5.5' into dev 2015-06-03 10:23:56 +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