Install globe.earth in QGIS_DATA_DIR/globe

pka · pka · commit b942557f7702 · 2011-07-05T22:13:09.000+02:00
diff --git a/src/plugins/globe/CMakeLists.txt b/src/plugins/globe/CMakeLists.txt
@@ -66,3 +66,6 @@ TARGET_LINK_LIBRARIES(globeplugin
 INSTALL(TARGETS globeplugin
   RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
   LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
+
+INSTALL (FILES globe.earth
+         DESTINATION ${QGIS_DATA_DIR}/globe)
diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp
@@ -23,6 +23,7 @@
 #include <qgisinterface.h>
 #include <qgisgui.h>
 #include <qgslogger.h>
+#include <qgsapplication.h>
 #include <qgsmapcanvas.h>
 
 #include <QAction>
@@ -102,7 +103,7 @@ void GlobePlugin::run()
 
   // read base layers from earth file
   EarthFile earthFile;
-  if ( !earthFile.readXML( "/home/pi/devel/gis/qgis/src/plugins/globe/globe.earth" ) )
+  if ( !earthFile.readXML( QString("%1/%2").arg(QgsApplication::pkgDataPath()).arg("globe/globe.earth").toStdString() ) )
   {
     return;
   }

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`#include <qgisinterface.h>`
`24`	`24`	`#include <qgisgui.h>`
`25`	`25`	`#include <qgslogger.h>`
	`26`	`+#include <qgsapplication.h>`
`26`	`27`	`#include <qgsmapcanvas.h>`
`27`	`28`
`28`	`29`	`#include <QAction>`
`@@ -102,7 +103,7 @@ void GlobePlugin::run()`
`102`	`103`
`103`	`104`	`// read base layers from earth file`
`104`	`105`	`EarthFile earthFile;`
`105`		`- if ( !earthFile.readXML( "/home/pi/devel/gis/qgis/src/plugins/globe/globe.earth" ) )`
	`106`	`+ if ( !earthFile.readXML( QString("%1/%2").arg(QgsApplication::pkgDataPath()).arg("globe/globe.earth").toStdString() ) )`
`106`	`107`	`{`
`107`	`108`	`return;`
`108`	`109`	`}`