Include splash file in resources

qgis · Jul 20, 2011 · 4f2a9cb · 4f2a9cb
1 parent 5259a5b
commit 4f2a9cb
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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
diff --git 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/" );
 }
 
 /*!