diff options
Diffstat (limited to 'tests/auto/tools')
| -rw-r--r-- | tests/auto/tools/moc/tst_moc.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/tools/moc/warn-on-multiple-qobject-subclasses.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp index f3107b9c85..4e01472e0a 100644 --- a/tests/auto/tools/moc/tst_moc.cpp +++ b/tests/auto/tools/moc/tst_moc.cpp @@ -867,7 +867,7 @@ void tst_Moc::warnOnMultipleInheritance() QVERIFY(!mocOut.isEmpty()); QString mocWarning = QString::fromLocal8Bit(proc.readAllStandardError()); QCOMPARE(mocWarning, QString(SRCDIR) + - QString("/warn-on-multiple-qobject-subclasses.h:53: Warning: Class Bar inherits from two QObject subclasses QWidget and Foo. This is not supported!\n")); + QString("/warn-on-multiple-qobject-subclasses.h:53: Warning: Class Bar inherits from two QObject subclasses QWindow and Foo. This is not supported!\n")); #else QSKIP("Only tested on linux/gcc", SkipAll); #endif diff --git a/tests/auto/tools/moc/warn-on-multiple-qobject-subclasses.h b/tests/auto/tools/moc/warn-on-multiple-qobject-subclasses.h index a72f86a7cc..f6863bdde6 100644 --- a/tests/auto/tools/moc/warn-on-multiple-qobject-subclasses.h +++ b/tests/auto/tools/moc/warn-on-multiple-qobject-subclasses.h @@ -47,7 +47,7 @@ class Foo : public QObject public: }; -class Bar : public QWidget, public Foo +class Bar : public QWindow, public Foo { Q_OBJECT }; |