Don't hardcode PLUGINDIR

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e0d948cd2314ccc571531d7025b55af86557191..98cf189ee1cb7e4a69e4df981dbb0f12ef9f2a40 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,13 +106,6 @@ set(DATADIR "share")
 endif(WIN32)
 set(SHAREDIR ${DATADIR})
 
-if (NOT APPLE)
-    set(PLUGINDIR "${CMAKE_INSTALL_FULL_LIBDIR}/${APPLICATION_SHORTNAME}/plugins" CACHE STRING "Extra path to look for Qt plugins like for VFS. May be relative to binary.")
-else()
-    # Inside the .app bundle
-    set(PLUGINDIR "../PlugIns" CACHE STRING "Extra path to look for Qt plugins like for VFS. May be relative to binary.")
-endif()
-
 #####
 ## handle BUILD_OWNCLOUD_OSX_BUNDLE
 # BUILD_OWNCLOUD_OSX_BUNDLE was not initialized OR set to true on OSX

diff --git a/config.h.in b/config.h.in
index 0872b8ced09d3ddf5e12a362a2395dcf05495435..a07a4f9a63719fe314958b5d814dc080cd97a44a 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -33,7 +33,6 @@
 
 #cmakedefine SYSCONFDIR "@SYSCONFDIR@"
 #cmakedefine SHAREDIR "@SHAREDIR@"
-#cmakedefine PLUGINDIR "@PLUGINDIR@"
 
 #cmakedefine01 GUI_TESTING
 

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index df70eb924e04f717fd467d81b467b5e387c01796..d15d6e2632adbd5f3015ffeec1f2a204255f3330 100644 (file)
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -274,19 +274,6 @@ Application::Application(int &argc, char **argv)
     if (!AbstractNetworkJob::httpTimeout)
         AbstractNetworkJob::httpTimeout = cfg.timeout();
 
-#ifdef PLUGINDIR
-    // Setup extra plugin search path
-    QString extraPluginPath = QStringLiteral(PLUGINDIR);
-    if (!extraPluginPath.isEmpty()) {
-        if (QDir::isRelativePath(extraPluginPath))
-            extraPluginPath = QDir(QApplication::applicationDirPath()).filePath(extraPluginPath);
-        qCInfo(lcApplication) << "Adding extra plugin search path:" << extraPluginPath;
-        QStringList pluginPath = libraryPaths();
-        pluginPath.prepend(extraPluginPath);
-        setLibraryPaths(pluginPath);
-    }
-#endif
-
     // Check vfs plugins
     if (Theme::instance()->showVirtualFilesOption() && bestAvailableVfsMode() == Vfs::Off) {
         qCWarning(lcApplication) << "Theme wants to show vfs mode, but no vfs plugins are available";