From: Friedemann Kleint Date: Wed, 9 Nov 2011 10:05:41 +0000 (+0100) Subject: Qt Designer: Fix static linking on Mac. X-Git-Tag: accepted/tizen/20131212.181521~424 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=667146056f9c2667671a9093b64ed1c698f9d761;p=platform%2Fupstream%2Fqttools.git 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 Task-number: QTBUG-22542 Change-Id: Id93bcc22f61825cb317c8e8f79d603589da3a10b Sanity-Review: Qt Sanity Bot Reviewed-by: Friedemann Kleint --- diff --git a/src/designer/src/lib/shared/shared.pri b/src/designer/src/lib/shared/shared.pri index e78fa77..49029ad 100644 --- 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)