sailfish-safe

commit 9fb43bf5a1bb9cb28664d065e5cce521d6bcf868
parent 61be1c7d2bf6521fc0ba0fc77bf397c5d490b86f
Author: Daniel Vrátil <dvratil@kde.org>
Date:   Mon,  4 Feb 2019 01:24:43 +0100

Fix passing version from spec file to qmake

Diffstat:
M
rpm/harbour-passilic.spec
 | 
4
++--
M
src/main.cpp
 | 
2
+-

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/rpm/harbour-passilic.spec b/rpm/harbour-passilic.spec
@@ -38,8 +38,8 @@ after 45 seconds.
 
 %build
 
-%qtc_qmake5 
-%qtc_make %{?_smp_mflags} DEFINES+=-DPASSILIC_VERSION=\\\"%{version}\\\"
+%qtc_qmake5 DEFINES+=PASSILIC_VERSION=\\\\\\\"\"%{version}\\\\\\\"\"
+%qtc_make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
diff --git a/src/main.cpp b/src/main.cpp
@@ -37,7 +37,7 @@ int main(int argc, char *argv[])
     QScopedPointer<QGuiApplication> app(SailfishApp::application(argc, argv));
     app->setApplicationDisplayName(QObject::tr("Passilic"));
     app->setApplicationName(QStringLiteral("passilic"));
-    app->setApplicationVersion(PASSILIC_VERSION);
+    app->setApplicationVersion(QStringLiteral(PASSILIC_VERSION));
     app->setOrganizationName(QObject::tr("Daniel Vrátil"));
 
     QScopedPointer<QQuickView> view(SailfishApp::createView());