qgis-20_qt-plugins

qgis-20_qt-plugins

diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
index 607bd68..5b38a39 100644
--- a/cmake_templates/qgsconfig.h.in
+++ b/cmake_templates/qgsconfig.h.in
@@ -30,6 +30,7 @@
 
 #define QSCINTILLA_VERSION_STR "${QSCINTILLA_VERSION_STR}"
 //used by Mac to find system Qt plugins when bundle is run from build directory
+#define QGIS_MACAPP_BUNDLE ${QGIS_MACAPP_BUNDLE}
 #define QTPLUGINSDIR "${QT_PLUGINS_DIR}"
 
 #cmakedefine USING_NMAKE
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 550943d..70b57c1 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -956,7 +956,7 @@ int main( int argc, char *argv[] )
     // Now set the paths inside the bundle
     myPath += "/Contents/Plugins";
     QCoreApplication::addLibraryPath( myPath );
-    if ( QgsApplication::isRunningFromBuildDir() )
+    if ( QgsApplication::isRunningFromBuildDir() || QGIS_MACAPP_BUNDLE == 0 )
     {
       QCoreApplication::addLibraryPath( QTPLUGINSDIR );
     }