diff options
| -rw-r--r-- | src/imports/testlib/TestCase.qml | 2 | ||||
| -rw-r--r-- | src/qmltest/quicktest.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickevents_p_p.h | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickmousearea_p.h | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qjsengine/tst_qjsengine.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index 5484d5a96b..7584241ca6 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -143,7 +143,7 @@ Item { if ("mapFromItem" in o && "mapToItem" in o) { return "declarativeitem"; // @todo improve detection of declarative items } else if ("x" in o && "y" in o && "z" in o) { - return "vector3d"; // Qt3D vector + return "vector3d"; // Qt 3D vector } return "object"; } else if (o instanceof Function) { diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp index 1dc0e3fecb..2db68bad16 100644 --- a/src/qmltest/quicktest.cpp +++ b/src/qmltest/quicktest.cpp @@ -344,7 +344,7 @@ int quick_test_main(int argc, char **argv, const char *name, const char *sourceD rootobj.setWindowShown(true); if (!rootobj.hasQuit && rootobj.hasTestCase()) eventLoop.exec(); - // view->hide(); Causes a crash in Qt3D due to deletion of the GL context, see QTBUG-27696 + // view->hide(); Causes a crash in Qt 3D due to deletion of the GL context, see QTBUG-27696 } } diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h index 469ae9d0e4..6f1b152ad3 100644 --- a/src/quick/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_p.h @@ -93,7 +93,7 @@ private: QKeyEvent event; }; -// used in QtLocation +// used in Qt Location class Q_QUICK_PRIVATE_EXPORT QQuickMouseEvent : public QObject { Q_OBJECT diff --git a/src/quick/items/qquickmousearea_p.h b/src/quick/items/qquickmousearea_p.h index ad15167b10..fa32f32b65 100644 --- a/src/quick/items/qquickmousearea_p.h +++ b/src/quick/items/qquickmousearea_p.h @@ -123,7 +123,7 @@ private: class QQuickMouseAreaPrivate; class QQuickWheelEvent; -// used in QtLocation +// used in Qt Location class Q_QUICK_PRIVATE_EXPORT QQuickMouseArea : public QQuickItem { Q_OBJECT diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp index 89289f3a9f..23c32c163f 100644 --- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp @@ -1917,7 +1917,7 @@ void tst_QJSEngine::jsFunctionDeclarationAsStatement() // at the beginning of chapter 12 in ECMA-262 5th edition, where it's // recommended that implementations either disallow this usage or issue // a warning. - // Since we had a bug report long ago about QtScript not supporting this + // Since we had a bug report long ago about Qt Script not supporting this // "feature" (and thus deviating from other implementations), we still // check this behavior. @@ -2625,7 +2625,7 @@ void tst_QJSEngine::qRegExpInport() } // QScriptValue::toDateTime() returns a local time, whereas JS dates -// are always stored as UTC. QtScript must respect the current time +// are always stored as UTC. Qt Script must respect the current time // zone, and correctly adjust for daylight saving time that may be in // effect at a given date (QTBUG-9770). void tst_QJSEngine::dateRoundtripJSQtJS() diff --git a/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp b/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp index a2bf06c2ba..ed8fb9f56f 100644 --- a/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp +++ b/tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp @@ -138,7 +138,7 @@ void tst_QQuickWorkerScript::messaging_data() QTest::newRow("variant list") << qVariantFromValue((QVariantList() << "a" << "b" << "c")); QTest::newRow("date time") << qVariantFromValue(QDateTime::currentDateTime()); #ifndef QT_NO_REGEXP - // QtScript's QScriptValue -> QRegExp uses RegExp2 pattern syntax + // Qt Script's QScriptValue -> QRegExp uses RegExp2 pattern syntax QTest::newRow("regexp") << qVariantFromValue(QRegExp("^\\d\\d?$", Qt::CaseInsensitive, QRegExp::RegExp2)); #endif } |