Move windows theme to VMisc library.

--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2015-07-12 18:15:35 +03:00
parent 1aa09c1901
commit 01e1958aa5
73 changed files with 7 additions and 3 deletions

View file

@ -34,6 +34,7 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
Q_INIT_RESOURCE(tapeicon); Q_INIT_RESOURCE(tapeicon);
Q_INIT_RESOURCE(theme);
QT_REQUIRE_VERSION(argc, argv, "5.0.0"); QT_REQUIRE_VERSION(argc, argv, "5.0.0");

View file

@ -51,7 +51,6 @@ include(valentina.pri)
RESOURCES += \ RESOURCES += \
share/resources/icon.qrc \ # All other icons except cursors and Windows theme. share/resources/icon.qrc \ # All other icons except cursors and Windows theme.
share/resources/cursor.qrc \ # Tools cursor icons. share/resources/cursor.qrc \ # Tools cursor icons.
share/resources/theme.qrc \ # Windows theme icons.
share/resources/measurements.qrc \ # For measurements files that we save as resource. share/resources/measurements.qrc \ # For measurements files that we save as resource.
share/resources/flags.qrc \ share/resources/flags.qrc \
share/resources/toolicon.qrc share/resources/toolicon.qrc

View file

@ -28,6 +28,10 @@ DEFINES += QT_MESSAGELOGCONTEXT
include(vmisc.pri) include(vmisc.pri)
# Resource files. This files will be included in binary.
RESOURCES += \
share/resources/theme.qrc \ # Windows theme icons.
# This is static library so no need in "make install" # This is static library so no need in "make install"
# directory for executable file # directory for executable file

View file

@ -17,7 +17,7 @@
<string>Broken formula</string> <string>Broken formula</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../../../app/share/resources/icon.qrc"> <iconset resource="../../../../app/valentina/share/resources/icon.qrc">
<normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset> <normaloff>:/icon/64x64/icon64x64.png</normaloff>:/icon/64x64/icon64x64.png</iconset>
</property> </property>
<property name="modal"> <property name="modal">
@ -66,7 +66,7 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../../../../app/share/resources/icon.qrc"/> <include location="../../../../app/valentina/share/resources/icon.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>