Don't hardcode PLUGINDIR

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

config.h.in

@@ -33,7 +33,6 @@
 
 #cmakedefine SYSCONFDIR "@SYSCONFDIR@"
 #cmakedefine SHAREDIR "@SHAREDIR@"
-#cmakedefine PLUGINDIR "@PLUGINDIR@"
 
 #cmakedefine01 GUI_TESTING
 

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";