qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtbase/qmake
History
Simon Hausmann e281537f20 Merge remote-tracking branch 'origin/5.4' into dev 
Conflicts:
	src/corelib/global/qglobal.h
	src/platformsupport/platformcompositor/qopenglcompositor.cpp
	src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp

Change-Id: I5422868500be695584a496dbbbc719d146bc572d
 		2014-12-18 12:12:58 +01:00
..
doc Doc: fix copy & paste error 2014-12-12 16:53:15 +01:00
generators remove unsupported winrt mkspecs 2014-12-16 11:56:26 +01:00
library work around MSVC2010 ICE 2014-10-29 09:37:17 +01: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 detection of and support for Visual Studio 2015 2014-12-13 05:11:25 +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
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-docs.pro
…
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
…
qmake_pch.h Update license headers and add new license files 2014-09-24 12:26:19 +02:00