AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5c23199d4e
qt5base-lts/qmake
History
Frederik Gladhorn 5c23199d4e Merge remote-tracking branch 'origin/stable' into dev 
Conflicts:
	configure
	mkspecs/macx-xcode/Info.plist.app
	mkspecs/macx-xcode/Info.plist.lib
	qmake/doc/qmake.qdocconf
	src/corelib/global/qglobal.h
	tests/auto/other/exceptionsafety/exceptionsafety.pro
	tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp

Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a
2013-08-14 09:06:31 +02:00
..
doc Merge remote-tracking branch 'origin/stable' into dev 2013-08-14 09:06:31 +02:00
generators Merge remote-tracking branch 'origin/stable' into dev 2013-08-14 09:06:31 +02:00
library implement simple VFS to support caching during project parsing 2013-08-07 13:58:41 +02:00
cachekeys.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
main.cpp implement simple VFS to support caching during project parsing 2013-08-07 13:58:41 +02:00
Makefile.unix implement simple VFS to support caching during project parsing 2013-08-07 13:58:41 +02:00
Makefile.win32 implement simple VFS to support caching during project parsing 2013-08-07 13:58:41 +02:00
meta.cpp Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
meta.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
option.cpp implement simple VFS to support caching during project parsing 2013-08-07 13:58:41 +02:00
option.h implement simple VFS to support caching during project parsing 2013-08-07 13:58:41 +02:00
project.cpp implement simple VFS to support caching during project parsing 2013-08-07 13:58:41 +02:00
project.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
property.cpp introduce /src qmake property variants 2013-06-12 16:27:21 +02:00
property.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qmake_pch.h Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qmake-docs.pro move qmake docs into qtbase 2013-06-17 15:41:55 +02:00
qmake.pri implement simple VFS to support caching during project parsing 2013-08-07 13:58:41 +02:00
qmake.pro Merge remote-tracking branch 'origin/stable' into dev 2013-06-20 16:45:12 +02:00