Qt Designer: Fix static linking on Mac.

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

(cherry picked from commit 74884dd3821b22453804cd726e8d10908f493adf)

Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Task-number: QTBUG-22542

Change-Id: Id93bcc22f61825cb317c8e8f79d603589da3a10b
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/designer/src/lib/shared/shared.pri b/src/designer/src/lib/shared/shared.pri
index e78fa77..49029ad 100644 (file)
--- a/src/designer/src/lib/shared/shared.pri
+++ b/src/designer/src/lib/shared/shared.pri
@@ -1,9 +1,19 @@
 
 INCLUDEPATH += $$PWD
 
-include(../../../../shared/qtpropertybrowser/qtpropertybrowserutils.pri)
-include(../../../../shared/deviceskin/deviceskin.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($$QT.core.sources/../tools/rcc/rcc.pri)
 include(../../../../shared/findwidget/findwidget.pri)
 include(../../../../shared/qtgradienteditor/qtgradienteditor.pri)