diff options
29 files changed, 84 insertions, 69 deletions
diff --git a/qmake-features/dbus-adaptors-xml.prf b/qmake-features/dbus-adaptors-xml.prf index 01e5a47b..66828c87 100644 --- a/qmake-features/dbus-adaptors-xml.prf +++ b/qmake-features/dbus-adaptors-xml.prf @@ -2,9 +2,13 @@ load(moc) qtPrepareTool(QDBUSXML2CPP, qdbusxml2cpp) +defineReplace(am_qdbusOutputBasename) { + return($$lower($$section($$list($$basename(1)),.,-2,-2))) +} + adaptors_header.commands = $$QDBUSXML2CPP -i dbus-utilities.h -a ${QMAKE_FILE_OUT}: ${QMAKE_FILE_IN} adaptors_header.depends += $$QDBUSXML2CPP_EXE -adaptors_header.output = ${QMAKE_FILE_BASE}_adaptor$${first(QMAKE_EXT_H)} +adaptors_header.output = ${QMAKE_FUNC_FILE_IN_am_qdbusOutputBasename}_adaptor$${first(QMAKE_EXT_H)} adaptors_header.name = DBUS adaptor header for ${QMAKE_FILE_IN} adaptors_header.variable_out = dbus_adaptor_headers adaptors_header.input = ADAPTORS_XML diff --git a/src/common-lib/exception.h b/src/common-lib/exception.h index 4610992c..ea734b42 100644 --- a/src/common-lib/exception.h +++ b/src/common-lib/exception.h @@ -70,7 +70,7 @@ public: Exception(const Exception ©) Q_DECL_NOEXCEPT; Exception(Exception &&move) Q_DECL_NOEXCEPT; - ~Exception() Q_DECL_NOEXCEPT override; + ~Exception() Q_DECL_NOEXCEPT; Error errorCode() const Q_DECL_NOEXCEPT; QString errorString() const Q_DECL_NOEXCEPT; diff --git a/src/common-lib/qml-utilities.cpp b/src/common-lib/qml-utilities.cpp index 230f578d..65b2a6c6 100644 --- a/src/common-lib/qml-utilities.cpp +++ b/src/common-lib/qml-utilities.cpp @@ -72,18 +72,18 @@ void fixNullValuesForQml(QVariantMap &map) void fixNullValuesForQml(QVariant &v) { - switch (static_cast<int>(v.type())) { - case QVariant::List: { + switch (v.metaType().id()) { + case QMetaType::QVariantList: { QVariantList *list = qt6_v_cast<QVariantList>(&v.data_ptr()); fixNullValuesForQml(*list); break; } - case QVariant::Map: { + case QMetaType::QVariantMap: { QVariantMap *map = qt6_v_cast<QVariantMap>(&v.data_ptr()); fixNullValuesForQml(*map); break; } - case QVariant::Invalid: { + case QMetaType::UnknownType: { QVariant v2 = QVariant::fromValue(nullptr); std::swap(v.data_ptr(), v2.data_ptr()); break; diff --git a/src/common-lib/qtyaml.cpp b/src/common-lib/qtyaml.cpp index 4144d4bd..e597e709 100644 --- a/src/common-lib/qtyaml.cpp +++ b/src/common-lib/qtyaml.cpp @@ -83,30 +83,30 @@ static void emitYaml(yaml_emitter_t *e, const QVariant &value, YamlStyle style) { yaml_event_t event; - switch (value.type()) { + switch (value.metaType().id()) { default: - case QVariant::Invalid: + case QMetaType::UnknownType: emitYamlScalar(e, "~"); break; - case QVariant::Bool: + case QMetaType::Bool: emitYamlScalar(e, value.toBool() ? "true" : "false"); break; - case QVariant::Int: - case QVariant::LongLong: + case QMetaType::Int: + case QMetaType::LongLong: emitYamlScalar(e, QByteArray::number(value.toLongLong())); break; - case QVariant::UInt: - case QVariant::ULongLong: + case QMetaType::UInt: + case QMetaType::ULongLong: emitYamlScalar(e, QByteArray::number(value.toULongLong())); break; - case QVariant::Double: + case QMetaType::Double: emitYamlScalar(e, QByteArray::number(value.toDouble())); break; - case QVariant::String: + case QMetaType::QString: emitYamlScalar(e, value.toString().toUtf8(), true); break; - case QVariant::List: - case QVariant::StringList: { + case QMetaType::QVariantList: + case QMetaType::QStringList: { yerr(yaml_sequence_start_event_initialize(&event, nullptr, nullptr, 1, style == FlowStyle ? YAML_FLOW_SEQUENCE_STYLE : YAML_BLOCK_SEQUENCE_STYLE)); yerr(yaml_emitter_emit(e, &event)); @@ -118,7 +118,7 @@ static void emitYaml(yaml_emitter_t *e, const QVariant &value, YamlStyle style) yerr(yaml_emitter_emit(e, &event)); break; } - case QVariant::Map: { + case QMetaType::QVariantMap: { yerr(yaml_mapping_start_event_initialize(&event, nullptr, nullptr, 1, style == FlowStyle ? YAML_FLOW_MAPPING_STYLE : YAML_BLOCK_MAPPING_STYLE)); yerr(yaml_emitter_emit(e, &event)); @@ -477,7 +477,7 @@ QString YamlParser::parseMapKey() { if (isScalar()) { QVariant key = parseScalar(); - if (key.type() == QVariant::String) + if (key.metaType() == QMetaType::fromType<QString>()) return key.toString(); } throw YamlParserException(this, "Only strings are supported as mapping keys"); diff --git a/src/common-lib/utilities.cpp b/src/common-lib/utilities.cpp index 8a7061f1..708cb5fb 100644 --- a/src/common-lib/utilities.cpp +++ b/src/common-lib/utilities.cpp @@ -335,12 +335,12 @@ void recursiveMergeVariantMap(QVariantMap &into, const QVariantMap &from) QVariant fromValue = it.value(); QVariant &toValue = (*into)[it.key()]; - bool needsMerge = (toValue.type() == fromValue.type()); + bool needsMerge = (toValue.metaType() == fromValue.metaType()); // we're trying not to detach, so we're using v_cast to avoid copies - if (needsMerge && (toValue.type() == QVariant::Map)) + if (needsMerge && (toValue.metaType() == QMetaType::fromType<QVariantMap>())) recursiveMergeMap(qt6_v_cast<QVariantMap>(&toValue.data_ptr()), fromValue.toMap()); - else if (needsMerge && (toValue.type() == QVariant::List)) + else if (needsMerge && (toValue.metaType() == QMetaType::fromType<QVariantList>())) into->insert(it.key(), toValue.toList() + fromValue.toList()); else into->insert(it.key(), fromValue); diff --git a/src/common-lib/utilities.h b/src/common-lib/utilities.h index 7086be3d..d5082f82 100644 --- a/src/common-lib/utilities.h +++ b/src/common-lib/utilities.h @@ -75,8 +75,8 @@ YamlFormat checkYamlFormat(const QVector<QVariant> &docs, int numberOfDocuments, */ inline QStringList variantToStringList(const QVariant &v) { - return (v.type() == QVariant::String) ? QStringList(v.toString()) - : v.toStringList(); + return (v.metaType() == QMetaType::fromType<QString>()) ? QStringList(v.toString()) + : v.toStringList(); } // Translate between QFile and QUrl (resource) representations. diff --git a/src/crypto-lib/cryptography.cpp b/src/crypto-lib/cryptography.cpp index 6e3fb327..f3ced4ce 100644 --- a/src/crypto-lib/cryptography.cpp +++ b/src/crypto-lib/cryptography.cpp @@ -150,6 +150,8 @@ QString Cryptography::errorString(qint64 osCryptoError, const char *errorDescrip result.append(QString::number(osCryptoError)); # endif } +#else + Q_UNUSED(osCryptoError) #endif return result; diff --git a/src/dbus-lib/applicationmanagerdbuscontextadaptor.cpp b/src/dbus-lib/applicationmanagerdbuscontextadaptor.cpp index 5794e79a..c12ae788 100644 --- a/src/dbus-lib/applicationmanagerdbuscontextadaptor.cpp +++ b/src/dbus-lib/applicationmanagerdbuscontextadaptor.cpp @@ -47,7 +47,7 @@ #include "applicationmanagerdbuscontextadaptor.h" #include "applicationmanager.h" -#include "io.qt.applicationmanager_adaptor.h" +#include "applicationmanager_adaptor.h" #include "dbuspolicy.h" #include "exception.h" #include "logging.h" diff --git a/src/dbus-lib/notificationmanagerdbuscontextadaptor.cpp b/src/dbus-lib/notificationmanagerdbuscontextadaptor.cpp index ed80d6a5..130e78d0 100644 --- a/src/dbus-lib/notificationmanagerdbuscontextadaptor.cpp +++ b/src/dbus-lib/notificationmanagerdbuscontextadaptor.cpp @@ -47,7 +47,7 @@ #include "notificationmanagerdbuscontextadaptor.h" #include "notificationmanager.h" -#include "org.freedesktop.notifications_adaptor.h" +#include "notifications_adaptor.h" QT_BEGIN_NAMESPACE_AM diff --git a/src/dbus-lib/packagemanagerdbuscontextadaptor.cpp b/src/dbus-lib/packagemanagerdbuscontextadaptor.cpp index 98fc664b..4ff42aad 100644 --- a/src/dbus-lib/packagemanagerdbuscontextadaptor.cpp +++ b/src/dbus-lib/packagemanagerdbuscontextadaptor.cpp @@ -43,7 +43,7 @@ #include "packagemanagerdbuscontextadaptor.h" #include "package.h" #include "packagemanager.h" -#include "io.qt.packagemanager_adaptor.h" +#include "packagemanager_adaptor.h" #include "dbuspolicy.h" #include "exception.h" #include "logging.h" diff --git a/src/dbus-lib/windowmanagerdbuscontextadaptor.cpp b/src/dbus-lib/windowmanagerdbuscontextadaptor.cpp index b6b1b5a2..6ed4a0d8 100644 --- a/src/dbus-lib/windowmanagerdbuscontextadaptor.cpp +++ b/src/dbus-lib/windowmanagerdbuscontextadaptor.cpp @@ -42,7 +42,7 @@ #include "windowmanagerdbuscontextadaptor.h" #include "windowmanager.h" -#include "io.qt.windowmanager_adaptor.h" +#include "windowmanager_adaptor.h" QT_BEGIN_NAMESPACE_AM diff --git a/src/intent-server-lib/intent.cpp b/src/intent-server-lib/intent.cpp index 35ee0eac..15a47f21 100644 --- a/src/intent-server-lib/intent.cpp +++ b/src/intent-server-lib/intent.cpp @@ -189,15 +189,15 @@ bool Intent::checkParameterMatch(const QVariantMap ¶meters) const const QVariant requiredValue = rit.value(); const QVariant actualValue = pit.value(); - switch (requiredValue.type()) { - case QVariant::String: { + switch (requiredValue.metaType().id()) { + case QMetaType::QString: { QRegularExpression regexp(requiredValue.toString()); auto match = regexp.match(actualValue.toString()); if (!match.hasMatch()) return false; break; } - case QVariant::List: { + case QMetaType::QVariantList: { bool foundMatch = false; const QVariantList rvlist = requiredValue.toList(); for (const QVariant &rv2 : rvlist) { diff --git a/src/main-lib/configuration.cpp b/src/main-lib/configuration.cpp index 86111154..a1ab503e 100644 --- a/src/main-lib/configuration.cpp +++ b/src/main-lib/configuration.cpp @@ -686,15 +686,15 @@ ConfigurationData *ConfigurationData::loadFromSource(QIODevice *source, const QS // this is easy to get wrong in the config file, so we do not just ignore a map here // (this will in turn trigger the warning below) - if (containerSelection.type() == QVariant::Map) + if (containerSelection.metaType() == QMetaType::fromType<QVariantMap>()) containerSelection = QVariantList { containerSelection }; - if (containerSelection.type() == QVariant::String) { + if (containerSelection.metaType() == QMetaType::fromType<QString>()) { config.append(qMakePair(qSL("*"), containerSelection.toString())); - } else if (containerSelection.type() == QVariant::List) { + } else if (containerSelection.metaType() == QMetaType::fromType<QVariantList>()) { QVariantList list = containerSelection.toList(); for (const QVariant &v : list) { - if (v.type() == QVariant::Map) { + if (v.metaType() == QMetaType::fromType<QVariantMap>()) { QVariantMap map = v.toMap(); if (map.size() != 1) { @@ -1106,7 +1106,7 @@ QVariant Configuration::useAMConsoleLogger() const // false = don't use the am logger // invalid = don't use the am logger when QT_MESSAGE_PATTERN is set const QVariant &val = m_data->logging.useAMConsoleLogger; - if (val.type() == QVariant::Bool) + if (val.metaType() == QMetaType::fromType<bool>()) return val; else return QVariant(); diff --git a/src/manager-lib/applicationipcinterface.cpp b/src/manager-lib/applicationipcinterface.cpp index d3dd8e45..98c34512 100644 --- a/src/manager-lib/applicationipcinterface.cpp +++ b/src/manager-lib/applicationipcinterface.cpp @@ -311,7 +311,7 @@ IpcProxyObject::IpcProxyObject(QObject *object, const QString &serviceName, cons << "but the annotated function" << slotName << "is missing"; } } else { - if (dbusType(int(mp.type()))) { + if (dbusType(mp.metaType().id())) { m_properties << i; } else { qCWarning(LogQmlIpc) << "Ignoring property" << mp.name() @@ -354,7 +354,7 @@ QByteArray IpcProxyObject::createIntrospectionXml() readWrite += "write"; xml = xml + " <property name=\"" + mp.name() - + "\" type=\"" + dbusType(int(mp.type())) + + "\" type=\"" + dbusType(mp.metaType().id()) + "\" access=\"" + readWrite + "\" />\n"; } @@ -388,7 +388,7 @@ QByteArray IpcProxyObject::createIntrospectionXml() for (int pi = 0; pi < types.count(); ++pi) { if (pi == 0 && types.at(0) == QMetaType::Void) continue; - xml = xml + " <arg name=\"" + (pi == 0 ? "result" : mm.parameterNames().at(pi - 1)) + xml = xml + " <arg name=\"" + (pi == 0 ? QByteArray("result") : mm.parameterNames().at(pi - 1)) + "\" type=\"" + dbusType(types.at(pi)) + "\" direction=\"" + (pi == 0 ? "out" : "in") + "\" />\n"; diff --git a/src/manager-lib/intentaminterface.cpp b/src/manager-lib/intentaminterface.cpp index 5df42163..06e6a13e 100644 --- a/src/manager-lib/intentaminterface.cpp +++ b/src/manager-lib/intentaminterface.cpp @@ -47,7 +47,7 @@ # include <QDBusPendingCallWatcher> # include <QDBusPendingReply> -# include "io.qt.applicationmanager.intentinterface_adaptor.h" +# include "intentinterface_adaptor.h" # include "dbus-utilities.h" # include "nativeruntime.h" #endif diff --git a/src/manager-lib/qmlinprocessapplicationmanagerwindow.cpp b/src/manager-lib/qmlinprocessapplicationmanagerwindow.cpp index 563461ce..b312a394 100644 --- a/src/manager-lib/qmlinprocessapplicationmanagerwindow.cpp +++ b/src/manager-lib/qmlinprocessapplicationmanagerwindow.cpp @@ -159,7 +159,7 @@ void QmlInProcessApplicationManagerWindow::data_append(QQmlListProperty<QObject> itemProperty.append(&itemProperty, value); } -int QmlInProcessApplicationManagerWindow::data_count(QQmlListProperty<QObject> *property) +qsizetype QmlInProcessApplicationManagerWindow::data_count(QQmlListProperty<QObject> *property) { auto *that = static_cast<QmlInProcessApplicationManagerWindow*>(property->object); if (!QQuickItemPrivate::get(that->contentItem())->data().count) @@ -168,7 +168,7 @@ int QmlInProcessApplicationManagerWindow::data_count(QQmlListProperty<QObject> * return itemProperty.count(&itemProperty); } -QObject *QmlInProcessApplicationManagerWindow::data_at(QQmlListProperty<QObject> *property, int index) +QObject *QmlInProcessApplicationManagerWindow::data_at(QQmlListProperty<QObject> *property, qsizetype index) { auto *that = static_cast<QmlInProcessApplicationManagerWindow*>(property->object); QQmlListProperty<QObject> itemProperty = QQuickItemPrivate::get(that->contentItem())->data(); diff --git a/src/manager-lib/qmlinprocessapplicationmanagerwindow.h b/src/manager-lib/qmlinprocessapplicationmanagerwindow.h index 0daeb718..c53014b4 100644 --- a/src/manager-lib/qmlinprocessapplicationmanagerwindow.h +++ b/src/manager-lib/qmlinprocessapplicationmanagerwindow.h @@ -105,8 +105,8 @@ public: void componentComplete() override; static void data_append(QQmlListProperty<QObject> *property, QObject *value); - static int data_count(QQmlListProperty<QObject> *property); - static QObject *data_at(QQmlListProperty<QObject> *property, int index); + static qsizetype data_count(QQmlListProperty<QObject> *property); + static QObject *data_at(QQmlListProperty<QObject> *property, qsizetype index); static void data_clear(QQmlListProperty<QObject> *property); // Getters and setters for QWindow properties diff --git a/src/notification-lib/notification.cpp b/src/notification-lib/notification.cpp index 5813ac82..60d6089e 100644 --- a/src/notification-lib/notification.cpp +++ b/src/notification-lib/notification.cpp @@ -552,7 +552,7 @@ QStringList Notification::libnotifyActionList() const if (isAcknowledgeable()) actionList << qSL("default") << QString(); for (const QVariant &action : m_actions) { - if (action.type() == QVariant::String) { + if (action.metaType() == QMetaType::fromType<QString>()) { actionList << action.toString() << QString(); } else { QVariantMap map = action.toMap(); diff --git a/src/package-lib/packageutilities.cpp b/src/package-lib/packageutilities.cpp index 51870f7b..a378bbaa 100644 --- a/src/package-lib/packageutilities.cpp +++ b/src/package-lib/packageutilities.cpp @@ -176,7 +176,7 @@ void PackageUtilities::addHeaderDataToDigest(const QVariantMap &header, QCryptog QVariant v = header.value(it.key()); 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()); + .arg(it.key()).arg(header.value(it.key()).metaType().name()).arg(it.value().metaType().name()); ds << v; digest.addData(ba); diff --git a/src/shared-main-lib/monitormodel.cpp b/src/shared-main-lib/monitormodel.cpp index 5bc9e858..21839b2e 100644 --- a/src/shared-main-lib/monitormodel.cpp +++ b/src/shared-main-lib/monitormodel.cpp @@ -193,13 +193,13 @@ void MonitorModel::dataSources_append(QQmlListProperty<QObject> *property, QObje that->appendDataSource(dataSource); } -int MonitorModel::dataSources_count(QQmlListProperty<QObject> *property) +qsizetype MonitorModel::dataSources_count(QQmlListProperty<QObject> *property) { auto *that = static_cast<MonitorModel*>(property->object); return that->m_dataSources.count(); } -QObject *MonitorModel::dataSources_at(QQmlListProperty<QObject> *property, int index) +QObject *MonitorModel::dataSources_at(QQmlListProperty<QObject> *property, qsizetype index) { auto *that = static_cast<MonitorModel*>(property->object); return that && that->m_dataSources.count() > index && index >= 0 ? that->m_dataSources.at(index)->obj : nullptr; diff --git a/src/shared-main-lib/monitormodel.h b/src/shared-main-lib/monitormodel.h index b7d80e9a..bd6887ad 100644 --- a/src/shared-main-lib/monitormodel.h +++ b/src/shared-main-lib/monitormodel.h @@ -72,8 +72,8 @@ public: QQmlListProperty<QObject> dataSources(); static void dataSources_append(QQmlListProperty<QObject> *property, QObject *value); - static int dataSources_count(QQmlListProperty<QObject> *property); - static QObject *dataSources_at(QQmlListProperty<QObject> *property, int index); + static qsizetype dataSources_count(QQmlListProperty<QObject> *property); + static QObject *dataSources_at(QQmlListProperty<QObject> *property, qsizetype index); static void dataSources_clear(QQmlListProperty<QObject> *property); int rowCount(const QModelIndex &parent = QModelIndex()) const override; diff --git a/src/tools/launcher-qml/launcher-qml.cpp b/src/tools/launcher-qml/launcher-qml.cpp index dd067d8d..631e1384 100644 --- a/src/tools/launcher-qml/launcher-qml.cpp +++ b/src/tools/launcher-qml/launcher-qml.cpp @@ -410,8 +410,10 @@ void Controller::startApplication(const QString &baseDir, const QString &qmlFile } QVariant resVar = runtimeParameters.value(qSL("resources")); - const QVariantList resources = (resVar.type() == QVariant::String) ? QVariantList{resVar} - : qdbus_cast<QVariantList>(resVar); + const QVariantList resources = (resVar.metaType() == QMetaType::fromType<QString>()) + ? QVariantList{resVar} + : qdbus_cast<QVariantList>(resVar); + for (const QVariant &resource : resources) { if (!loadResource(resource.toString())) qCWarning(LogQmlRuntime) << "Cannot register resource:" << resource.toString(); @@ -474,8 +476,10 @@ void Controller::startApplication(const QString &baseDir, const QString &qmlFile } QVariant pluginPaths = runtimeParameters.value(qSL("pluginPaths")); - const QVariantList ppvl = (pluginPaths.type() == QVariant::String) ? QVariantList{pluginPaths} - : qdbus_cast<QVariantList>(pluginPaths); + const QVariantList ppvl = (pluginPaths.metaType() == QMetaType::fromType<QString>()) + ? QVariantList{pluginPaths} + : qdbus_cast<QVariantList>(pluginPaths); + for (const QVariant &v : ppvl) { const QString path = v.toString(); if (QFileInfo(path).isRelative()) @@ -486,8 +490,10 @@ void Controller::startApplication(const QString &baseDir, const QString &qmlFile qCDebug(LogQmlRuntime) << "Plugin paths:" << qApp->libraryPaths(); QVariant imports = runtimeParameters.value(qSL("importPaths")); - const QVariantList ipvl = (imports.type() == QVariant::String) ? QVariantList{imports} - : qdbus_cast<QVariantList>(imports); + const QVariantList ipvl = (imports.metaType() == QMetaType::fromType<QString>()) + ? QVariantList{imports} + : qdbus_cast<QVariantList>(imports); + for (const QVariant &v : ipvl) { const QString path = v.toString(); const QFileInfo fi(path); diff --git a/src/window-lib/windowitem.cpp b/src/window-lib/windowitem.cpp index ad456ea0..8a56a7b0 100644 --- a/src/window-lib/windowitem.cpp +++ b/src/window-lib/windowitem.cpp @@ -305,7 +305,7 @@ void WindowItem::contentItemData_append(QQmlListProperty<QObject> *property, QOb itemProperty.append(&itemProperty, value); } -int WindowItem::contentItemData_count(QQmlListProperty<QObject> *property) +qsizetype WindowItem::contentItemData_count(QQmlListProperty<QObject> *property) { auto *that = static_cast<WindowItem*>(property->object); if (!QQuickItemPrivate::get(that->m_contentItem)->data().count) @@ -314,7 +314,7 @@ int WindowItem::contentItemData_count(QQmlListProperty<QObject> *property) return itemProperty.count(&itemProperty); } -QObject *WindowItem::contentItemData_at(QQmlListProperty<QObject> *property, int index) +QObject *WindowItem::contentItemData_at(QQmlListProperty<QObject> *property, qsizetype index) { auto *that = static_cast<WindowItem*>(property->object); QQmlListProperty<QObject> itemProperty = QQuickItemPrivate::get(that->m_contentItem)->data(); diff --git a/src/window-lib/windowitem.h b/src/window-lib/windowitem.h index d6712070..5de036ee 100644 --- a/src/window-lib/windowitem.h +++ b/src/window-lib/windowitem.h @@ -88,8 +88,8 @@ public: QQmlListProperty<QObject> contentItemData(); static void contentItemData_append(QQmlListProperty<QObject> *property, QObject *value); - static int contentItemData_count(QQmlListProperty<QObject> *property); - static QObject *contentItemData_at(QQmlListProperty<QObject> *property, int index); + static qsizetype contentItemData_count(QQmlListProperty<QObject> *property); + static QObject *contentItemData_at(QQmlListProperty<QObject> *property, qsizetype index); static void contentItemData_clear(QQmlListProperty<QObject> *property); protected: diff --git a/tests/application/tst_application.cpp b/tests/application/tst_application.cpp index 16c5fdb0..8e7be962 100644 --- a/tests/application/tst_application.cpp +++ b/tests/application/tst_application.cpp @@ -81,12 +81,12 @@ public: static QString defaultIdentifier() { return qSL("foo"); } - bool inProcess() const + bool inProcess() const override { return !AbstractRuntimeManager::inProcess(); } - TestRuntime *create(AbstractContainer *container, Application *app) + TestRuntime *create(AbstractContainer *container, Application *app) override { return new TestRuntime(container, app, this); } diff --git a/tests/main/dummy.qml b/tests/main/dummy.qml index e69de29b..2d95c818 100644 --- a/tests/main/dummy.qml +++ b/tests/main/dummy.qml @@ -0,0 +1,3 @@ +import QtQml 2.0 + +QtObject { } diff --git a/tests/packageextractor/tst_packageextractor.cpp b/tests/packageextractor/tst_packageextractor.cpp index 32979bb9..a19f6ed3 100644 --- a/tests/packageextractor/tst_packageextractor.cpp +++ b/tests/packageextractor/tst_packageextractor.cpp @@ -260,7 +260,7 @@ public: return QString::fromLocal8Bit(m_fifoPath); } - void run() + void run() override { #ifdef Q_OS_UNIX int fifoFd = QT_OPEN(m_fifoPath, O_WRONLY); diff --git a/tests/runtime/tst_runtime.cpp b/tests/runtime/tst_runtime.cpp index d64014e2..5b3b514e 100644 --- a/tests/runtime/tst_runtime.cpp +++ b/tests/runtime/tst_runtime.cpp @@ -93,12 +93,12 @@ public: static QString defaultIdentifier() { return qSL("foo"); } - bool inProcess() const + bool inProcess() const override { return !AbstractRuntimeManager::inProcess(); } - TestRuntime *create(AbstractContainer *container, Application *app) + TestRuntime *create(AbstractContainer *container, Application *app) override { return new TestRuntime(container, app, this); } diff --git a/tests/yaml/tst_yaml.cpp b/tests/yaml/tst_yaml.cpp index 448dd690..90029679 100644 --- a/tests/yaml/tst_yaml.cpp +++ b/tests/yaml/tst_yaml.cpp @@ -101,9 +101,9 @@ void tst_Yaml::parser() YamlParser::Fields fields; for (const auto &pair : tests) { YamlParser::FieldType type = YamlParser::Scalar; - if (pair.second.type() == QVariant::List) + if (pair.second.metaType() == QMetaType::fromType<QVariantList>()) type = YamlParser::List; - else if (pair.second.type() == QVariant::Map) + else if (pair.second.metaType() == QMetaType::fromType<QVariantMap>()) type = YamlParser::Map; QVariant value = pair.second; @@ -112,7 +112,7 @@ void tst_Yaml::parser() case YamlParser::Scalar: { QVERIFY(p->isScalar()); QVariant v = p->parseScalar(); - QCOMPARE(int(v.type()), int(value.type())); + QCOMPARE(int(v.metaType().id()), value.metaType().id()); QVERIFY(v == value); break; } @@ -136,7 +136,7 @@ void tst_Yaml::parser() { "ext-string", true, YamlParser::Scalar, [](YamlParser *p) { QVERIFY(p->isScalar()); QVariant v = p->parseScalar(); - QCOMPARE(v.type(), QVariant::String); + QCOMPARE(v.metaType(), QMetaType::fromType<QString>()); QCOMPARE(v.toString(), "ext string"); } } }; |