Merge branch 'rochade'
[alioth/musescore.git] / debian / patches / debian-specific / debundle-fonts.diff
index 5eb4e19..9617528 100644 (file)
@@ -50,3 +50,14 @@ Justification: distribution-specific packaging
        )
  
  add_library (testResources STATIC
+--- a/mtest/testutils.cpp
++++ b/mtest/testutils.cpp
+@@ -33,8 +33,6 @@ inline void initMyResources() {
+       Q_INIT_RESOURCE(musescorefonts_Gootville);
+       Q_INIT_RESOURCE(musescorefonts_Bravura);
+       Q_INIT_RESOURCE(musescorefonts_MuseJazz);
+-      Q_INIT_RESOURCE(musescorefonts_FreeSerif);
+-      Q_INIT_RESOURCE(musescorefonts_Free);
+ }
+ extern Ms::Score::FileError importOve(Ms::Score*, const QString& name);