diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-04-11 15:05:57 +0300 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-04-13 12:02:33 +0300 |
| commit | ad86c7a132dbaba908f56124c520202e84cb1b8b (patch) | |
| tree | 7cb481c1158df6e7cb181a6f5b14f42dc98bd7d0 | |
| parent | 96ade47c182bf37a2efca2aa62922e54e5ff1660 (diff) | |
Print archive and compression library versions with --version option
Task-number: QTIFW-2507
Change-Id: I566dc4984df305fb0b5e7b9a1fe7ea9628ac02d4
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| -rw-r--r-- | installerfw.pri | 6 | ||||
| -rw-r--r-- | src/sdk/main.cpp | 15 |
2 files changed, 18 insertions, 3 deletions
diff --git a/installerfw.pri b/installerfw.pri index db165bd59..d762b7543 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -109,8 +109,10 @@ CONFIG(libarchive): INCLUDEPATH += $$IFW_SOURCE_TREE/src/libs/3rdparty/libarchiv CONFIG(lzmasdk) { INCLUDEPATH += $$IFW_SOURCE_TREE/src/libs/3rdparty/7zip - win32:INCLUDEPATH += $$IFW_SOURCE_TREE/src/libs/3rdparty/7zip/win/CPP - unix:INCLUDEPATH += $$IFW_SOURCE_TREE/src/libs/3rdparty/7zip/unix/CPP + win32:INCLUDEPATH += $$IFW_SOURCE_TREE/src/libs/3rdparty/7zip/win/CPP \ + $$IFW_SOURCE_TREE/src/libs/3rdparty/7zip/win/C + unix:INCLUDEPATH += $$IFW_SOURCE_TREE/src/libs/3rdparty/7zip/unix/CPP \ + $$IFW_SOURCE_TREE/src/libs/3rdparty/7zip/unix/C } LIBS += -L$$IFW_LIB_PATH diff --git a/src/sdk/main.cpp b/src/sdk/main.cpp index 8bb422e39..a1e330299 100644 --- a/src/sdk/main.cpp +++ b/src/sdk/main.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -38,6 +38,13 @@ #include <utils.h> #include <loggingutils.h> +#ifdef IFW_LIB7Z +#include <7zVersion.h> +#endif +#ifdef IFW_LIBARCHIVE +#include <archive.h> +#endif + #include <QCommandLineParser> #include <QDateTime> #include <QNetworkProxyFactory> @@ -132,6 +139,12 @@ int main(int argc, char *argv[]) if (parser.isSet(CommandLineOptions::scVersionLong)) { std::cout << VERSION << std::endl << BUILDDATE << std::endl << SHA << std::endl; +#ifdef IFW_LIB7Z + std::cout << "LZMA SDK version: " << MY_VERSION << std::endl; +#endif +#ifdef IFW_LIBARCHIVE + std::cout << "Libarchive version: " << archive_version_details() << std::endl; +#endif const QDateTime dateTime = QDateTime::fromString(QLatin1String(PLACEHOLDER), QLatin1String("yyyy-MM-dd - HH:mm:ss")); if (dateTime.isValid()) |