From 6d85c9ab98c599f1dc92b29c8d02f24f091975b3 Mon Sep 17 00:00:00 2001
From: Martin Dobias <wonder.sk@gmail.com>
Date: Sun, 24 Jul 2011 13:00:10 +0200
Subject: [PATCH] Include north arrow image in the resources

---
 images/CMakeLists.txt                 | 1 -
 images/images.qrc                     | 1 +
 images/north_arrows/CMakeLists.txt    | 5 -----
 src/plugins/north_arrow/plugin.cpp    | 3 +--
 src/plugins/north_arrow/plugingui.cpp | 2 +-
 5 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100644 images/north_arrows/CMakeLists.txt

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 @@
         <file>themes/gis/plugins/spit.png</file>
         <file>themes/gis/plugins/wfs.png</file>
         <file>splash/splash.png</file>
+        <file>north_arrows/default.png</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
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 ) )
   {