Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'packaging' into 'master'
Adjust path of the used tools

See merge request mer-core/nemo-qml-plugin-systemsettings!153
  • Loading branch information
pvuorela committed Sep 9, 2020
2 parents 3c5fd2b + f61d21f commit 806ff54
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/src.pro
Expand Up @@ -9,7 +9,7 @@ CONFIG += c++11 hide_symbols link_pkgconfig
PKGCONFIG += profile mlite5 mce timed-qt5 blkid libcrypto nemomodels-qt5 libsailfishkeyprovider connman-qt5 glib-2.0
PKGCONFIG += ssu-sysinfo nemodbus packagekitqt5 libsystemd sailfishusermanager sailfishaccesscontrol

system(qdbusxml2cpp -p mceiface.h:mceiface.cpp mce.xml)
system($$[QT_INSTALL_BINS]/qdbusxml2cpp -p mceiface.h:mceiface.cpp mce.xml)

SOURCES += \
languagemodel.cpp \
Expand Down
4 changes: 2 additions & 2 deletions translations/translations.pro
Expand Up @@ -5,7 +5,7 @@ TRANSLATION_CATALOG = qml_plugin_systemsettings
# Translation Source
TS_FILE = $$OUT_PWD/$${TRANSLATION_CATALOG}.ts

ts.commands += lupdate $$PWD/.. -ts $$TS_FILE
ts.commands += $$[QT_INSTALL_BINS]/lupdate $$PWD/.. -ts $$TS_FILE
ts.CONFIG += no_check_exist no_link
ts.output = $$TS_FILE
ts.input = ..
Expand All @@ -18,7 +18,7 @@ ts_install.CONFIG += no_check_exist
EE_QM = $$OUT_PWD/$${TRANSLATION_CATALOG}_eng_en.qm

# XXX should add -markuntranslated "-" when proper translations are in place
qm.commands += lrelease -idbased $$TS_FILE -qm $$EE_QM
qm.commands += $$[QT_INSTALL_BINS]/lrelease -idbased $$TS_FILE -qm $$EE_QM
qm.CONFIG += no_check_exist no_link
qm.depends = ts
qm.input = $$TS_FILE
Expand Down

0 comments on commit 806ff54

Please sign in to comment.