AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b6191b16d4
qt5base-lts/mkspecs/common
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
..
aix Update license headers and add new license files 2014-09-24 12:26:19 +02:00
android Update license headers and add new license files 2014-09-24 12:26:19 +02:00
c89 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
ios Update license headers and add new license files 2014-09-24 12:26:19 +02:00
mac Update license headers and add new license files 2014-09-24 12:26:19 +02:00
nacl Update license headers and add new license files 2014-09-24 12:26:19 +02:00
posix Update license headers and add new license files 2014-09-24 12:26:19 +02:00
qnx Update license headers and add new license files 2014-09-24 12:26:19 +02:00
wince Update license headers and add new license files 2014-09-24 12:26:19 +02:00
winrt_winphone WinRT: Refactor icon specification usage 2015-01-13 11:29:42 +01: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 Clean up ltcg.prf with variables, including a new static mode 2015-01-11 03:41:48 +01:00
g++-base.conf Add optimize_full qmake config option 2014-03-06 12:21:14 +01:00
g++-macx.conf Remove the -load_all option from the linker enabling static builds 2015-01-07 09:57:07 +01: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 make -force-debug-info work for objective C 2014-09-26 15:35:57 +02:00
gcc-base-unix.conf Introduce qmake feature use_gold_linker 2014-07-23 16:50:08 +02:00
gcc-base.conf Clean up ltcg.prf with variables, including a new static mode 2015-01-11 03:41:48 +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 Strip bootstrapped binaries of unused sections 2014-05-19 19:33:15 +02:00
llvm.conf Refer to Apple products by their actual names. 2013-07-10 17:32:48 +02:00
mac.conf Enable rpath support on OS X and iOS platform 2014-08-09 15:37:39 +02:00
macx.conf Merge "Merge branch 'stable' into dev" into refs/staging/dev 2013-07-12 14:03:21 +02:00
msvc-desktop.conf MSVC: Disable compiler warning 4996 for debug builds 2015-01-09 13:14:59 +01:00
qcc-base-qnx-armle-v7.conf QNX: Rename qcc-base-qnx-armv7le.conf mkspec. 2015-01-18 00:13:09 +01: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 release-with-debuginfo flags for QCC 2014-11-07 22:59:29 +01:00
sanitize.conf Add support for gcc/clang's sanitize features 2014-10-02 19:45:00 +02: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