AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
442a6ef029
qt5base-lts/mkspecs/common
History
Frederik Gladhorn 1326cd15f7 Merge remote-tracking branch 'origin/stable' into dev 
Conflicts:
	mkspecs/qnx-x86-qcc/qplatformdefs.h
	src/corelib/global/qglobal.h
	src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
	src/opengl/qgl.cpp
	src/opengl/qglpixelbuffer.cpp
	src/opengl/qglshaderprogram.cpp
	tests/auto/opengl/qglthreads/tst_qglthreads.cpp

Change-Id: Iaba137884d3526a139000ca26fee02bb27b5cdb5
2014-05-06 16:50:03 +02:00
..
aix Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
android Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
c89 Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
ios purge vestiges of opengl es 1 support 2014-04-04 19:32:21 +02:00
mac expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
nacl Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
posix Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qnx QNX: Unified qplatformdefs 2014-02-27 10:35:41 +01:00
wince purge vestiges of opengl es 1 support 2014-04-04 19:32:21 +02:00
winrt_winphone Windows Phone: add language control to the package manifest 2014-04-30 08:48:15 +02:00
armcc.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
clang-mac.conf Enable C++11 on OSX when using Clang 2013-04-05 14:23:23 +02:00
clang.conf Add support for using -isystem in qmake 2014-01-20 02:42:31 +01:00
g++-base.conf Add optimize_full qmake config option 2014-03-06 12:21:14 +01:00
g++-macx.conf Refer to Apple products by their actual names. 2013-07-10 17:32:48 +02:00
g++-unix.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
g++.conf Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
gcc-base-mac.conf Do not limit clang generated debug info to dwarf-2 on mac. 2014-01-21 15:18:24 +01:00
gcc-base-unix.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
gcc-base.conf Add optimize_full qmake config option 2014-03-06 12:21:14 +01:00
ios.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
linux-android.conf purge vestiges of opengl es 1 support 2014-04-04 19:32:21 +02:00
linux.conf purge vestiges of opengl es 1 support 2014-04-04 19:32:21 +02:00
llvm.conf Refer to Apple products by their actual names. 2013-07-10 17:32:48 +02:00
mac.conf Merge "Merge branch 'stable' into dev" into refs/staging/dev 2013-07-12 14:03:21 +02:00
macx.conf Merge "Merge branch 'stable' into dev" into refs/staging/dev 2013-07-12 14:03:21 +02:00
qcc-base-qnx-armv7le.conf Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
qcc-base-qnx-x86.conf Add QMAKE_NM to the mkspecs 2013-06-10 16:46:06 +02:00
qcc-base-qnx.conf make QMAKE_DIRLIST_SEP consistent with QMAKE_DIR_SEP 2014-04-30 16:57:01 +02:00
qcc-base.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
shell-unix.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00
shell-win32.conf make sure that installed meta files are always postprocessed 2013-10-11 21:04:04 +02:00
unix.conf Fix '=' alignment and replace tabs in *.conf (whitespace only change) 2013-03-27 17:16:37 +01:00