Print package information in xml format

Also removed logging categories for package information, the full package
information can be printed by increasing the verbosity level.

Task-number: QTIFW-1950
Change-Id: I4bce019a63ba1fbf48e3bb0ca45511e42d4974c9
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>

2 files changed, 5 insertions, 26 deletions

diff --git a/src/sdk/commandlineinterface.cpp b/src/sdk/commandlineinterface.cpp
index 962eab7c0..f522f7df6 100644
--- a/src/sdk/commandlineinterface.cpp
+++ b/src/sdk/commandlineinterface.cpp
@@ -34,11 +34,9 @@
 #include <globals.h>
 #include <productkeycheck.h>
 #include <errors.h>
+#include <printoutput.h>
 
 #include <QDir>
-#include <QDomDocument>
-
-#include <iostream>
 
 CommandLineInterface::CommandLineInterface(int &argc, char *argv[])
     : SDKApp<QCoreApplication>(argc, argv)
@@ -103,21 +101,7 @@ int CommandLineInterface::checkUpdates()
         qCWarning(QInstaller::lcInstallerInstallLog) << "There are currently no updates available.";
         return EXIT_SUCCESS;
     }
-
-    QDomDocument doc;
-    QDomElement root = doc.createElement(QLatin1String("updates"));
-    doc.appendChild(root);
-
-    foreach (QInstaller::Component *component, components) {
-        QDomElement update = doc.createElement(QLatin1String("update"));
-        update.setAttribute(QLatin1String("name"), component->value(QInstaller::scDisplayName));
-        update.setAttribute(QLatin1String("version"), component->value(QInstaller::scVersion));
-        update.setAttribute(QLatin1String("size"), component->value(QInstaller::scUncompressedSize));
-        update.setAttribute(QLatin1String("id"), component->value(QInstaller::scName));
-        root.appendChild(update);
-    }
-
-    std::cout << qPrintable(doc.toString(4)) << std::endl;
+    QInstaller::printComponentInfo(components);
     return EXIT_SUCCESS;
 }
 
@@ -230,7 +214,7 @@ bool CommandLineInterface::checkLicense()
 {
     const ProductKeyCheck *const productKeyCheck = ProductKeyCheck::instance();
     if (!productKeyCheck->hasValidLicense()) {
-        qCWarning(QInstaller::lcPackageLicenses) << "No valid license found.";
+        qCWarning(QInstaller::lcInstallerInstallLog) << "No valid license found.";
         return false;
     }
     return true;
diff --git a/src/sdk/sdkapp.h b/src/sdk/sdkapp.h
index 249714fea..295456e3b 100644
--- a/src/sdk/sdkapp.h
+++ b/src/sdk/sdkapp.h
@@ -159,17 +159,12 @@ public:
                                         "ifw.installer.* = true\n"
                                         "ifw.server = true\n"
                                         "ifw.progress.indicator = true\n"
-                                        "ifw.package.name = true\n"
-                                        "ifw.package.version = true\n"
-                                        "ifw.package.displayname = true\n");
+                                        "ifw.package.* = true\n");
         } else {
             // enable all except detailed package information and developer specific logging
             loggingRules = QLatin1String("ifw.* = true\n"
                                         "ifw.developer.build = false\n"
-                                        "ifw.package.* = false\n"
-                                        "ifw.package.name = true\n"
-                                        "ifw.package.version = true\n"
-                                        "ifw.package.displayname = true\n");
+                                        "ifw.package.* = true\n");
         }
 
         if (QInstaller::verboseLevel() == QInstaller::VerbosityLevel::Detailed) {