From b10d450e9ea99aa1ad28ff5d939958503f0bd5ea Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Fri, 27 May 2011 11:30:17 +1000 Subject: Make tests compile. Change-Id: Iecb50641f927b82533e25262ba1ab8a0a14a108c --- .../tst_qdeclarativesqldatabase.cpp | 18 ++++++++---------- .../auto/declarative/qsgtextinput/tst_qsgtextinput.cpp | 6 ++---- 2 files changed, 10 insertions(+), 14 deletions(-) (limited to 'tests') diff --git a/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp index 54c26a80be..330bd4fdf2 100644 --- a/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp +++ b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp @@ -95,16 +95,6 @@ private: QDeclarativeEngine *engine; }; -/* -class QWebPageWithJavaScriptConsoleMessages : public QWebPage { -public: - void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID) - { - qWarning() << sourceID << ":" << lineNumber << ":" << message; - } -}; -*/ - void removeRecursive(const QString& dirname) { QDir dir(dirname); @@ -170,6 +160,14 @@ void tst_qdeclarativesqldatabase::testQml_data() } /* +class QWebPageWithJavaScriptConsoleMessages : public QWebPage { +public: + void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID) + { + qWarning() << sourceID << ":" << lineNumber << ":" << message; + } +}; + void tst_qdeclarativesqldatabase::validateAgainstWebkit() { // Validates tests against WebKit (HTML5) support. diff --git a/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp b/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp index 16d478caa0..cbe14a5563 100644 --- a/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp +++ b/tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp @@ -1607,12 +1607,10 @@ void tst_qsgtextinput::passwordCharacter() QVERIFY(textInput != 0); textInput->setPasswordCharacter("X"); - QSize contentsSize = textInput->contentsSize(); qreal implicitWidth = textInput->implicitWidth(); textInput->setPasswordCharacter("."); // QTBUG-12383 content is updated and redrawn - QVERIFY(contentsSize != textInput->contentsSize()); QVERIFY(textInput->implicitWidth() < implicitWidth); delete textInput; @@ -2093,10 +2091,10 @@ public: { nbPaint = 0; } - void paint(QPainter *painter) + virtual QSGNode *updatePaintNode(QSGNode *node, UpdatePaintNodeData *data) { nbPaint++; - QSGTextInput::paint(painter); + return QSGTextInput::updatePaintNode(node, data); } int nbPaint; }; -- cgit v1.2.3