Skip to content
Permalink
Browse files

Include splash file in resources

  • Loading branch information
wonder-sk committed Jul 20, 2011
1 parent 5259a5b commit 4f2a9cb133f6d6f1e625be210341e4bd0a7be99c
Showing with 2 additions and 7 deletions.
  1. +0 −1 images/CMakeLists.txt
  2. +1 −0 images/images.qrc
  3. +0 −5 images/splash/CMakeLists.txt
  4. +1 −1 src/core/qgsapplication.cpp
@@ -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)
@@ -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>

This file was deleted.

@@ -344,7 +344,7 @@ const QString QgsApplication::qgisUserDbFilePath()
*/
const QString QgsApplication::splashPath()
{
return mPkgDataPath + QString( "/images/splash/" );
return QString( ":/images/splash/" );
}

/*!

0 comments on commit 4f2a9cb

Please sign in to comment.
You can’t perform that action at this time.