From bb7762c2b47a5050f42f5c165cc97fc87177dc01 Mon Sep 17 00:00:00 2001 From: lbartoletti Date: Wed, 27 Feb 2019 23:12:17 +0100 Subject: [PATCH] BSD patches (cherry picked from commit 34a0650177f51ee3b38bbfc686a59e230adfc5ab) --- src/app/main.cpp | 4 ++-- src/app/qgisapp.cpp | 2 +- src/server/qgsserverplugins.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index 26e5616aec5c..e776887019c2 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -1033,7 +1033,7 @@ int main( int argc, char *argv[] ) QCoreApplication::addLibraryPath( QApplication::applicationDirPath() + QDir::separator() + "qtplugins" ); #endif -#ifdef Q_OS_MAC +#if defined(Q_OS_UNIX) // Resulting libraryPaths has critical QGIS plugin paths first, then any Qt plugin paths, then // any dev-defined paths (in app's qt.conf) and/or user-defined paths (QT_PLUGIN_PATH env var). // @@ -1041,7 +1041,7 @@ int main( int argc, char *argv[] ) // built against a different Qt/QGIS, while still allowing custom C++ plugins to load. QStringList libPaths( QCoreApplication::libraryPaths() ); - QgsDebugMsgLevel( QStringLiteral( "Initial macOS QCoreApplication::libraryPaths: %1" ) + QgsDebugMsgLevel( QStringLiteral( "Initial macOS/UNIX QCoreApplication::libraryPaths: %1" ) .arg( libPaths.join( " " ) ), 4 ); // Strip all critical paths that should always be prepended diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index 2e1b17731ceb..c3697a8ef638 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -10256,7 +10256,7 @@ class QgsPythonRunnerImpl : public QgsPythonRunner void QgisApp::loadPythonSupport() { QString pythonlibName( QStringLiteral( "qgispython" ) ); -#if defined(Q_OS_MAC) || defined(Q_OS_LINUX) +#if defined(Q_OS_UNIX) pythonlibName.prepend( QgsApplication::libraryPath() ); #endif #ifdef __MINGW32__ diff --git a/src/server/qgsserverplugins.cpp b/src/server/qgsserverplugins.cpp index fe8ddac7d13c..bc535cc235ba 100644 --- a/src/server/qgsserverplugins.cpp +++ b/src/server/qgsserverplugins.cpp @@ -41,7 +41,7 @@ QStringList &QgsServerPlugins::serverPlugins() bool QgsServerPlugins::initPlugins( QgsServerInterface *interface ) { QString pythonlibName( QStringLiteral( "qgispython" ) ); -#if defined(Q_OS_MAC) || defined(Q_OS_LINUX) +#if defined(Q_OS_UNIX) pythonlibName.prepend( QgsApplication::libraryPath() ); #endif #ifdef __MINGW32__