summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-02-20 11:50:04 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-02-20 22:08:29 +0100
commitdcb710dd87ab15c3af803133ff2449902dbec036 (patch)
tree1f3ed87165f05e45260ff45fb15d5df96d684abb /mkspecs
parent4606ea53958df33fffba680dd75c8b1733ca9f40 (diff)
parente47c2744e6cefa42fc70320e07d534742934f737 (diff)
Merge remote-tracking branch 'origin/stable' into dev
Conflicts: mkspecs/features/unix/separate_debug_info.prf src/gui/kernel/qwindow_p.h src/plugins/platforms/cocoa/qcocoacursor.mm tests/auto/tools/moc/tst_moc.cpp Change-Id: Ieb57834c00f961a747ffe51e6eb9fc9612cebccf
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/common/qcc-base-qnx.conf1
-rw-r--r--mkspecs/features/debug.prf7
-rw-r--r--mkspecs/features/debug_and_release.prf1
-rw-r--r--mkspecs/features/default_post.prf31
-rw-r--r--mkspecs/features/dll.prf2
-rw-r--r--mkspecs/features/qt.prf2
-rw-r--r--mkspecs/features/qt_functions.prf2
-rw-r--r--mkspecs/features/qt_module.prf8
-rw-r--r--mkspecs/features/qt_plugin.prf5
-rw-r--r--mkspecs/features/release.prf7
-rw-r--r--mkspecs/features/resolve_config.prf46
-rw-r--r--mkspecs/features/resolve_target.prf2
-rw-r--r--mkspecs/features/shared.prf7
-rw-r--r--mkspecs/features/static.prf14
-rw-r--r--mkspecs/features/static_and_shared.prf3
-rw-r--r--mkspecs/features/staticlib.prf1
-rw-r--r--mkspecs/features/unix/bsymbolic_functions.prf2
-rw-r--r--mkspecs/features/unix/gdb_dwarf_index.prf2
-rw-r--r--mkspecs/features/unix/separate_debug_info.prf2
19 files changed, 79 insertions, 66 deletions
diff --git a/mkspecs/common/qcc-base-qnx.conf b/mkspecs/common/qcc-base-qnx.conf
index 68a4182e0f..b1bae7122d 100644
--- a/mkspecs/common/qcc-base-qnx.conf
+++ b/mkspecs/common/qcc-base-qnx.conf
@@ -14,6 +14,7 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME += -Wl,-soname,
QMAKE_LFLAGS_THREAD +=
QMAKE_LFLAGS_RPATH = -Wl,-rpath,
+QMAKE_LFLAGS_RPATHLINK = -Wl,-rpath-link,
# -Bsymbolic-functions (ld) support
QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
diff --git a/mkspecs/features/debug.prf b/mkspecs/features/debug.prf
deleted file mode 100644
index b11bfbf6b6..0000000000
--- a/mkspecs/features/debug.prf
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG -= release
-QMAKE_CFLAGS += $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_DEBUG
-QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS_DEBUG
-QMAKE_LFLAGS += $$QMAKE_LFLAGS_DEBUG
-QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_DEBUG
-!debug_and_release:fix_output_dirs:fixExclusiveOutputDirs(debug, release)
diff --git a/mkspecs/features/debug_and_release.prf b/mkspecs/features/debug_and_release.prf
deleted file mode 100644
index 8b8932184f..0000000000
--- a/mkspecs/features/debug_and_release.prf
+++ /dev/null
@@ -1 +0,0 @@
-!macx-xcode:addExclusiveBuilds(debug, Debug, release, Release)
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
index 3afab5240e..cdd200e80b 100644
--- a/mkspecs/features/default_post.prf
+++ b/mkspecs/features/default_post.prf
@@ -4,14 +4,11 @@ contains(TEMPLATE, ".*(lib|app)"):CONFIG += have_target
!have_target:!force_qt: CONFIG -= qt
-!shared:!dll:!static:!staticlib {
- contains(QT_CONFIG, static): CONFIG += static
- else: CONFIG += shared
-}
+load(resolve_config)
QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH)
!isEmpty(QT_BREAKPAD_ROOT_PATH): \ # quick test first whether requested ...
- !staticlib:!static:CONFIG(release, debug|release):have_target: \ # is it applicable?
+ !static:release:have_target: \ # is it applicable?
!contains(TARGET, .*phony_target.*): \ # monster hack, you don't really see this here, right? ;)
system($$QT_BREAKPAD_ROOT_PATH/qtbreakpadsymbols --breakpad-exists) { # do we really have it?
CONFIG += breakpad force_debug_info
@@ -24,9 +21,27 @@ force_debug_info {
QMAKE_LFLAGS_RELEASE = $$QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO
}
-CONFIG(debug, debug|release):load(debug)
-else:load(release)
-debug_and_release:load(debug_and_release)
+debug {
+ QMAKE_CFLAGS += $$QMAKE_CFLAGS_DEBUG
+ QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_DEBUG
+ QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS_DEBUG
+ QMAKE_LFLAGS += $$QMAKE_LFLAGS_DEBUG
+ QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_DEBUG
+} else {
+ QMAKE_CFLAGS += $$QMAKE_CFLAGS_RELEASE
+ QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_RELEASE
+ QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS_RELEASE
+ QMAKE_LFLAGS += $$QMAKE_LFLAGS_RELEASE
+ QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE
+}
+
+dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL
+static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB
+staticlib:unix {
+ QMAKE_CFLAGS += $$QMAKE_CFLAGS_STATIC_LIB
+ QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_STATIC_LIB
+}
+
incredibuild_xge {
CONFIG -= incredibuild_xge
CONFIG = incredibuild_xge $$CONFIG
diff --git a/mkspecs/features/dll.prf b/mkspecs/features/dll.prf
deleted file mode 100644
index 943ab93def..0000000000
--- a/mkspecs/features/dll.prf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG += shared
-
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 5a1e39b1c7..8de038c5f8 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -125,7 +125,7 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
}
isEqual(QT_CURRENT_VERIFY, DEPLOYMENT_PLUGIN):shared:wince*: {
QT_ITEM =
- CONFIG(debug, debug|release): QT_ITEM = $${QTPLUG}d4.dll
+ debug: QT_ITEM = $${QTPLUG}d4.dll
else: QT_ITEM = $${QTPLUG}4.dll
eval(qt_additional_plugin_$${QTPLUG}.files = $$[QT_INSTALL_PLUGINS/get]/$${QT_PLUGINPATH}/$${QT_ITEM})
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index b6e3454f0e..bac7ca1751 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -10,7 +10,7 @@ defineReplace(qtPlatformTargetSuffix) {
defineReplace(qtLibraryTarget) {
LIBRARY_NAME = $$1
- mac:!static:contains(QT_CONFIG, qt_framework) {
+ mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) {
QMAKE_FRAMEWORK_BUNDLE_NAME = $$LIBRARY_NAME
export(QMAKE_FRAMEWORK_BUNDLE_NAME)
} else {
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index e6263af7a5..728d1f5f85 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -25,12 +25,6 @@ isEmpty(VERSION):VERSION = $$QT_VERSION
# Compile as shared/DLL or static according to the option given to configure
# unless overridden. Host builds are always static
host_build|staticlib: CONFIG += static
-!static:!shared {
- contains(QT_CONFIG, static): \
- CONFIG += static
- else: \
- CONFIG += shared
-}
ucmodule = $$upper($$MODULE)
@@ -87,7 +81,7 @@ contains(QT_CONFIG, separate_debug_info_nocopy):CONFIG += separate_debug_info_no
contains(QT_CONFIG, c++11):CONFIG += c++11
#mac frameworks
-mac:!static:contains(QT_CONFIG, qt_framework) {
+mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) {
#QMAKE_FRAMEWORK_VERSION = 4.0
CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework
CONFIG(release, debug|release) {
diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
index 2ec523d78c..54a995daae 100644
--- a/mkspecs/features/qt_plugin.prf
+++ b/mkspecs/features/qt_plugin.prf
@@ -28,10 +28,7 @@ contains(QT_CONFIG, separate_debug_info):CONFIG += separate_debug_info
contains(QT_CONFIG, separate_debug_info_nocopy):CONFIG += separate_debug_info_nocopy
contains(QT_CONFIG, c++11):CONFIG += c++11
-contains(QT_CONFIG, static):CONFIG += static
-else:CONFIG += shared
-
-static {
+CONFIG(static, static|shared) {
isEmpty(MODULE): MODULE = $$basename(TARGET)
MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_plugin_$${MODULE}.pri
diff --git a/mkspecs/features/release.prf b/mkspecs/features/release.prf
deleted file mode 100644
index 2d63c240d0..0000000000
--- a/mkspecs/features/release.prf
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG -= debug
-QMAKE_CFLAGS += $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_RELEASE
-QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS_RELEASE
-QMAKE_LFLAGS += $$QMAKE_LFLAGS_RELEASE
-QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE
-!debug_and_release:fix_output_dirs:fixExclusiveOutputDirs(release, debug) \ No newline at end of file
diff --git a/mkspecs/features/resolve_config.prf b/mkspecs/features/resolve_config.prf
new file mode 100644
index 0000000000..41e82b2382
--- /dev/null
+++ b/mkspecs/features/resolve_config.prf
@@ -0,0 +1,46 @@
+#
+# 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.
+#
+
+staticlib: \
+ CONFIG += static
+else: dll: \
+ CONFIG += shared
+
+CONFIG(static, static|shared) {
+ CONFIG -= shared dll
+ contains(TEMPLATE, ".*lib"): CONFIG += staticlib
+} else {
+ CONFIG -= static staticlib
+ contains(TEMPLATE, ".*lib"): CONFIG += dll
+}
+
+static_and_shared {
+ !macx-xcode: addExclusiveBuilds(static, Static, shared, Shared)
+} else: fix_output_dirs {
+ static: \
+ fixExclusiveOutputDirs(static, shared)
+ else: \
+ fixExclusiveOutputDirs(shared, static)
+}
+
+CONFIG(debug, debug|release): \
+ CONFIG -= release
+else: \
+ CONFIG -= debug
+
+debug_and_release {
+ !macx-xcode: addExclusiveBuilds(debug, Debug, release, Release)
+} else: fix_output_dirs {
+ debug: \
+ fixExclusiveOutputDirs(debug, release)
+ else: \
+ fixExclusiveOutputDirs(release, debug)
+}
diff --git a/mkspecs/features/resolve_target.prf b/mkspecs/features/resolve_target.prf
index c60faf22c0..8cd12b2a00 100644
--- a/mkspecs/features/resolve_target.prf
+++ b/mkspecs/features/resolve_target.prf
@@ -9,6 +9,8 @@
# We mean it.
#
+load(resolve_config)
+
QMAKE_RESOLVED_TARGET = $$absolute_path($$DESTDIR, $$OUT_PWD)/
win32 {
diff --git a/mkspecs/features/shared.prf b/mkspecs/features/shared.prf
deleted file mode 100644
index 86efd8e6d8..0000000000
--- a/mkspecs/features/shared.prf
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG -= static
-contains(TEMPLATE, ".*lib"): {
- CONFIG += dll
- CONFIG -= staticlib
- win32:QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL
-}
-!static_and_shared:fix_output_dirs:fixExclusiveOutputDirs(shared, static)
diff --git a/mkspecs/features/static.prf b/mkspecs/features/static.prf
deleted file mode 100644
index 288852d5df..0000000000
--- a/mkspecs/features/static.prf
+++ /dev/null
@@ -1,14 +0,0 @@
-CONFIG -= shared dll
-contains(TEMPLATE, ".*lib"):{
- CONFIG += staticlib
- unix {
- QMAKE_CFLAGS += $$QMAKE_CFLAGS_STATIC_LIB
- QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_STATIC_LIB
- }
-}
-
-mac {
- QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB
-}
-
-!static_and_shared:fix_output_dirs:fixExclusiveOutputDirs(static, shared)
diff --git a/mkspecs/features/static_and_shared.prf b/mkspecs/features/static_and_shared.prf
deleted file mode 100644
index 47c68e50a0..0000000000
--- a/mkspecs/features/static_and_shared.prf
+++ /dev/null
@@ -1,3 +0,0 @@
-have_target:!macx-xcode {
- addExclusiveBuilds(static, Static, shared, Shared)
-}
diff --git a/mkspecs/features/staticlib.prf b/mkspecs/features/staticlib.prf
deleted file mode 100644
index 4884964a6f..0000000000
--- a/mkspecs/features/staticlib.prf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG += static
diff --git a/mkspecs/features/unix/bsymbolic_functions.prf b/mkspecs/features/unix/bsymbolic_functions.prf
index 5a60463e36..5fca5ac170 100644
--- a/mkspecs/features/unix/bsymbolic_functions.prf
+++ b/mkspecs/features/unix/bsymbolic_functions.prf
@@ -1,5 +1,5 @@
-!staticlib:!static:contains(TEMPLATE, lib) {
+dll {
QMAKE_LFLAGS_SHLIB += $$QMAKE_LFLAGS_BSYMBOLIC_FUNC
!isEmpty(QMAKE_DYNAMIC_LIST_FILE):QMAKE_LFLAGS_SHLIB += $$QMAKE_LFLAGS_DYNAMIC_LIST$$QMAKE_DYNAMIC_LIST_FILE
diff --git a/mkspecs/features/unix/gdb_dwarf_index.prf b/mkspecs/features/unix/gdb_dwarf_index.prf
index 9a7a8e01bc..0a5ee507ff 100644
--- a/mkspecs/features/unix/gdb_dwarf_index.prf
+++ b/mkspecs/features/unix/gdb_dwarf_index.prf
@@ -1,4 +1,4 @@
-!CONFIG(separate_debug_info):CONFIG(debug, debug|release):have_target:!staticlib:!static:!isEmpty(QMAKE_OBJCOPY) {
+!separate_debug_info:have_target:debug:!static:!isEmpty(QMAKE_OBJCOPY) {
contains(TEMPLATE, "lib") {
QMAKE_GDB_INDEX = { test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\"; } &&
diff --git a/mkspecs/features/unix/separate_debug_info.prf b/mkspecs/features/unix/separate_debug_info.prf
index 3ddeffbf44..c5ff6dcba3 100644
--- a/mkspecs/features/unix/separate_debug_info.prf
+++ b/mkspecs/features/unix/separate_debug_info.prf
@@ -1,5 +1,5 @@
-!separate_debug_info_nocopy:have_target:!staticlib:!static:!isEmpty(QMAKE_OBJCOPY) {
+!separate_debug_info_nocopy:have_target:!static:!isEmpty(QMAKE_OBJCOPY) {
qnx {
debug_info_suffix = sym
debug_info_keep = --keep-file-symbols