diff options
author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-01-31 13:58:44 +1000 |
---|---|---|
committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-01-31 06:34:44 +0100 |
commit | f973bb1730e1138f9c745d142c1f2f5d9c53b456 (patch) | |
tree | c04bc36a5ae8fddf29e6fe37f55e3ec2af59de3f /tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp | |
parent | dbf35e498db723ae9850686e462ec4f45bc7b67c (diff) |
Fix compile failures.
Remove uses of QLineControl, QTextControl and QBool and forward
declared QGraphicsWidget.
Change-Id: Ic5184a1d5aebfb1100ad0e24444b6773f4e617e8
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp')
-rw-r--r-- | tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp index 11671363..94958b2e 100644 --- a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp +++ b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp @@ -161,9 +161,6 @@ void tst_qdeclarativeinfo::types() QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: \"Qt\""); qmlInfo(0) << QByteArray("Qt"); - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: true"); - qmlInfo(0) << QBool(true); - //### do we actually want QUrl to show up in the output? //### why the extra space at the end? QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QUrl(\"http://qt.nokia.com\") "); @@ -189,7 +186,7 @@ void tst_qdeclarativeinfo::chaining() //### should more of these be automatically inserting spaces? QString str("Hello World"); QStringRef ref(&str, 6, 5); - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: false 1.1 1.2 15 hello 'b' QUrl(\"http://qt.nokia.com\") World \"Qt\" true Quick "); + QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: false 1.1 1.2 15 hello 'b' QUrl(\"http://qt.nokia.com\") World \"Qt\" Quick "); qmlInfo(0) << false << ' ' << 1.1 << ' ' << 1.2f << ' ' @@ -199,7 +196,6 @@ void tst_qdeclarativeinfo::chaining() << QUrl("http://qt.nokia.com") << ref << QByteArray("Qt") - << QBool(true) << QString ("Quick"); } |