From 6e5430ce256345f23b2dbba382c315114f128a3b Mon Sep 17 00:00:00 2001 From: "Anselmo L. S. Melo" Date: Fri, 20 Jan 2012 18:00:16 -0300 Subject: QtDeclarative Tests build fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QBool was removed from QtBase in change I6642f43f: "Remove QBool and use bool instead". Change-Id: Icc037d4201a007f9df0f7c79b19808dc174c218f Reviewed-by: Jędrzej Nowacki --- tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp | 4 ++-- .../qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp index 2af72996f1..b41cd0616d 100644 --- a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp +++ b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp @@ -175,7 +175,7 @@ void tst_qdeclarativeinfo::types() qmlInfo(0) << QByteArray("Qt"); QTest::ignoreMessage(QtWarningMsg, ": true"); - qmlInfo(0) << QBool(true); + qmlInfo(0) << bool(true); //### do we actually want QUrl to show up in the output? //### why the extra space at the end? @@ -212,7 +212,7 @@ void tst_qdeclarativeinfo::chaining() << QUrl("http://qt.nokia.com") << ref << QByteArray("Qt") - << QBool(true) + << bool(true) << QString ("Quick"); } diff --git a/tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp index 96fd85b63b..8e64e54d8b 100644 --- a/tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp +++ b/tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp @@ -1147,9 +1147,9 @@ template void tst_qquickvisualdatamodel::groups_verify( QCOMPARE(evaluate(delegate, "test6"), vMember[i]); QCOMPARE(evaluate(delegate, "test7") , sIndex[i]); QCOMPARE(evaluate(delegate, "test8"), sMember[i]); - QCOMPARE(evaluate(delegate, "test9").contains("items") , QBool(true)); - QCOMPARE(evaluate(delegate, "test9").contains("visible") , QBool(vMember[i])); - QCOMPARE(evaluate(delegate, "test9").contains("selected"), QBool(sMember[i])); + QCOMPARE(evaluate(delegate, "test9").contains("items") , bool(true)); + QCOMPARE(evaluate(delegate, "test9").contains("visible") , bool(vMember[i])); + QCOMPARE(evaluate(delegate, "test9").contains("selected"), bool(sMember[i])); } failed = false; } -- cgit v1.2.3