Qt 6 port, part 1 .. without cmake

All C++ and QML unit-tests pass.
The QML "windowitem" test is very unstable though and often crashes
in the RHI layer.

Change-Id: Ia42fc71ad69d2ba74b8b631ded7569b48cf458ee
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

2 files changed, 2 insertions, 3 deletions

diff --git a/src/package-lib/packageextractor.cpp b/src/package-lib/packageextractor.cpp
index 99a660f3..e2243ee1 100644
--- a/src/package-lib/packageextractor.cpp
+++ b/src/package-lib/packageextractor.cpp
@@ -46,7 +46,6 @@
 #include <QAtomicInt>
 #include <QFile>
 #include <QDir>
-#include <QRegExp>
 #include <QDataStream>
 #include <QUrl>
 #include <QDebug>
diff --git a/src/package-lib/packageutilities.cpp b/src/package-lib/packageutilities.cpp
index 74ab4ca1..51870f7b 100644
--- a/src/package-lib/packageutilities.cpp
+++ b/src/package-lib/packageutilities.cpp
@@ -171,10 +171,10 @@ void PackageUtilities::addHeaderDataToDigest(const QVariantMap &header, QCryptog
     for (auto it = headerDataForDigest.constBegin(); it != headerDataForDigest.constEnd(); ++it) {
         if (header.contains(it.key())) {
             QByteArray ba;
-            QDataStream ds(&ba, QIODevice::WriteOnly);
+            QDataStream ds(&ba, QDataStream::WriteOnly);
 
             QVariant v = header.value(it.key());
-            if (!v.convert(int(it.value().type())))
+            if (!v.convert(it.value().metaType()))
                 throw Exception(Error::Package, "metadata field %1 has invalid type for digest calculation (cannot convert %2 to %3)")
                     .arg(it.key()).arg(header.value(it.key()).type()).arg(it.value().type());
             ds << v;