Merge pull request #922 from lasconic/freefontupdate

update free fonts to vanilla 20120503
musescore · May 21, 2014 · b3a2b92 · b3a2b92
2 parents 58bf49d + 099f102
commit b3a2b92
Show file tree

Hide file tree

Showing 6 changed files with 194,636 additions and 5 deletions.
diff --git a/fonts/FreeSans.sfd b/fonts/FreeSans.sfd
diff --git a/fonts/FreeSans.ttf b/fonts/FreeSans.ttf
diff --git a/fonts/FreeSerif.ttf b/fonts/FreeSerif.ttf
diff --git a/fonts/FreeSerifBold.ttf b/fonts/FreeSerifBold.ttf
diff --git a/libmscore/mscore.cpp b/libmscore/mscore.cpp
@@ -187,7 +187,7 @@ void MScore::init()
             QString s(fonts[i]);
             if (-1 == QFontDatabase::addApplicationFont(s)) {
                   qDebug("Mscore: fatal error: cannot load internal font <%s>", qPrintable(s));
-                  if (!MScore::debugMode)
+                  if (!MScore::debugMode && !MScore::testMode)
                         exit(-1);
                   }
             }

diff --git a/mtest/mtest.qrc b/mtest/mtest.qrc
@@ -17,10 +17,6 @@
       <file alias="fonts/mscore-BC.ttf">../fonts/mscore-BC.ttf</file>
       <file alias="fonts/Gonville.otf">../fonts/gonville/Gonville.otf</file>
       <file alias="fonts/Bravura.otf">../fonts/bravura/Bravura.otf</file>
-
-      <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="instruments.xml">../share/templates/instruments.xml</file>