Blob Blame History Raw
diff --git a/data/data.qrc b/data/data.qrc
index 3b87ea7..448f9c6 100644
--- a/data/data.qrc
+++ b/data/data.qrc
@@ -10,9 +10,6 @@ running:
 DO NOT EDIT THIS FILE BY HAND!  All changes will be LOST!
 -->
 <qresource>
-<file>./fonts/LilyPond-feta-design20.pfa</file>
-<file>./fonts/LilyPond-feta-nummer-design10.pfa</file>
-<file>./fonts/LilyPond-parmesan-design20.pfa</file>
 <file>./pixmaps/icons/audio-nok.png</file>
 <file>./pixmaps/icons/audio-ok.png</file>
 <file>./pixmaps/icons/midi-nok.png</file>
diff --git a/scripts/rebuild-qrc b/scripts/rebuild-qrc
index 9d42f93..b0db607 100755
--- a/scripts/rebuild-qrc
+++ b/scripts/rebuild-qrc
@@ -85,7 +85,7 @@ EOF
 # this script to send ts/qm entries to locale.qrc instead of
 # data.qrc.
 
-for ext in pfa png qss rc rg rgd rgp rgt xml xpm; do
+for ext in  png qss rc rg rgd rgp rgt xml xpm; do
     writeEntries $ext
 done
 
diff --git a/src/gui/editors/notation/SystemFont.cpp b/src/gui/editors/notation/SystemFont.cpp
index da2b070..416a916 100644
--- a/src/gui/editors/notation/SystemFont.cpp
+++ b/src/gui/editors/notation/SystemFont.cpp
@@ -108,24 +108,15 @@ void
 SystemFont::unbundleFonts()
 {
     QStringList fontFiles;
-    fontFiles << ResourceFinder().getResourceFiles("fonts", "pfa");
-    fontFiles << ResourceFinder().getResourceFiles("fonts", "pfb");
-    fontFiles << ResourceFinder().getResourceFiles("fonts", "ttf");
-    fontFiles << ResourceFinder().getResourceFiles("fonts", "otf");
+    fontFiles << QString("/usr/share/fonts/rosegarden4/LilyPond-feta-design20.pfa");
+    fontFiles << QString("/usr/share/fonts/rosegarden4/LilyPond-feta-nummer-design10.pfa");
+    fontFiles << QString("/usr/share/fonts/rosegarden4/LilyPond-parmesan-design20.pfa");
 
     NOTATION_DEBUG << "Found font files: " << fontFiles;
 
     for (QStringList::const_iterator i = fontFiles.constBegin();
          i != fontFiles.constEnd(); ++i) {
         QString fontFile(*i);
-        QString name = QFileInfo(fontFile).fileName();
-        if (fontFile.startsWith(":")) {
-            ResourceFinder().unbundleResource("fonts", name);
-            fontFile = ResourceFinder().getResourcePath("fonts", name);
-            if (fontFile.startsWith(":")) { // unbundling failed
-                continue;
-            }
-        }
         addFont(fontFile);
     }
 }