diff --git a/src/fontName.h b/src/fontName.h index 3482b1ba361f8f6d3120537ea6f23fc697b16afb..0917812401c52fba9f7537ceeeb7ae0122aacdab 100644 --- a/src/fontName.h +++ b/src/fontName.h @@ -19,16 +19,8 @@ public: explicit MFontName(QObject *parent = 0) : QObject(parent) { -#ifdef Q_PROCESSOR_ARM m_fontDark = loadFontFamilyFromTTF("/usr/lib/Fonts/darkforest.ttf"); m_fontWqy = loadFontFamilyFromTTF("/usr/lib/Fonts/wqy-microhei.ttf"); -#else - QString pathOne = qApp->applicationDirPath( ) + "/../Fonts/darkforest.ttf"; - m_fontDark = loadFontFamilyFromTTF( pathOne ); - QString pathTwo = qApp->applicationDirPath( ) + "/../Fonts/wqy-microhei.ttf"; - m_fontWqy = loadFontFamilyFromTTF( pathTwo ); - -#endif } QString loadFontFamilyFromTTF(QString str)