From 74884dd3821b22453804cd726e8d10908f493adf Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 8 Nov 2011 13:55:21 +0100
Subject: Qt Designer: Fix static linking on Mac.

Add a comment in shared.pri explaining the problem.
See also e7762b60d519c9ae4b47f6c4ceece584408247ea

Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>

Task-number: QTBUG-22542
---
 .../src/components/propertyeditor/propertyeditor.pri         |  9 +++++++--
 tools/designer/src/lib/shared/shared.pri                     | 12 +++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/tools/designer/src/components/propertyeditor/propertyeditor.pri b/tools/designer/src/components/propertyeditor/propertyeditor.pri
index 60219e1..e5e4d46 100644
--- a/tools/designer/src/components/propertyeditor/propertyeditor.pri
+++ b/tools/designer/src/components/propertyeditor/propertyeditor.pri
@@ -4,8 +4,13 @@
 
 INCLUDEPATH += $$PWD
 
-include(../../../../shared/qtpropertybrowser/qtpropertybrowser.pri)
-include(../../../../shared/qtgradienteditor/qtcolorbutton.pri)
+contains(CONFIG, static) { # see shared.pri
+    INCLUDEPATH *= $$QT_SOURCE_TREE/tools/shared/qtpropertybrowser
+    INCLUDEPATH *= $$QT_SOURCE_TREE/tools/shared/qtgradienteditor
+} else {
+    include(../../../../shared/qtpropertybrowser/qtpropertybrowser.pri)
+    include(../../../../shared/qtgradienteditor/qtcolorbutton.pri)
+}
 
 FORMS += $$PWD/paletteeditor.ui \
     $$PWD/stringlisteditor.ui \
diff --git a/tools/designer/src/lib/shared/shared.pri b/tools/designer/src/lib/shared/shared.pri
index 9d50911..b07f565 100644
--- a/tools/designer/src/lib/shared/shared.pri
+++ b/tools/designer/src/lib/shared/shared.pri
@@ -2,7 +2,17 @@
 INCLUDEPATH += $$PWD
 contains(QT_CONFIG, script): QT += script
 
-include(../../../../shared/qtpropertybrowser/qtpropertybrowserutils.pri)
+# When linking dynamically, use only the QKeySequenceEdit widget of
+# the property browser solution as the other symbols of the property
+# browser solution must not be duplicated (see e7762b60d51). When linking
+# statically, add the property browser solution to make the library self-contained
+# and use only the include path in the property editor (see propertyeditor.pri)
+
+contains(CONFIG, static) {
+    include(../../../../shared/qtpropertybrowser/qtpropertybrowser.pri)
+} else {
+   include(../../../../shared/qtpropertybrowser/qtpropertybrowserutils.pri)
+}
 include(../../../../shared/deviceskin/deviceskin.pri)
 include(../../../../../src/tools/rcc/rcc.pri)
 include(../../../../shared/findwidget/findwidget.pri)
-- 
cgit v0.12