File tree 3 files changed +4
-4
lines changed
3 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -1032,15 +1032,15 @@ int main( int argc, char *argv[] )
1032
1032
QCoreApplication::addLibraryPath ( QApplication::applicationDirPath ()
1033
1033
+ QDir::separator () + " qtplugins" );
1034
1034
#endif
1035
- #ifdef Q_OS_MAC
1035
+ #if defined(Q_OS_UNIX)
1036
1036
// Resulting libraryPaths has critical QGIS plugin paths first, then any Qt plugin paths, then
1037
1037
// any dev-defined paths (in app's qt.conf) and/or user-defined paths (QT_PLUGIN_PATH env var).
1038
1038
//
1039
1039
// NOTE: Minimizes, though does not fully protect against, crashes due to dev/user-defined libs
1040
1040
// built against a different Qt/QGIS, while still allowing custom C++ plugins to load.
1041
1041
QStringList libPaths ( QCoreApplication::libraryPaths () );
1042
1042
1043
- QgsDebugMsgLevel ( QStringLiteral ( " Initial macOS QCoreApplication::libraryPaths: %1" )
1043
+ QgsDebugMsgLevel ( QStringLiteral ( " Initial macOS/UNIX QCoreApplication::libraryPaths: %1" )
1044
1044
.arg ( libPaths.join ( " " ) ), 4 );
1045
1045
1046
1046
// Strip all critical paths that should always be prepended
Original file line number Diff line number Diff line change @@ -10473,7 +10473,7 @@ class QgsPythonRunnerImpl : public QgsPythonRunner
10473
10473
void QgisApp::loadPythonSupport()
10474
10474
{
10475
10475
QString pythonlibName( QStringLiteral( "qgispython" ) );
10476
- #if defined(Q_OS_MAC) || defined(Q_OS_LINUX )
10476
+ #if defined(Q_OS_UNIX )
10477
10477
pythonlibName.prepend( QgsApplication::libraryPath() );
10478
10478
#endif
10479
10479
#ifdef __MINGW32__
Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ QStringList &QgsServerPlugins::serverPlugins()
39
39
bool QgsServerPlugins::initPlugins ( QgsServerInterface *interface )
40
40
{
41
41
QString pythonlibName ( QStringLiteral ( " qgispython" ) );
42
- #if defined(Q_OS_MAC) || defined(Q_OS_LINUX )
42
+ #if defined(Q_OS_UNIX )
43
43
pythonlibName.prepend ( QgsApplication::libraryPath () );
44
44
#endif
45
45
#ifdef __MINGW32__
You can’t perform that action at this time.
0 commit comments