Include splash file in resources

wonder-sk · wonder-sk · commit 4f2a9cb133f6 · 2011-07-20T23:31:36.000+02:00
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/" );
 }
 
 /*!

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ const QString QgsApplication::qgisUserDbFilePath()`
`344`	`344`	`*/`
`345`	`345`	`const QString QgsApplication::splashPath()`
`346`	`346`	`{`
`347`		`- return mPkgDataPath + QString( "/images/splash/" );`
	`347`	`+ return QString( ":/images/splash/" );`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`/*!`