whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Lars Knoll 2011-09-28 22:42:28 +02:00 committed by Qt by Nokia
parent e9ccc40c28
commit 1cc70b92c8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/tools/moc/tst_moc.cpp
View File

@ -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

2
tests/auto/tools/moc/warn-on-multiple-qobject-subclasses.h
View File

@ -47,7 +47,7 @@ class Foo : public QObject
public:
};
class Bar : public QWidget, public Foo
class Bar : public QWindow, public Foo
{
Q_OBJECT
};