Commit e6c9c790 authored by Max Lyon's avatar Max Lyon
Browse files

added resourced

parent cc6dae19
Pipeline #2657 passed with stage
in 79 minutes and 40 seconds
......@@ -125,6 +125,7 @@ endif ()
acg_append_files (headers "*.hh" ${directories})
acg_append_files (sources "*.cc" ${directories})
acg_append_files (ui "*.ui" ${directories})
acg_append_files (qrc "*.qrc" ${directories} .)
# remove template cc files from source file list
acg_drop_templates (sources)
......@@ -133,16 +134,18 @@ acg_drop_templates (sources)
if (QT5_FOUND)
acg_qt5_autouic (uic_targets ${ui})
acg_qt5_automoc (moc_targets ${headers})
acg_qt5_autoqrc (qrc_targets ${qrc})
elseif (QT4_FOUND)
acg_qt4_autouic (uic_targets ${ui})
acg_qt4_automoc (moc_targets ${headers})
acg_qt4_autoqrc (qrc_targets ${qrc})
endif()
if (QT5_FOUND)
acg_add_library (ACG SHARED ${uic_targets} ${sources} ${headers} ${moc_targets})
acg_add_library (ACG SHARED ${uic_targets} ${sources} ${headers} ${moc_targets} ${qrc_targets})
elseif (QT4_FOUND)
acg_add_library (ACG SHARED ${uic_targets} ${sources} ${headers} ${moc_targets})
acg_add_library (ACG SHARED ${uic_targets} ${sources} ${headers} ${moc_targets} ${qrc_targets})
endif()
if ( NOT WIN32 )
set_target_properties (ACG PROPERTIES VERSION ${ACG_VERSION_MAJOR}.${ACG_VERSION_MINOR}
......
......@@ -85,8 +85,8 @@
<string/>
</property>
<property name="icon">
<iconset>
<normaloff>:/PhySim/Icons/PrincipalAxis_CS1.png</normaloff>:/PhySim/Icons/PrincipalAxis_CS1.png</iconset>
<iconset resource="../resources.qrc">
<normaloff>:/ACG/Icons/PrincipalAxis_CS1.png</normaloff>:/ACG/Icons/PrincipalAxis_CS1.png</iconset>
</property>
<property name="iconSize">
<size>
......@@ -102,8 +102,8 @@
<string/>
</property>
<property name="icon">
<iconset>
<normaloff>:/PhySim/Icons/PrincipalAxis_CS2.png</normaloff>:/PhySim/Icons/PrincipalAxis_CS2.png</iconset>
<iconset resource="../resources.qrc">
<normaloff>:/ACG/Icons/PrincipalAxis_CS2.png</normaloff>:/ACG/Icons/PrincipalAxis_CS2.png</iconset>
</property>
<property name="iconSize">
<size>
......@@ -119,8 +119,8 @@
<string/>
</property>
<property name="icon">
<iconset>
<normaloff>:/PhySim/Icons/PrincipalAxis_CS3.png</normaloff>:/PhySim/Icons/PrincipalAxis_CS3.png</iconset>
<iconset resource="../resources.qrc">
<normaloff>:/ACG/Icons/PrincipalAxis_CS3.png</normaloff>:/ACG/Icons/PrincipalAxis_CS3.png</iconset>
</property>
<property name="iconSize">
<size>
......
<RCC>
<qresource prefix="ACG">
<file>Icons/PrincipalAxis_CS1.png</file>
<file>Icons/PrincipalAxis_CS2.png</file>
<file>Icons/PrincipalAxis_CS3.png</file>
</qresource>
</RCC>
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