diff options
| -rw-r--r-- | gpg4usb.pro | 7 | ||||
| -rw-r--r-- | gpg4usb.qrc | 1 | ||||
| -rw-r--r-- | qml/keydetails.qml | 2 | ||||
| -rw-r--r-- | qmlpage.cpp | 3 |
4 files changed, 4 insertions, 9 deletions
diff --git a/gpg4usb.pro b/gpg4usb.pro index dd0937c..fcf4c19 100644 --- a/gpg4usb.pro +++ b/gpg4usb.pro @@ -103,11 +103,4 @@ contains(DEFINES, GPG4USB_NON_PORTABLE) { OTHER_FILES += \ qml/keydetails.qml -# http://stackoverflow.com/questions/3984104/qmake-how-to-copy-a-file-to-the-output -#unix { - for(FILE, OTHER_FILES){ -# QMAKE_POST_LINK += $$quote(cp $${PWD}/$${FILE} $${DESTDIR}$$escape_expand(\\n\\t)) - QMAKE_POST_LINK += $$QMAKE_COPY $$quote($$FILE) $$quote($$DESTDIR) $$escape_expand(\\n\\t) -# INSTALLS += $$QMAKE_COPY $$quote($$FILE) $$quote($$DESTDIR) $$escape_expand(\\n\\t) -} diff --git a/gpg4usb.qrc b/gpg4usb.qrc index 1f376f1..ed4f8f5 100644 --- a/gpg4usb.qrc +++ b/gpg4usb.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/"> + <file>qml/keydetails.qml</file> <file alias="keymgmt.png">release/icons/keymgmt.png</file> <file alias="help.png">release/icons/help.png</file> <file alias="button_copy.png">release/icons/button_copy.png</file> diff --git a/qml/keydetails.qml b/qml/keydetails.qml index f250ba0..5c5a35d 100644 --- a/qml/keydetails.qml +++ b/qml/keydetails.qml @@ -9,7 +9,7 @@ Rectangle { //color: "red" Text { // qsTr() for internationalisation, like tr() - text: qsTr("var1:") + text: qsTr("var:") } Text { x: 54 diff --git a/qmlpage.cpp b/qmlpage.cpp index eafb0af..213315a 100644 --- a/qmlpage.cpp +++ b/qmlpage.cpp @@ -10,8 +10,9 @@ QMLPage::QMLPage(const QString qmlfile, QWidget *parent) : { // http://harmattan-dev.nokia.com/docs/library/html/qt4/qml-integration.html + // http://qt-project.org/doc/qt-4.8/qtbinding.html QDeclarativeView *qmlView = new QDeclarativeView; - qmlView->setSource(QUrl::fromLocalFile("keydetails.qml")); + qmlView->setSource(QUrl("qrc:/qml/keydetails.qml")); QDeclarativeContext *context = qmlView->rootContext(); context->setContextProperty("var1", "derText"); |