diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:37:31 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:37:31 +0100 |
| commit | 3b67ec7abdb3056f259eb0aa819de9b5bbf8ec3a (patch) | |
| tree | 84345fc1b93e153313c367abc1e8eac1ced51631 /tests/auto/quick | |
| parent | ede9a8285858873e644083bbad9a71da26276dce (diff) | |
| parent | 3795904e3831722e222fa32a1e52aeb6b3e6ba87 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I6b2539bf17d3e9bc66d96b53c1bce95680113ed8
Diffstat (limited to 'tests/auto/quick')
| -rw-r--r-- | tests/auto/quick/propertyrequirements/tst_propertyrequirements.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/quick/propertyrequirements/tst_propertyrequirements.cpp b/tests/auto/quick/propertyrequirements/tst_propertyrequirements.cpp index fbcd53cad4..34be4d98b4 100644 --- a/tests/auto/quick/propertyrequirements/tst_propertyrequirements.cpp +++ b/tests/auto/quick/propertyrequirements/tst_propertyrequirements.cpp @@ -175,8 +175,10 @@ void tst_PropertyRequirements::testQmlType(TestDepth testDepth, const QQmlType & // check if this type is derived from QObject and even can have signals // i.e. weed out the Q_GADGET classes - if (inheritanceHierarchy.first()->className() != QByteArray("QObject")) + if (inheritanceHierarchy.isEmpty() + || inheritanceHierarchy.constFirst()->className() != QByteArrayLiteral("QObject")) { return; + } if (testDepth == MainTypeOnly) { inheritanceHierarchy.clear(); |