BSD patches

lbartoletti · nyalldawson · commit bb7762c2b47a · 2019-03-07T12:02:43.000+10:00
(cherry picked from commit 34a0650)
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -1033,15 +1033,15 @@ 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).
   //
   // NOTE: Minimizes, though does not fully protect against, crashes due to dev/user-defined libs
   //       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
@@ -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
@@ -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__

Original file line number	Diff line number	Diff line change
`@@ -10256,7 +10256,7 @@ class QgsPythonRunnerImpl : public QgsPythonRunner`
`10256`	`10256`	`void QgisApp::loadPythonSupport()`
`10257`	`10257`	`{`
`10258`	`10258`	`QString pythonlibName( QStringLiteral( "qgispython" ) );`
`10259`		`-#if defined(Q_OS_MAC) \|\| defined(Q_OS_LINUX)`
	`10259`	`+#if defined(Q_OS_UNIX)`
`10260`	`10260`	`pythonlibName.prepend( QgsApplication::libraryPath() );`
`10261`	`10261`	`#endif`
`10262`	`10262`	`#ifdef __MINGW32__`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ QStringList &QgsServerPlugins::serverPlugins()`
`41`	`41`	`bool QgsServerPlugins::initPlugins( QgsServerInterface *interface )`
`42`	`42`	`{`
`43`	`43`	`QString pythonlibName( QStringLiteral( "qgispython" ) );`
`44`		`-#if defined(Q_OS_MAC) \|\| defined(Q_OS_LINUX)`
	`44`	`+#if defined(Q_OS_UNIX)`
`45`	`45`	`pythonlibName.prepend( QgsApplication::libraryPath() );`
`46`	`46`	`#endif`
`47`	`47`	`#ifdef __MINGW32__`