3 files changed, 15 insertions, 20 deletions
diff --git a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
index ecb45e4416..58a8ea2b08 100644
--- a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
+++ b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qdbuscpp2xml Tool:
 #####################################################################
 
-add_qt_tool(qdbuscpp2xml
+qt_add_tool(qdbuscpp2xml
     SOURCES
         ../moc/cbordevice.h
         ../moc/collectjson.cpp ../moc/collectjson.h
@@ -16,34 +16,30 @@ add_qt_tool(qdbuscpp2xml
         ../moc/symbols.h
         ../moc/token.cpp ../moc/token.h
         ../moc/utils.h
+        qdbuscpp2xml.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_FOREACH
     INCLUDE_DIRECTORIES
         ../moc
         ../moc/../../3rdparty/tinycbor/src
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
 )
 
 #### Keys ignored in scope 1:.:.:qdbuscpp2xml.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "Qt D-Bus C++ to XML Compiler"
-# _LOADED = "qt_tool"
 # _OPTION = "host_build"
 
 ## Scopes:
 #####################################################################
 
-extend_target(qdbuscpp2xml CONDITION force_bootstrap
-    LIBRARIES
-        bootstrap_dbusPrivate
+qt_extend_target(qdbuscpp2xml CONDITION force_bootstrap
     PUBLIC_LIBRARIES
-        bootstrap_dbus
+        bootstrap_dbusPrivate
 )
 
-extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap
-    LIBRARIES
-        Qt::DBusPrivate
+qt_extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap
     PUBLIC_LIBRARIES
-        Qt::DBus
+        Qt::DBusPrivate
 )
diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt
index 3bf127c0f1..46582793a1 100644
--- a/src/tools/qdbuscpp2xml/CMakeLists.txt
+++ b/src/tools/qdbuscpp2xml/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qdbuscpp2xml Tool:
 #####################################################################
 
-add_qt_tool(qdbuscpp2xml
+qt_add_tool(qdbuscpp2xml
     TOOLS_TARGET DBus # special case
     SOURCES
         ../moc/cbordevice.h
@@ -17,14 +17,14 @@ add_qt_tool(qdbuscpp2xml
         ../moc/symbols.h
         ../moc/token.cpp ../moc/token.h
         ../moc/utils.h
-        qdbuscpp2xml.cpp  # special case
+        qdbuscpp2xml.cpp
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_FOREACH
     INCLUDE_DIRECTORIES
         ../moc
         ../moc/../../3rdparty/tinycbor/src
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::DBusPrivate
     # COMPILE_OPTIONS  # special case
@@ -36,7 +36,6 @@ add_qt_tool(qdbuscpp2xml
 
 #### Keys ignored in scope 1:.:.:qdbuscpp2xml.pro:<TRUE>:
 # QMAKE_TARGET_DESCRIPTION = "Qt D-Bus C++ to XML Compiler"
-# _LOADED = "qt_tool"
 # _OPTION = "host_build"
 
 ## Scopes:
diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
index 522c55593f..768594efb4 100644
--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -61,7 +61,7 @@ static const char docTypeHeader[] =
 
 #define PROGRAMNAME     "qdbuscpp2xml"
 #define PROGRAMVERSION  "0.2"
-#define PROGRAMCOPYRIGHT "Copyright (C) 2019 The Qt Company Ltd."
+#define PROGRAMCOPYRIGHT "Copyright (C) 2020 The Qt Company Ltd."
 
 static QString outputFile;
 static int flags;
@@ -115,7 +115,7 @@ static QString addFunction(const FunctionDef &mm, bool isSignal = false) {
                         .arg(typeNameToXml(typeName));
 
                     // do we need to describe this argument?
-                    if (QDBusMetaType::signatureToType(typeName) == QVariant::Invalid)
+                    if (QDBusMetaType::signatureToType(typeName) == QMetaType::UnknownType)
                         xml += QString::fromLatin1("      <annotation name=\"org.qtproject.QtDBus.QtTypeName.Out0\" value=\"%1\"/>\n")
                             .arg(typeNameToXml(mm.normalizedType.constData()));
             } else {
@@ -159,7 +159,7 @@ static QString addFunction(const FunctionDef &mm, bool isSignal = false) {
                      isOutput ? QLatin1String("out") : QLatin1String("in"));
 
         // do we need to describe this argument?
-        if (QDBusMetaType::signatureToType(signature) == QVariant::Invalid) {
+        if (QDBusMetaType::signatureToType(signature) == QMetaType::UnknownType) {
             const char *typeName = QMetaType::typeName(types.at(j));
             xml += QString::fromLatin1("      <annotation name=\"org.qtproject.QtDBus.QtTypeName.%1%2\" value=\"%3\"/>\n")
                     .arg(isOutput ? QLatin1String("Out") : QLatin1String("In"))
@@ -225,7 +225,7 @@ static QString generateInterfaceXml(const ClassDef *mo)
                            QLatin1String(signature),
                            QLatin1String(accessvalues[access]));
 
-            if (QDBusMetaType::signatureToType(signature) == QVariant::Invalid) {
+            if (QDBusMetaType::signatureToType(signature) == QMetaType::UnknownType) {
                 retval += QString::fromLatin1(">\n      <annotation name=\"org.qtproject.QtDBus.QtTypeName\" value=\"%3\"/>\n    </property>\n")
                           .arg(typeNameToXml(mp.type.constData()));
             } else {