56bd5d60c9
By actually registering them.
Commit 850d850c5a changed from
qMetaTypeId<QDBusArgument>() to QMetaType::fromType<QDBusArgument>() and
in Qt 6, fromType() does not register the type with the database. That
means the lines became runtime no-ops at that time or during the
QMetaType updates since 6.0. All they did was instantiate the C++ inline
variable.
The testing also detected we didn't register QList<QDBusVariant> as an
alias for the "av" signature. I'm not entirely sure you're allowed to
use this because QtDBus does not like re-registration of the built-in
types, and "av" is already assigned to QVariantList. This is no trouble
for the parser, anyway.
Minor change to qdbuscpp2xml to allow reading from stdin, so we don't
have to create temporary files.
Pick-to: 6.5 6.6
Fixes: QTBUG-115964
Change-Id: I80612a7d275c41f1baf0fffd177a14925e7d23ac
Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
34 lines
819 B
CMake
34 lines
819 B
CMake
# Copyright (C) 2022 The Qt Company Ltd.
|
|
# SPDX-License-Identifier: BSD-3-Clause
|
|
|
|
#####################################################################
|
|
## tst_qdbuscpp2xml Test:
|
|
#####################################################################
|
|
|
|
if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
|
|
cmake_minimum_required(VERSION 3.16)
|
|
project(tst_qdbuscpp2xml LANGUAGES CXX)
|
|
find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
|
|
endif()
|
|
|
|
qt_internal_add_test(tst_qdbuscpp2xml
|
|
SOURCES
|
|
test1.h
|
|
tst_qdbuscpp2xml.cpp
|
|
LIBRARIES
|
|
Qt::DBusPrivate
|
|
)
|
|
|
|
# Resources:
|
|
set(qdbuscpp2xml_resource_files
|
|
"test1.h"
|
|
)
|
|
|
|
qt_internal_add_resource(tst_qdbuscpp2xml "qdbuscpp2xml"
|
|
PREFIX
|
|
"/tst_qdbuscpp2xml/"
|
|
FILES
|
|
${qdbuscpp2xml_resource_files}
|
|
)
|
|
|