fix bundling of plugins on OS X.

Author: rygwdn

copyq.pro

@@ -10,19 +10,19 @@ TRANSLATIONS = translations/copyq_cs.ts \
                translations/copyq_es.ts
 
 macx {
+    package_plugins.commands = \
+        mkdir -p copyq.app/Contents/PlugIns/copyq/ ; \
+        cp plugins/*.dylib copyq.app/Contents/PlugIns/copyq/
+    package_plugins.depends = sub-plugins sub-src
+    QMAKE_EXTRA_TARGETS += package_plugins
+
     package_frameworks.commands = \
         test -e copyq.app/Contents/Frameworks/QtCore.framework \
         || $$dirname(QMAKE_QMAKE)/macdeployqt copyq.app
     package_frameworks.target = copyq.app/Contents/Frameworks/QtCore.framework
-    package_frameworks.depends = sub-src sub-plugins
+    package_frameworks.depends = sub-src sub-plugins package_plugins
     QMAKE_EXTRA_TARGETS += package_frameworks
 
-    package_plugins.commands = \
-        mkdir -p copyq.app/Contents/Resources/plugins/ ; \
-        cp plugins/*.dylib copyq.app/Contents/Resources/plugins/
-    package_plugins.depends = sub-plugins
-    QMAKE_EXTRA_TARGETS += package_plugins
-
     bundle_mac.depends = package_frameworks package_plugins
     bundle_mac.target = copyq.app
     QMAKE_EXTRA_TARGETS += bundle_mac

src/item/itemfactory.cpp

@@ -57,21 +57,23 @@ bool findPluginDir(QDir *pluginsDir)
 
 #elif defined(Q_OS_MAC)
     pluginsDir->setPath( QCoreApplication::instance()->applicationDirPath() );
-    if ( pluginsDir->dirName() == "MacOS"
-            && pluginsDir->cdUp() // Contents
-            && pluginsDir->cd("Resources")
-            && pluginsDir->cd("plugins"))
+    if (pluginsDir->dirName() != "MacOS") {
+        return false;
+    }
+
+    if ( pluginsDir->cdUp() // Contents
+            && pluginsDir->cd("Plugins")
+            && pluginsDir->cd("copyq"))
     {
         // OK, found it in the bundle
         COPYQ_LOG("Found plugins in application bundle");
     } else if (
-               pluginsDir->setPath( QCoreApplication::instance()->applicationDirPath() ),
-               pluginsDir->dirName() == "MacOS"
-                && pluginsDir->cdUp() // Contents
-                && pluginsDir->cdUp() // copyq.app
-                && pluginsDir->cdUp() // repo root
-                && pluginsDir->cd("plugins")) {
-            COPYQ_LOG("Found plugins in build tree");
+            pluginsDir->setPath( QCoreApplication::instance()->applicationDirPath() ),
+            pluginsDir->cdUp() // Contents
+            && pluginsDir->cdUp() // copyq.app
+            && pluginsDir->cdUp() // repo root
+            && pluginsDir->cd("plugins")) {
+        COPYQ_LOG("Found plugins in build tree");
     } else {
         return false;
     }