summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2019-03-18 16:05:27 +0200
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2019-03-18 14:17:16 +0000
commite0458123953834d72bd3efbb87f9101e0ab284d3 (patch)
tree1f84d37c6ae03f2876aa8c4ee27381941b50a557
parent057d6e3cf525fa625a22487ca1d1968e313e5801 (diff)
Fix viewer version number
Task-number: QT3DS-3179 Change-Id: I89b661bb5519aaaf2d27e9581aa61b17d80453d6 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
-rw-r--r--tools/q3dsviewer/main.cpp5
-rw-r--r--tools/q3dsviewer/q3dsviewer.pro2
2 files changed, 6 insertions, 1 deletions
diff --git a/tools/q3dsviewer/main.cpp b/tools/q3dsviewer/main.cpp
index 7f341f9..0e8852a 100644
--- a/tools/q3dsviewer/main.cpp
+++ b/tools/q3dsviewer/main.cpp
@@ -48,13 +48,16 @@ QT_BEGIN_NAMESPACE
class Q3DStudioMainWindow;
QT_END_NAMESPACE
+#define STRINGIFY(x) STRINGIFY2(x)
+#define STRINGIFY2(x) QStringLiteral(#x)
+
int main(int argc, char *argv[])
{
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QCoreApplication::setOrganizationName(QStringLiteral("The Qt Company"));
QCoreApplication::setOrganizationDomain(QStringLiteral("qt.io"));
QCoreApplication::setApplicationName(QStringLiteral("Qt 3D Viewer"));
- QCoreApplication::setApplicationVersion(QStringLiteral("2.2"));
+ QCoreApplication::setApplicationVersion(STRINGIFY(STUDIO_VERSION));
#ifdef Q3DSVIEWER_WIDGETS
QApplication app(argc, argv);
diff --git a/tools/q3dsviewer/q3dsviewer.pro b/tools/q3dsviewer/q3dsviewer.pro
index d4ffae0..eff030b 100644
--- a/tools/q3dsviewer/q3dsviewer.pro
+++ b/tools/q3dsviewer/q3dsviewer.pro
@@ -31,3 +31,5 @@ CONFIG += app_bundle
RESOURCES += \
resources.qrc
+DEFINES += STUDIO_VERSION=$$MODULE_VERSION
+