summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Sorvig <morten.sorvig@nokia.com>2011-10-19 13:34:11 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-23 10:23:32 +0200
commit5603f94eaa538dbe28fc426065d65a27799adedc (patch)
treee380daefd4ebf870b36ff18b6f77b0c1ec295da5
parentf6e0a2f59f79ba6b20f2d4d00807d26b71fa9178 (diff)
Remove "duplicate objective-c class" warning.
Qt would dlopen both libqcocoa.dylib and libqcocoa_debug.dylib, causing duplicate implementations if the classes in the cocoa plugin (QNSView etc) Fix this by building the release version only. Change-Id: I1244a83c49999ce28edd97400e792fa2a0665fec Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
-rw-r--r--src/plugins/platforms/cocoa/cocoa.pro5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro
index 2c7acc0fcb..d69f08e86e 100644
--- a/src/plugins/platforms/cocoa/cocoa.pro
+++ b/src/plugins/platforms/cocoa/cocoa.pro
@@ -53,6 +53,11 @@ CONFIG += qpa/basicunixfontdatabase
target.path += $$[QT_INSTALL_PLUGINS]/platforms
INSTALLS += target
+# Build the release libqcocoa.dylib only, skip the debug version.
+# The Qt plugin loader will dlopen both if found, causing duplicate
+# Objective-c class definitions for the classes defined in the plugin.
+contains(QT_CONFIG,release):CONFIG -= debug
+
# Acccessibility debug support
# DEFINES += QT_COCOA_ENABLE_ACCESSIBILITY_INSPECTOR
# include ($$PWD/../../../../util/accessibilityinspector/accessibilityinspector.pri)