move IMAGE_RCCS to qgis_core

qgis · Apr 24, 2020 · dd82ee6 · dd82ee6
1 parent f3c8a27
commit dd82ee6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -303,15 +303,11 @@ ENDIF (POSTGRES_FOUND)
 # Test data dir for QgsAppScreenShots
 ADD_DEFINITIONS(-DTEST_DATA_DIR="${TEST_DATA_DIR}")
 
-
-SET(IMAGE_RCCS ../../images/images.qrc)
-
-
 # add test resources, e.g. standard test font
 SET(TEST_RCCS ../../tests/testdata/testdata.qrc)
 
 IF (WIN32)
-  SET (QGIS_APP_SRCS ${QGIS_APP_SRCS} main.cpp ${IMAGE_RCCS} ${TEST_RCCS})
+  SET (QGIS_APP_SRCS ${QGIS_APP_SRCS} main.cpp ${TEST_RCCS})
   SET (QGIS_APPMAIN_SRCS mainwin.cpp)
 
   IF (MSVC)
@@ -341,7 +337,7 @@ IF (WIN32)
     ENDIF (WINDRES)
   ENDIF (MSVC)
 ELSE(WIN32)
-  SET (QGIS_APPMAIN_SRCS main.cpp ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS})
+  SET (QGIS_APPMAIN_SRCS main.cpp ${TEST_RCCS})
 ENDIF (WIN32)
 
 IF(PEDANTIC)

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -1538,9 +1538,11 @@ ENDIF (WIN32)
 # Test data dir for QgsRenderChecker
 ADD_DEFINITIONS(-DTEST_DATA_DIR="${TEST_DATA_DIR}")
 
+SET(IMAGE_RCCS ../../images/images.qrc)
+
 #############################################################
 # qgis_core library
-ADD_LIBRARY(qgis_core ${LIBRARY_TYPE} ${QGIS_CORE_SRCS} ${QGIS_CORE_HDRS} ${QGIS_CORE_PRIVATE_HDRS})
+ADD_LIBRARY(qgis_core ${LIBRARY_TYPE} ${QGIS_CORE_SRCS} ${QGIS_CORE_HDRS} ${QGIS_CORE_PRIVATE_HDRS} ${IMAGE_RCCS})
 
 GENERATE_EXPORT_HEADER(
   qgis_core

diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -151,6 +151,8 @@ Q_GLOBAL_STATIC( QString, sTranslation )
 QgsApplication::QgsApplication( int &argc, char **argv, bool GUIenabled, const QString &profileFolder, const QString &platformName )
   : QApplication( argc, argv, GUIenabled )
 {
+  Q_INIT_RESOURCE( images );
+
   *sPlatformName() = platformName;
 
   if ( *sTranslation() != QLatin1String( "C" ) )