aboutsummaryrefslogtreecommitdiffstats
path: root/dependencies.yaml
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@qt.io>2021-04-20 14:45:59 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-04-22 15:36:08 +0000
commitf4c31d1d960a626c8d370fb9f021f56e2ac6709c (patch)
tree9f9390c7eaf3486dd6e0d3e05b038c30e9057e23 /dependencies.yaml
parentb354ce3ac461e3d87a32bec06c6e3686247a960d (diff)
Native style: fix statically built apps that links to both widgets and controls
The c++ symbols are already namespaced into QQC2. But since there is no namespace concept in obj-c, we use QT_MANGLE_NAMESPACE to wrap those symbols into a "fake" namespace by concatinating symbol name and namespace name together. The problem is that QT_MANGLE_NAMESPACE only take the QT_NAMESPACE into account, and not the additional QQC2 namespace. The result is that the application will fail linking because of duplicate obj-c symbols when you combine widgets and controls in a statically linked application. This patch will redefine the affected macros locally in qquickmacstyle_mac, so that both the Qt namespace and the controls namespace are taken into account. Fixes: QTBUG-92883 Change-Id: Ic2f84ad9c0005fdd2553729d897cee113a4ff24d Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit a372b35d93d4deb14ba9b855c49bcbd328b32381) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'dependencies.yaml')
0 files changed, 0 insertions, 0 deletions