AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2bebf640cc
qt5base-lts/qmake
History
Liang Qi 790aef362f Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	.qmake.conf
	configure
	src/corelib/global/qglobal.h
	src/tools/qdoc/node.cpp
	src/tools/qdoc/qdocdatabase.cpp
	tests/auto/corelib/io/qsettings/tst_qsettings.cpp
	tools/configure/configureapp.cpp

Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f
2015-10-23 14:45:03 +02:00
..
doc Merge remote-tracking branch 'origin/5.6' into dev 2015-10-23 14:45:03 +02:00
generators support relative paths in QMAKE_RPATHDIR 2015-10-20 17:18:16 +00: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 Move the official Qt version from qglobal.h to .qmake.conf 2015-10-14 20:12:57 +00:00
Makefile.win32 Merge remote-tracking branch 'origin/5.6' into dev 2015-10-23 14:45:03 +02:00
meta.cpp make .prl processing less convoluted 2015-10-02 14:01:13 +00:00
meta.h make .prl processing less convoluted 2015-10-02 14:01:13 +00:00
option.cpp Distinguish between Objective-C and Objective-C++ sources 2015-10-09 15:15:17 +00:00
option.h Distinguish between Objective-C and Objective-C++ sources 2015-10-09 15:15:17 +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