diff options
| -rw-r--r-- | src/qml/qml/qqmlmetatype.cpp | 10 | ||||
| -rw-r--r-- | tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp index b89d19b199..16b05898d1 100644 --- a/src/qml/qml/qqmlmetatype.cpp +++ b/src/qml/qml/qqmlmetatype.cpp @@ -51,6 +51,7 @@ #include <QtCore/qloggingcategory.h> Q_DECLARE_LOGGING_CATEGORY(DBG_DISK_CACHE) +Q_LOGGING_CATEGORY(lcTypeRegistration, "qt.qml.typeregistration") QT_BEGIN_NAMESPACE @@ -411,9 +412,12 @@ bool checkRegistration(QQmlType::RegistrationType typeType, QQmlMetaTypeData *da if (typeName.at(0).isUpper() && (flags & (QMetaType::IsGadget | QMetaType::PointerToGadget))) { - QString failure(QCoreApplication::translate("qmlRegisterType", "Invalid QML %1 name \"%2\"; value type names must begin with a lowercase letter")); - data->recordTypeRegFailure(failure.arg(registrationTypeString(typeType)).arg(typeName)); - return false; + qCWarning(lcTypeRegistration).noquote() + << QCoreApplication::translate( + "qmlRegisterType", + "Invalid QML %1 name \"%2\"; " + "value type names should begin with a lowercase letter") + .arg(registrationTypeString(typeType)).arg(typeName); } // There can also be types that aren't even gadgets, and there can be types for namespaces. diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp index 1bf5e2901c..feea81dd29 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -5969,8 +5969,8 @@ public: void tst_qqmllanguage::registerValueTypes() { - QTest::ignoreMessage(QtWarningMsg, "Invalid QML element name \"UpperCase\"; value type names must begin with a lowercase letter"); - QCOMPARE(qmlRegisterType<TestValueType>("DoesNotWork", 1, 0, "UpperCase"), -1); + QTest::ignoreMessage(QtWarningMsg, "Invalid QML element name \"UpperCase\"; value type names should begin with a lowercase letter"); + QVERIFY(qmlRegisterType<TestValueType>("DoesNotWork", 1, 0, "UpperCase") >= 0); QVERIFY(qmlRegisterType<TestObjectType>("DoesWork", 1, 0, "TestObject") >= 0); { |