summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-05-09 00:44:24 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-05-13 14:21:22 +0200
commitb5552bab40f2e165cf7196993ffc83785f4d8264 (patch)
tree5ca863fc90caacebd7bd5ebd2464d4b18efdd0dc /mkspecs
parent9cfdd66b6452704349b5f986f31b7f1f03748cb5 (diff)
parent01ce104a3ee3c8af68f6694840931661666984ab (diff)
Merge remote-tracking branch 'origin/stable' into dev
Manually changed enum to LibGL in src/plugins/platforms/xcb/qglxintegration.cpp Change-Id: If34ee6cce3d1d51fb4bb1fdfa59c30389ea0d207
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qt_helper_lib.prf27
-rw-r--r--mkspecs/features/simd.prf2
-rw-r--r--mkspecs/macx-ios-clang/features/qt.prf2
3 files changed, 29 insertions, 2 deletions
diff --git a/mkspecs/features/qt_helper_lib.prf b/mkspecs/features/qt_helper_lib.prf
new file mode 100644
index 0000000000..4af5bcaabb
--- /dev/null
+++ b/mkspecs/features/qt_helper_lib.prf
@@ -0,0 +1,27 @@
+#
+# W A R N I N G
+# -------------
+#
+# This file is not part of the Qt API. It exists purely as an
+# implementation detail. It may change from version to version
+# without notice, or even be removed.
+#
+# We mean it.
+#
+
+load(qt_build_paths)
+
+TEMPLATE = lib
+CONFIG -= qt
+
+contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release
+contains(QT_CONFIG, build_all): CONFIG += build_all
+
+DESTDIR = $$MODULE_BASE_OUTDIR/lib
+DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin
+
+# Static builds always need to be installed, as the convenience libraries
+# are not linked to the final library in this case.
+installed|static: load(qt_installs)
+
+TARGET = $$qtLibraryTarget($$TARGET)
diff --git a/mkspecs/features/simd.prf b/mkspecs/features/simd.prf
index 4f86f60700..62a63f90ca 100644
--- a/mkspecs/features/simd.prf
+++ b/mkspecs/features/simd.prf
@@ -18,7 +18,7 @@ QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH)
#
# Set up compilers for SIMD (SSE/AVX, NEON etc)
#
-*-g++*|intel_icc|*-clang*|*-qcc* {
+gcc { # includes intel_icc and clang variants
sse2 {
HEADERS += $$SSE2_HEADERS
diff --git a/mkspecs/macx-ios-clang/features/qt.prf b/mkspecs/macx-ios-clang/features/qt.prf
index 04ebb1208a..a5b00377ee 100644
--- a/mkspecs/macx-ios-clang/features/qt.prf
+++ b/mkspecs/macx-ios-clang/features/qt.prf
@@ -15,7 +15,7 @@ equals(TEMPLATE, app):contains(QT, gui(-private)?) {
# We do link and dependency resolution for the platform plugin
# manually, since we know we always need the plugin, so we don't
# need to generate an import for it.
- CONFIG -= import_qpa_plugin
+ QTPLUGIN.platforms = -
!no_main_wrapper {
# We use ld to rename the _main symbol to _qt_main, so that we don't get a symbol clash