Remove support to use non standard plugin dir

owncloud · May 30, 2023 · b56f22b · b56f22b
1 parent dcdd84f
commit b56f22b
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 68 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,8 +49,6 @@ if(UNIT_TESTING)
 endif()
 include(CTest)
 
-
-include(OCConfigPluginDir)
 include(OCBundleResources)
 include(OCApplyCommonSettings)
 

diff --git a/cmake/modules/OCConfigPluginDir.cmake b/cmake/modules/OCConfigPluginDir.cmake
diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
@@ -64,9 +64,6 @@ elseif(UNIX)
         list(APPEND libsync_SRCS platform_mac.mm platform_mac_deprecated.mm)
     else()
         list(APPEND libsync_SRCS platform_unix.cpp)
-        if(OC_PLUGIN_DIR)
-            set_source_files_properties(platform_unix.cpp PROPERTIES COMPILE_DEFINITIONS OC_PLUGIN_DIR="${OC_PLUGIN_DIR}")
-        endif()
     endif()
 endif()
 

diff --git a/src/libsync/platform_unix.cpp b/src/libsync/platform_unix.cpp
@@ -51,14 +51,5 @@ void UnixPlatform::setLimitsForCoreDumps()
     }
 }
 
-void UnixPlatform::setApplication(QCoreApplication *application)
-{
-    Platform::setApplication(application);
-
-#if defined(OC_PLUGIN_DIR)
-    const QString pluginDirPath = QDir(QCoreApplication::applicationDirPath()).filePath(QStringLiteral(OC_PLUGIN_DIR));
-    application->addLibraryPath(pluginDirPath);
-#endif
-}
 
 } // namespace OCC
diff --git a/src/libsync/platform_unix.h b/src/libsync/platform_unix.h
@@ -27,8 +27,6 @@ class UnixPlatform : public Platform
 
     ~UnixPlatform() override;
 
-    void setApplication(QCoreApplication *application) override;
-
 private:
     void setLimitsForCoreDumps();
 };

diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
@@ -397,29 +397,15 @@ QString Theme::aboutVersions(Theme::VersionFormat format) const
         }
     }
 
-
-#if defined(OC_PLUGIN_DIR)
-    const QString pluginDirComment = QCoreApplication::translate("ownCloudTheme::pluginDir", "Plugin dir: %1%2").arg(QDir(QCoreApplication::applicationDirPath()).filePath(QStringLiteral(OC_PLUGIN_DIR)), br);
-#else
-    const QString pluginDirComment = QString();
-#endif
-
     return QCoreApplication::translate("ownCloudTheme::aboutVersions()",
         "%1 %2%7"
         "%8"
         "Libraries Qt %3, %4%7"
-        "%9"
         "Using virtual files plugin: %5%7"
         "%6")
-        .arg(appName(),
-            _version,
-            qtVersionString,
-            QSslSocket::sslLibraryVersionString(),
-            Vfs::modeToString(VfsPluginManager::instance().bestAvailableVfsMode()),
-            QSysInfo::productType() % QLatin1Char('-') % QSysInfo::kernelVersion(),
-            br,
-            gitUrl,
-            pluginDirComment);
+        .arg(appName(), _version, qtVersionString, QSslSocket::sslLibraryVersionString(),
+            Vfs::modeToString(VfsPluginManager::instance().bestAvailableVfsMode()), QSysInfo::productType() % QLatin1Char('-') % QSysInfo::kernelVersion(), br,
+            gitUrl);
 }