From 4f2a9cb133f6d6f1e625be210341e4bd0a7be99c Mon Sep 17 00:00:00 2001
From: Martin Dobias <wonder.sk@gmail.com>
Date: Wed, 20 Jul 2011 23:31:36 +0200
Subject: [PATCH] Include splash file in resources

---
 images/CMakeLists.txt        | 1 -
 images/images.qrc            | 1 +
 images/splash/CMakeLists.txt | 5 -----
 src/core/qgsapplication.cpp  | 2 +-
 4 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 images/splash/CMakeLists.txt

diff --git a/images/CMakeLists.txt b/images/CMakeLists.txt
index 4166ba26463..6e6bfe5920c 100644
--- a/images/CMakeLists.txt
+++ b/images/CMakeLists.txt
@@ -11,7 +11,6 @@ QT4_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
 ########################################################
 # Continue on to subdirs
 ADD_SUBDIRECTORY(north_arrows)
-ADD_SUBDIRECTORY(splash)
 ADD_SUBDIRECTORY(icons)
 ADD_SUBDIRECTORY(themes)
 ADD_SUBDIRECTORY(svg)
diff --git a/images/images.qrc b/images/images.qrc
index c87cce8a774..b110408939c 100644
--- a/images/images.qrc
+++ b/images/images.qrc
@@ -346,6 +346,7 @@
         <file>themes/gis/plugins/scale_bar.png</file>
         <file>themes/gis/plugins/spit.png</file>
         <file>themes/gis/plugins/wfs.png</file>
+        <file>splash/splash.png</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
diff --git a/images/splash/CMakeLists.txt b/images/splash/CMakeLists.txt
deleted file mode 100644
index 3a996d3f67f..00000000000
--- a/images/splash/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-
-FILE (GLOB IMAGES *.png)
-
-INSTALL (FILES ${IMAGES}
-         DESTINATION ${QGIS_DATA_DIR}/images/splash)
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
index c640bd0297c..e29b5f2a844 100644
--- a/src/core/qgsapplication.cpp
+++ b/src/core/qgsapplication.cpp
@@ -344,7 +344,7 @@ const QString QgsApplication::qgisUserDbFilePath()
 */
 const QString QgsApplication::splashPath()
 {
-  return mPkgDataPath + QString( "/images/splash/" );
+  return QString( ":/images/splash/" );
 }
 
 /*!