diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-26 11:43:25 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-27 14:50:47 +0200 |
| commit | cc2d45fd72a764312be9757ef96cc9abd5d1b423 (patch) | |
| tree | 2273bcc18b83f11aa2defb6b34c946005211b33c /src | |
| parent | f00d2fe304a1a48c48efb68e9a3ec6873c7ca355 (diff) | |
CMake: Avoid duplicate symbol errors due to a common resource name
The macOS nativestyle plugin uses the 'qmake_immediate' resource name,
which conflicts with any test / example that might create a resource
with the same name.
This is problematic in static builds because it causes duplicate
symbol errors when linking.
Use a different unique resource name instead.
Pick-to: 6.1 6.0
Fixes: QTBUG-93172
Change-Id: I29dee69190d75fe11c8993353349e3db2004d276
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/nativestyle/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/nativestyle/CMakeLists.txt b/src/imports/nativestyle/CMakeLists.txt index da46732e..83e75278 100644 --- a/src/imports/nativestyle/CMakeLists.txt +++ b/src/imports/nativestyle/CMakeLists.txt @@ -88,7 +88,7 @@ if(MACOS) "util/FocusFrame.qml" ) - qt_internal_add_resource(qtquickcontrols2nativestyleplugin "qmake_immediate" + qt_internal_add_resource(qtquickcontrols2nativestyleplugin "qqc2_mac_native_resources" # special case PREFIX "/" FILES |