diff --git a/monero-core.pro b/monero-core.pro index f2e24e46..75812a7e 100644 --- a/monero-core.pro +++ b/monero-core.pro @@ -28,7 +28,3 @@ QML_IMPORT_PATH = # Default rules for deployment. include(deployment.pri) -# copy language files (xml and images) to the output directory -copydata.commands = $(COPY_DIR) $$shell_path($$PWD/lang) $$shell_path($$DESTDIR/lang) -QMAKE_EXTRA_TARGETS += copydata -POST_TARGETDEPS += copydata diff --git a/qml.qrc b/qml.qrc index aeedc37a..e2e774af 100644 --- a/qml.qrc +++ b/qml.qrc @@ -96,5 +96,16 @@ wizard/WizardDonation.qml wizard/WizardFinish.qml wizard/WizardPasswordInput.qml + lang/languages.xml + lang/flags/bangladesh.png + lang/flags/brazil.png + lang/flags/china.png + lang/flags/german.png + lang/flags/india.png + lang/flags/palestine.png + lang/flags/rpa.png + lang/flags/russia.png + lang/flags/uk.png + lang/flags/usa.png diff --git a/wizard/WizardWelcome.qml b/wizard/WizardWelcome.qml index f627e88d..208a7994 100644 --- a/wizard/WizardWelcome.qml +++ b/wizard/WizardWelcome.qml @@ -75,7 +75,7 @@ Item { XmlListModel { id: languagesModel - source: "file:///" + applicationDirectory + "/lang/languages.xml" + source: "/lang/languages.xml" query: "/languages/language" XmlRole { name: "name"; query: "@name/string()" } @@ -113,7 +113,7 @@ Item { color: gridView.currentIndex === index ? "#DBDBDB" : "#FFFFFF" Image { anchors.centerIn: parent - source: "file:///" + applicationDirectory + flag + source: flag } }