AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e2f66f9215
qt5base-lts/qmake
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
..
doc deprecate DEPLOYMENT variable 2015-06-02 09:59:32 +00:00
generators Merge remote-tracking branch 'origin/5.5' into dev 2015-06-03 10:23:56 +02:00
library Merge remote-tracking branch 'origin/5.5' into dev 2015-06-03 10:23:56 +02:00
cachekeys.h Update copyright headers 2015-02-11 06:49:51 +00:00
main.cpp fix installing unix dll symlinks on windows hosts 2015-06-01 13:26:57 +00:00
Makefile.unix Deinline QRingBuffer class 2015-05-20 13:49:00 +00:00
Makefile.win32 Deinline QRingBuffer class 2015-05-20 13:49:00 +00:00
meta.cpp fix quoting issues. all of them. (*) 2015-02-17 18:27:29 +00:00
meta.h Update copyright headers 2015-02-11 06:49:51 +00:00
option.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
option.h Update copyright headers 2015-02-11 06:49:51 +00:00
project.cpp make fileFixify() calling convention somewhat sane 2015-04-21 12:06:20 +00:00
project.h make fileFixify() calling convention somewhat sane 2015-04-21 12:06:20 +00:00
property.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
property.h Update copyright headers 2015-02-11 06:49:51 +00:00
qmake_pch.h Update copyright headers 2015-02-11 06:49:51 +00:00
qmake-docs.pro move qmake docs into qtbase 2013-06-17 15:41:55 +02:00
qmake.pri nuke gbuild generator 2015-02-02 11:14:34 +00:00
qmake.pro bring fake qmake project up to snuff 2013-11-04 19:50:07 +01:00