Skip to content

Commit 9125522

Browse files
lbartolettinyalldawson
authored andcommitted
BSD patches
(cherry picked from commit 34a0650)
1 parent 2a7a1b3 commit 9125522

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/app/main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1032,15 +1032,15 @@ int main( int argc, char *argv[] )
10321032
QCoreApplication::addLibraryPath( QApplication::applicationDirPath()
10331033
+ QDir::separator() + "qtplugins" );
10341034
#endif
1035-
#ifdef Q_OS_MAC
1035+
#if defined(Q_OS_UNIX)
10361036
// Resulting libraryPaths has critical QGIS plugin paths first, then any Qt plugin paths, then
10371037
// any dev-defined paths (in app's qt.conf) and/or user-defined paths (QT_PLUGIN_PATH env var).
10381038
//
10391039
// NOTE: Minimizes, though does not fully protect against, crashes due to dev/user-defined libs
10401040
// built against a different Qt/QGIS, while still allowing custom C++ plugins to load.
10411041
QStringList libPaths( QCoreApplication::libraryPaths() );
10421042

1043-
QgsDebugMsgLevel( QStringLiteral( "Initial macOS QCoreApplication::libraryPaths: %1" )
1043+
QgsDebugMsgLevel( QStringLiteral( "Initial macOS/UNIX QCoreApplication::libraryPaths: %1" )
10441044
.arg( libPaths.join( " " ) ), 4 );
10451045

10461046
// Strip all critical paths that should always be prepended

src/app/qgisapp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10473,7 +10473,7 @@ class QgsPythonRunnerImpl : public QgsPythonRunner
1047310473
void QgisApp::loadPythonSupport()
1047410474
{
1047510475
QString pythonlibName( QStringLiteral( "qgispython" ) );
10476-
#if defined(Q_OS_MAC) || defined(Q_OS_LINUX)
10476+
#if defined(Q_OS_UNIX)
1047710477
pythonlibName.prepend( QgsApplication::libraryPath() );
1047810478
#endif
1047910479
#ifdef __MINGW32__

src/server/qgsserverplugins.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ QStringList &QgsServerPlugins::serverPlugins()
3939
bool QgsServerPlugins::initPlugins( QgsServerInterface *interface )
4040
{
4141
QString pythonlibName( QStringLiteral( "qgispython" ) );
42-
#if defined(Q_OS_MAC) || defined(Q_OS_LINUX)
42+
#if defined(Q_OS_UNIX)
4343
pythonlibName.prepend( QgsApplication::libraryPath() );
4444
#endif
4545
#ifdef __MINGW32__

0 commit comments

Comments
 (0)