diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-09-28 22:42:28 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 08:55:10 +0200 |
| commit | 1cc70b92c8c838a013b45af6814ea6532245067a (patch) | |
| tree | e93e16a2a543f6243524cdd94e17df281e80189f /tests/auto/tools | |
| parent | e9ccc40c28d11d7d17e6c79a627590f730b7c120 (diff) | |
Fix moc autotest
QWidget is not in QtGui anymore, this broke the
test. Simply use QWindow instead.
Change-Id: Ic0176410f08b10771b663aa3ecd70295c124b662
Reviewed-on: http://codereview.qt-project.org/5757
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
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 }; |