diff --git a/images/CMakeLists.txt b/images/CMakeLists.txt index 6e6bfe5920c..0cb9090fdd5 100644 --- a/images/CMakeLists.txt +++ b/images/CMakeLists.txt @@ -10,7 +10,6 @@ QT4_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS}) ######################################################## # Continue on to subdirs -ADD_SUBDIRECTORY(north_arrows) ADD_SUBDIRECTORY(icons) ADD_SUBDIRECTORY(themes) ADD_SUBDIRECTORY(svg) diff --git a/images/images.qrc b/images/images.qrc index b110408939c..54388c8ee0f 100644 --- a/images/images.qrc +++ b/images/images.qrc @@ -347,6 +347,7 @@ themes/gis/plugins/spit.png themes/gis/plugins/wfs.png splash/splash.png + north_arrows/default.png qgis_tips/symbol_levels.png diff --git a/images/north_arrows/CMakeLists.txt b/images/north_arrows/CMakeLists.txt deleted file mode 100644 index 1207d0c6362..00000000000 --- a/images/north_arrows/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ - -FILE (GLOB PNGIMAGES *.png) - -INSTALL (FILES ${PNGIMAGES} - DESTINATION ${QGIS_DATA_DIR}/images/north_arrows) diff --git a/src/plugins/north_arrow/plugin.cpp b/src/plugins/north_arrow/plugin.cpp index f59aa5d3875..2fc0a63b71d 100644 --- a/src/plugins/north_arrow/plugin.cpp +++ b/src/plugins/north_arrow/plugin.cpp @@ -167,8 +167,7 @@ void QgsNorthArrowPlugin::renderNorthArrow( QPainter * theQPainter ) QPixmap myQPixmap; //to store the north arrow image in - QString myFileNameQString = QDir::cleanPath( QgsApplication::pkgDataPath() + - "/images/north_arrows/default.png" ); + QString myFileNameQString = ":/images/north_arrows/default.png"; //QgsDebugMsg("Trying to load " + myFileNameQString); if ( myQPixmap.load( myFileNameQString ) ) diff --git a/src/plugins/north_arrow/plugingui.cpp b/src/plugins/north_arrow/plugingui.cpp index c36bb970eb7..668b456a105 100644 --- a/src/plugins/north_arrow/plugingui.cpp +++ b/src/plugins/north_arrow/plugingui.cpp @@ -97,7 +97,7 @@ void QgsNorthArrowPluginGui::on_sliderRotation_valueChanged( int theInt ) void QgsNorthArrowPluginGui::rotatePixmap( int theRotationInt ) { QPixmap myQPixmap; - QString myFileNameQString = QgsApplication::pkgDataPath() + "/images/north_arrows/default.png"; + QString myFileNameQString = ":/images/north_arrows/default.png"; // QgsDebugMsg(QString("Trying to load %1").arg(myFileNameQString)); if ( myQPixmap.load( myFileNameQString ) ) {