AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b65a415e67
qt5base-lts/qmake
History
Frederik Gladhorn b6191b16d4 Merge remote-tracking branch 'origin/5.4' into dev 
Conflicts:
	src/corelib/global/global.pri
	src/corelib/global/qcompilerdetection.h
	src/corelib/global/qglobal.h
	src/corelib/tools/qdatetime.cpp
	src/plugins/platforms/xcb/qxcbscreen.h
	src/plugins/platforms/xcb/qxcbwindow.h
	src/widgets/dialogs/qcolordialog.cpp
	src/widgets/dialogs/qcolordialog_p.h
	tools/configure/configureapp.cpp

Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af
2015-01-21 11:10:14 +01:00
..
doc Doc: added entry for link to main page Qt Creator 2015-01-16 10:29:35 +01:00
generators Merge remote-tracking branch 'origin/5.4' into dev 2015-01-21 11:10:14 +01:00
library Merge remote-tracking branch 'origin/5.4' into dev 2015-01-21 11:10:14 +01:00
cachekeys.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
main.cpp Update license headers and add new license files 2014-09-24 12:26:19 +02:00
Makefile.unix Use new, supported APIs in OS X 10.10 and iOS 8.0 to get the OS version. 2014-09-12 22:01:58 +02:00
Makefile.win32 Merge remote-tracking branch 'origin/5.4' into dev 2015-01-21 11:10:14 +01:00
meta.cpp Update license headers and add new license files 2014-09-24 12:26:19 +02:00
meta.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
option.cpp Update license headers and add new license files 2014-09-24 12:26:19 +02:00
option.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
project.cpp Update license headers and add new license files 2014-09-24 12:26:19 +02:00
project.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
property.cpp Update license headers and add new license files 2014-09-24 12:26:19 +02:00
property.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qmake_pch.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qmake-docs.pro move qmake docs into qtbase 2013-06-17 15:41:55 +02:00
qmake.pri Use new, supported APIs in OS X 10.10 and iOS 8.0 to get the OS version. 2014-09-12 22:01:58 +02:00
qmake.pro bring fake qmake project up to snuff 2013-11-04 19:50:07 +01:00