AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
c294067e4b
qt5base-lts/qmake
History
Frederik Gladhorn 34aba4724f Merge remote-tracking branch 'origin/5.4' into dev 
Conflicts:
	src/corelib/io/qiodevice.cpp
	src/plugins/bearer/linux_common/qofonoservice_linux.cpp
	src/plugins/bearer/linux_common/qofonoservice_linux_p.h
	src/plugins/platforms/android/qandroidplatformtheme.cpp
	src/tools/bootstrap/bootstrap.pro
	src/widgets/styles/qmacstyle_mac.mm

Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b
2014-11-24 13:39:13 +01:00
..
doc Doc: Use title case in section1 titles 2014-09-30 13:52:51 +02:00
generators Merge remote-tracking branch 'origin/5.4' into dev 2014-11-24 13:39:13 +01:00
library work around MSVC2010 ICE 2014-10-29 09:37:17 +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 Add a way for qmake + configure to link dynamically to the CRT 2014-09-25 22:14:31 +02: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