chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

In oscar.pro, add new language files in translations/qt directory. Remove Mac handling for QT files in a different directory.

Browse Source
This commit is contained in:
Seeker4 2019-08-19 12:35:21 -07:00
parent 48c0387125
commit 9527aadb66
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
oscar/oscar.pro
View File

@ -136,6 +136,7 @@ macx {
} }
TRANSLATIONS = $$files($$PWD/../Translations/*.ts) TRANSLATIONS = $$files($$PWD/../Translations/*.ts)
TRANSLATIONS += $$files($$PWD/../Translations/qt/*.ts)
qtPrepareTool(LRELEASE, lrelease) qtPrepareTool(LRELEASE, lrelease)
@ -145,7 +146,6 @@ for(file, TRANSLATIONS) {
qmfile ~= s,.ts$,.qm, qmfile ~= s,.ts$,.qm,
qmdir = $$PWD/translations qmdir = $$PWD/translations
!exists($$qmdir) { !exists($$qmdir) {
mkpath($$qmdir)|error("Aborting.") mkpath($$qmdir)|error("Aborting.")
} }
@ -166,9 +166,10 @@ macx {
QMAKE_BUNDLE_DATA += HelpFiles QMAKE_BUNDLE_DATA += HelpFiles
} }
QtTransFiles.files = $$files($$[QT_INSTALL_TRANSLATIONS]/qt*.qm) # Removed because we are not using QT's translation files
QtTransFiles.path = Contents/translations # QtTransFiles.files = $$files($$[QT_INSTALL_TRANSLATIONS]/qt*.qm)
QMAKE_BUNDLE_DATA += QtTransFiles # QtTransFiles.path = Contents/translations
# QMAKE_BUNDLE_DATA += QtTransFiles
TransFiles.files = $$files($$PWD/translations/*.qm) TransFiles.files = $$files($$PWD/translations/*.qm)
TransFiles.path = Contents/Resources/translations TransFiles.path = Contents/Resources/translations
@ -185,7 +186,7 @@ macx {
DDIR = $$OUT_PWD/Translations DDIR = $$OUT_PWD/Translations
HTMLDIR = $$OUT_PWD/Html HTMLDIR = $$OUT_PWD/Html
TRANS_FILES += $$PWD/translations/*.qm TRANS_FILES = $$PWD/translations/*.qm
win32 { win32 {
TRANS_FILES_WIN = $${TRANS_FILES} TRANS_FILES_WIN = $${TRANS_FILES}