diff options
author | Fabian Müller <fmueller@owncloud.com> | 2022-02-19 17:34:42 +0300 |
---|---|---|
committer | Hannah von Reth <vonreth@kde.org> | 2022-02-28 16:51:29 +0300 |
commit | 14146c8d7dfb095a4d189b20d5381fcc6efe51f0 (patch) | |
tree | 065337e55bb2ca13e5ebccd7526206357ab8fa4a /src/gui/application.cpp | |
parent | 9767eda0168bdc72368da93f20ca9224910da578 (diff) |
Set up VFS integration before parsing options
Diffstat (limited to 'src/gui/application.cpp')
-rw-r--r-- | src/gui/application.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/gui/application.cpp b/src/gui/application.cpp index 5bde01bbd..2769916c4 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -247,6 +247,21 @@ Application::Application(int &argc, char **argv) // needed during commandline options parsing setApplicationVersion(_theme->versionSwitchOutput()); +#if defined(OC_PLUGIN_DIR) && defined(Q_OS_LINUX) + const QString extraPluginDir = QDir(QApplication::applicationDirPath()).filePath(QStringLiteral(OC_PLUGIN_DIR)); + qCInfo(lcApplication) << "Adding extra plugin search path:" << extraPluginDir; + this->addLibraryPath(extraPluginDir); +#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"; + } + if (isVfsPluginAvailable(Vfs::WindowsCfApi)) + qCInfo(lcApplication) << "VFS windows plugin is available"; + if (isVfsPluginAvailable(Vfs::WithSuffix)) + qCInfo(lcApplication) << "VFS suffix plugin is available"; + parseOptions(arguments()); if (isRunning()) @@ -276,21 +291,6 @@ Application::Application(int &argc, char **argv) if (!AbstractNetworkJob::httpTimeout) AbstractNetworkJob::httpTimeout = cfg.timeout(); -#if defined(OC_PLUGIN_DIR) && defined(Q_OS_LINUX) - const QString extraPluginDir = QDir(QApplication::applicationDirPath()).filePath(QStringLiteral(OC_PLUGIN_DIR)); - qCInfo(lcApplication) << "Adding extra plugin search path:" << extraPluginDir; - this->addLibraryPath(extraPluginDir); -#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"; - } - if (isVfsPluginAvailable(Vfs::WindowsCfApi)) - qCInfo(lcApplication) << "VFS windows plugin is available"; - if (isVfsPluginAvailable(Vfs::WithSuffix)) - qCInfo(lcApplication) << "VFS suffix plugin is available"; - if (_quitInstance) { QTimer::singleShot(0, qApp, &QApplication::quit); return; |