remove all the places where images.qrc is used

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

Hide file tree

Showing 6 changed files with 4 additions and 15 deletions.
diff --git a/images/CMakeLists.txt b/images/CMakeLists.txt
@@ -1,7 +1,6 @@
 ########################################################
 # Files
 
-SET (IMAGE_RCCS images.qrc)
 
 ########################################################
 # Build

diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -151,8 +151,6 @@ 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" ) )

diff --git a/src/customwidgets/CMakeLists.txt b/src/customwidgets/CMakeLists.txt
@@ -124,9 +124,7 @@ QT5_WRAP_CPP(QGIS_CUSTOMWIDGETS_MOC_SRCS ${QGIS_CUSTOMWIDGETS_MOC_HDRS})
 #############################################################
 # qgis_customwidgets library
 
-SET(IMAGE_RCCS ../../images/images.qrc)
-
-ADD_LIBRARY(qgis_customwidgets SHARED ${QGIS_CUSTOMWIDGETS_SRCS} ${QGIS_CUSTOMWIDGETS_MOC_SRCS} ${QGIS_CUSTOMWIDGETS_MOC_HDRS} ${IMAGE_RCCS})
+ADD_LIBRARY(qgis_customwidgets SHARED ${QGIS_CUSTOMWIDGETS_SRCS} ${QGIS_CUSTOMWIDGETS_MOC_SRCS} ${QGIS_CUSTOMWIDGETS_MOC_HDRS})
 
 SET_TARGET_PROPERTIES(qgis_customwidgets PROPERTIES
   VERSION ${COMPLETE_VERSION}

diff --git a/src/quickgui/CMakeLists.txt b/src/quickgui/CMakeLists.txt
@@ -89,8 +89,6 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${QTKEYCHAIN_INCLUDE_DIR}
 )
 
-SET(QGIS_QUICK_GUI_IMAGE_RCCS ./images/images.qrc)
-
 ############################################################
 # qgis_quick shared library
 QT5_WRAP_CPP(QGIS_QUICK_GUI_MOC_SRCS ${QGIS_QUICK_GUI_MOC_HDRS})
@@ -101,7 +99,6 @@ ELSE(MSVC)
 ENDIF(MSVC)
 
 ADD_LIBRARY(qgis_quick ${LIBRARY_TYPE}
-    ${QGIS_QUICK_GUI_IMAGE_RCCS}
     ${QGIS_QUICK_GUI_SRC}
     ${QGIS_QUICK_GUI_MOC_HDRS}
     ${QGIS_QUICK_GUI_MOC_SRCS}

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -167,14 +167,11 @@ INSTALL(TARGETS qgis_server
 
 # end qgis_server library
 
-# add image resources
-SET(QGIS_SERVER_IMAGERCCS ../../images/images.qrc)
-
 # add test resources, e.g. standard test font
 SET(QGIS_SERVER_TESTRCCS ../../tests/testdata/testdata.qrc)
 
-ADD_EXECUTABLE(qgis_mapserv.fcgi qgis_map_serv.cpp ${QGIS_SERVER_TESTRCCS} ${QGIS_SERVER_IMAGERCCS})
-ADD_EXECUTABLE(qgis_mapserver qgis_mapserver.cpp ${QGIS_SERVER_TESTRCCS} ${QGIS_SERVER_IMAGERCCS})
+ADD_EXECUTABLE(qgis_mapserv.fcgi qgis_map_serv.cpp ${QGIS_SERVER_TESTRCCS})
+ADD_EXECUTABLE(qgis_mapserver qgis_mapserver.cpp ${QGIS_SERVER_TESTRCCS})
 
 TARGET_LINK_LIBRARIES(qgis_mapserv.fcgi qgis_server)
 TARGET_LINK_LIBRARIES(qgis_mapserver qgis_server)

diff --git a/tests/src/native/CMakeLists.txt b/tests/src/native/CMakeLists.txt
@@ -60,7 +60,7 @@ ENDIF (APPLE)
 MACRO (ADD_QGIS_TEST testname testsrc)
   SET(qgis_${testname}_SRCS ${testsrc} ${util_SRCS})
   SET(qgis_${testname}_MOC_CPPS ${testsrc})
-  ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS} ${IMAGE_RCCS})
+  ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS})
   TARGET_LINK_LIBRARIES(qgis_${testname}
     ${Qt5Core_LIBRARIES}
     ${Qt5Test_LIBRARIES}