From e28947f150b47fbe3930dbbca38b482c37aa28a4 Mon Sep 17 00:00:00 2001
From: Sami Shalayel <sami.shalayel@qt.io>
Date: Thu, 20 Mar 2025 11:01:28 +0100
Subject: [PATCH] qmlls: add --version command line parameter

Add a command line parameter to print the qmlls version, required by
qmlls clients to check the version of downloaded qmlls binaries.

Fixes: QTBUG-132692
Change-Id: I7903f6859b6da2f3849a899e46fe4c5ce1cf4c42
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 src/qmlls/qmllsmain.cpp               | 11 +++++++++--
 tools/qmlls/qmllanguageservertool.cpp |  5 +++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/qmlls/qmllsmain.cpp b/src/qmlls/qmllsmain.cpp
index e6d12af62a..e41c7da57a 100644
--- a/src/qmlls/qmllsmain.cpp
+++ b/src/qmlls/qmllsmain.cpp
@@ -213,8 +213,6 @@ int qmllsMain(int argv, char *argc[])
 
     QHashSeed::setDeterministicGlobalSeed();
     QCoreApplication app(argv, argc);
-    QCoreApplication::setApplicationName("qmlls"_L1);
-    QCoreApplication::setApplicationVersion(QLatin1String(QT_VERSION_STR));
 
     QCommandLineParser parser;
     QQmlToolingSettings settings("qmlls"_L1);
@@ -289,8 +287,17 @@ int qmllsMain(int argv, char *argc[])
     const QString qmlImportNoDefaultSetting = "DisableDefaultImports"_L1;
     settings.addOption(qmlImportNoDefaultSetting, false);
 
+    // we can't use parser.addVersionOption() because we already have one '-v' option for verbose...
+    QCommandLineOption versionOption("version"_L1, "Displays version information."_L1);
+    parser.addOption(versionOption);
+
     parser.process(app);
 
+    if (parser.isSet(versionOption)) {
+        parser.showVersion();
+        return EXIT_SUCCESS;
+    }
+
     if (parser.isSet(writeDefaultsOption)) {
         return settings.writeDefaults() ? 0 : 1;
     }
diff --git a/tools/qmlls/qmllanguageservertool.cpp b/tools/qmlls/qmllanguageservertool.cpp
index e28e6c3be5..860354dbdf 100644
--- a/tools/qmlls/qmllanguageservertool.cpp
+++ b/tools/qmlls/qmllanguageservertool.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include <private/qmllsmain_p.h>
+#include <QtCore/qcoreapplication.h>
 
 // To debug:
 //
@@ -27,7 +28,11 @@
 // * statup can be slowed down to have the time to attach via the
 //   -w <nSeconds> flag.
 
+using namespace Qt::StringLiterals;
+
 int main(int argv, char *argc[])
 {
+    QCoreApplication::setApplicationVersion(QLatin1String(QT_VERSION_STR));
+    QCoreApplication::setApplicationName("qmlls"_L1);
     return QmlLsp::qmllsMain(argv, argc);
 }