Remove macro for adding RCC. It only made sense for a project with

calincru · calincru · commit b4f3e89e0c24 · 2014-09-21T23:01:20.000+03:00
a lot of resources in which compiling the qrc.cpp everytime alongside
the other cpp files took too long.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -65,9 +65,6 @@ endif()
 # Set the directory where tools will get installed
 set( DEMO_TOOLS_BINARY_DIR ${CMAKE_BINARY_DIR}/tools )
 
-# Include the macro for adding resources
-include( cmake/rcc.cmake )
-
 # Add other subdirectories containing CMakeLists.txt file
 add_subdirectory( src )
 add_subdirectory( tools )
diff --git a/cmake/rcc.cmake b/cmake/rcc.cmake
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,13 +1,12 @@
 set( demo_SRCS demo.cpp )
+qt5_add_resources( demo_QRC demo.qrc )
 
 if( ANDROID )
-  add_library( Demo SHARED ${demo_SRCS} )
+  add_library( Demo SHARED ${demo_SRCS} ${demo_QRC} )
   qt5_use_modules( Demo Qml Quick )
 else()
-  add_executable( Demo ${demo_SRCS} )
+  add_executable( Demo ${demo_SRCS} ${demo_QRC} )
   qt5_use_modules( Demo Qml Quick )
 endif()
 
 target_link_libraries( Demo Qt5::Qml Qt5::Quick )
-
-DEMO_ADD_RCC(src Demo.qml)
diff --git a/src/demo.cpp b/src/demo.cpp
@@ -4,6 +4,6 @@
 int main(int argc, char *argv[])
 {
     QGuiApplication app(argc, argv);
-    QQmlApplicationEngine engine(QUrl("qrc:/Demo/src/Demo.qml"));
+    QQmlApplicationEngine engine(QUrl("qrc:/Demo.qml"));
     return app.exec();
 }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`int main(int argc, char *argv[])`
`5`	`5`	`{`
`6`	`6`	`QGuiApplication app(argc, argv);`
`7`		`- QQmlApplicationEngine engine(QUrl("qrc:/Demo/src/Demo.qml"));`
	`7`	`+ QQmlApplicationEngine engine(QUrl("qrc:/Demo.qml"));`
`8`	`8`	`return app.exec();`
`9`	`9`	`}`