Permalink
Browse files

Merge branch 'master' of github.com:pvanek/scribus-cuba-1.5.0

  • Loading branch information...
2 parents 427e4dc + d18b515 commit dba6c062fa0287039ac49dbd6b0cd56cf351d398 @pvanek committed Nov 4, 2011
Showing with 4 additions and 0 deletions.
  1. +4 −0 Scribus/scribus/scfonts.cpp
View
4 Scribus/scribus/scfonts.cpp
@@ -834,6 +834,9 @@ void SCFonts::GetFonts(QString pf, bool showFontInfo)
{
showFontInformation=showFontInfo;
FontPath.clear();
+#ifdef WANT_PIN_CUBA
+ AddScalableFonts(QApplication::applicationDirPath());
+#else
ReadCacheList(pf);
ScCore->setSplashStatus( QObject::tr("Searching for Fonts") );
AddUserPath(pf);
@@ -862,6 +865,7 @@ void SCFonts::GetFonts(QString pf, bool showFontInfo)
for(fpi = FontPath.begin() ; fpi != fpend; ++fpi)
AddScalableFonts(*fpi);
#endif
+#endif // WANT_PIN_CUBA
updateFontMap();
WriteCacheList(pf);
}

0 comments on commit dba6c06

Please sign in to comment.