split mtest.qrc, reuse fonts.qrc files

musescore · Aug 16, 2014 · c0980b7 · c0980b7
1 parent a3b185b
commit c0980b7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/mscore/musescorefonts-Free.qrc b/mscore/musescorefonts-Free.qrc
@@ -3,7 +3,5 @@
         <file alias="fonts/FreeSerif.ttf">../fonts/FreeSerif.ttf</file>
         <file alias="fonts/FreeSerifBold.ttf">../fonts/FreeSerifBold.ttf</file>
         <file alias="fonts/FreeSans.ttf">../fonts/FreeSans.ttf</file>
-        <file alias="fonts/mscoreTab.ttf">../fonts/mscoreTab.ttf</file>
-        <file alias="fonts/mscore-BC.ttf">../fonts/mscore-BC.ttf</file>
 	    </qresource>
 </RCC>
diff --git a/mtest/cmake.inc b/mtest/cmake.inc
@@ -11,7 +11,13 @@
 #  the file LICENSE.GPL
 #=============================================================================
 
-QT4_ADD_RESOURCES(qrc_files ${PROJECT_SOURCE_DIR}/mtest/mtest.qrc)
+QT4_ADD_RESOURCES(qrc_files ${PROJECT_SOURCE_DIR}/mtest/mtest.qrc
+            ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-MScore.qrc
+            ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Gonville.qrc
+            ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Bravura.qrc
+            ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-MuseJazz.qrc
+            ${PROJECT_SOURCE_DIR}/mscore/musescorefonts-Free.qrc
+      )
 
 add_executable(
       ${TARGET}

diff --git a/mtest/mtest.qrc b/mtest/mtest.qrc
@@ -1,21 +1,14 @@
 <!DOCTYPE RCC>
 <RCC version="1.0">
    <qresource prefix="/">
-      <file alias="fonts/mscore/mscore.ttf">../fonts/mscore/mscore.ttf</file>
       <file alias="fonts/mscore/glyphnames.json">../fonts/mscore/glyphnames.json</file>
-      <file alias="fonts/mscore/metadata.json">../fonts/mscore/metadata.json</file>
-      <file alias="fonts/gonville/Gonville.otf">../fonts/gonville/Gonville.otf</file>
+      <file alias="fonts/mscore/metadata.json">../fonts/mscore/metadata.json</file>           
       <file alias="fonts/gonville/glyphnames.json">../fonts/gonville/glyphnames.json</file>
-      <file alias="fonts/gonville/metadata.json">../fonts/gonville/metadata.json</file>
-      <file alias="fonts/bravura/Bravura.otf">../fonts/bravura/Bravura.otf</file>
-      <file alias="fonts/bravura/BravuraText.otf">../fonts/bravura/BravuraText.otf</file>
+      <file alias="fonts/gonville/metadata.json">../fonts/gonville/metadata.json</file>       
       <file alias="fonts/bravura/glyphnames.json">../fonts/bravura/glyphnames.json</file>
-      <file alias="fonts/bravura/metadata.json">../fonts/bravura/metadata.json</file>
-      <file alias="fonts/MuseJazz.ttf">../fonts/MuseJazz.ttf</file>
+      <file alias="fonts/bravura/metadata.json">../fonts/bravura/metadata.json</file>         
       <file alias="fonts/fonts_tablature.xml">../fonts/fonts_tablature.xml</file>
-      <file alias="fonts/mscoreTab.ttf">../fonts/mscoreTab.ttf</file>
-      <file alias="fonts/fonts_figuredbass.xml">../fonts/fonts_figuredbass.xml</file>
-      <file alias="fonts/mscore-BC.ttf">../fonts/mscore-BC.ttf</file>
+      <file alias="fonts/fonts_figuredbass.xml">../fonts/fonts_figuredbass.xml</file>     
 
       <file alias="instruments.xml">../share/instruments/instruments.xml</file>