AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1996bd4a01
qt5base-lts/qmake
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
..
doc Merge remote-tracking branch 'origin/5.5' into 5.6 2015-08-26 20:06:57 +02:00
generators Merge remote-tracking branch 'origin/5.5' into 5.6 2015-08-26 20:06:57 +02:00
library qmake: mark some types movable 2015-07-08 12:31:00 +00: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