File tree 2 files changed +7
-1
lines changed
2 files changed +7
-1
lines changed Original file line number Diff line number Diff line change 29
29
#define CMAKE_SOURCE_DIR "${CMAKE_SOURCE_DIR}"
30
30
31
31
#define QSCINTILLA_VERSION_STR "${QSCINTILLA_VERSION_STR}"
32
+ //used by Mac to find system Qt plugins when bundle is run from build directory
33
+ #define QTPLUGINSDIR "${QT_PLUGINS_DIR}"
32
34
33
35
#cmakedefine HAVE_POSTGRESQL
34
36
Original file line number Diff line number Diff line change @@ -662,8 +662,12 @@ int main( int argc, char *argv[] )
662
662
QStringList myPathList;
663
663
QCoreApplication::setLibraryPaths ( myPathList );
664
664
// Now set the paths inside the bundle
665
- myPath += " /Contents/plugins " ;
665
+ myPath += " /Contents/Plugins " ;
666
666
QCoreApplication::addLibraryPath ( myPath );
667
+ if ( QgsApplication::isRunningFromBuildDir () )
668
+ {
669
+ QCoreApplication::addLibraryPath ( QTPLUGINSDIR );
670
+ }
667
671
// next two lines should not be needed, testing only
668
672
// QCoreApplication::addLibraryPath( myPath + "/imageformats" );
669
673
// QCoreApplication::addLibraryPath( myPath + "/sqldrivers" );
You can’t perform that action at this time.
0 commit comments