Commit 390bd5b8 authored by VAN TOLL Wouter's avatar VAN TOLL Wouter

Renamed the "QtDemo" folder to "GUI".

parent a434e988
......@@ -28,7 +28,7 @@ file( GLOB_RECURSE src_All src/*)
file( GLOB_RECURSE src_Engine src/Engine/* src/3rd-party/* )
file( GLOB_RECURSE src_Library src/Library/* )
file( GLOB_RECURSE src_ConsoleApplication src/ConsoleApplication/* )
file( GLOB_RECURSE src_QtDemo src/QtDemo/* )
file( GLOB_RECURSE src_GUI src/GUI/* )
# --- ensure that certain directories are recognized in "#include <...>" lines
include_directories( ./src/ ./src/Engine/ )
......@@ -86,11 +86,11 @@ if (UMANS_USE_GUI_APPLICATION)
find_package(Qt5 COMPONENTS Core Widgets REQUIRED)
# --- include the Qt resources, so that the application icon gets shown
set(UI_RESOURCES src/QtDemo/UMANSQtGuiApplication.qrc )
set(UI_RESOURCES src/GUI/UMANSQtGuiApplication.qrc )
qt5_add_resources(UI_RESOURCES_RCC ${UI_RESOURCES})
# --- define the project itself
add_executable(UMANS-GUI src/QtDemo/main.cpp ${src_QtDemo} ${UI_RESOURCES_RCC})
add_executable(UMANS-GUI src/GUI/main.cpp ${src_GUI} ${UI_RESOURCES_RCC})
# --- the project depends on some libraries
target_link_libraries(UMANS-GUI Engine Qt5::Widgets opengl32.lib glu32.lib)
......
<RCC>
<qresource prefix="QtDemo">
<qresource prefix="GUI">
<file>Resources/ApplicationIcon.png</file>
<file>Resources/ApplicationLogo.png</file>
<file>Resources/InriaLogo.png</file>
......
......@@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="UMANSQtGuiApplication.qrc">
<normaloff>:/QtDemo/Resources/ApplicationIcon.png</normaloff>:/QtDemo/Resources/ApplicationIcon.png</iconset>
<normaloff>:/GUI/Resources/ApplicationIcon.png</normaloff>:/GUI/Resources/ApplicationIcon.png</iconset>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
......@@ -583,7 +583,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="UMANSQtGuiApplication.qrc">:/QtDemo/Resources/ApplicationLogo.png</pixmap>
<pixmap resource="UMANSQtGuiApplication.qrc">:/GUI/Resources/ApplicationLogo.png</pixmap>
</property>
<property name="scaledContents">
<bool>false</bool>
......@@ -605,7 +605,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="UMANSQtGuiApplication.qrc">:/QtDemo/Resources/InriaLogo.png</pixmap>
<pixmap resource="UMANSQtGuiApplication.qrc">:/GUI/Resources/InriaLogo.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment