From a6ed9f9a03817adc598fd61adeda08f17a504ea3 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 11 Aug 2009 15:06:10 +0300 Subject: Fixed qline autotest merge, tst_qline.cpp was added twice to SOURCES. --- tests/auto/qline/qline.pro | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/auto/qline/qline.pro b/tests/auto/qline/qline.pro index 715774a..1a3d7f2 100644 --- a/tests/auto/qline/qline.pro +++ b/tests/auto/qline/qline.pro @@ -1,5 +1,4 @@ load(qttest_p4) -SOURCES += tst_qline.cpp QT -= gui SOURCES += tst_qline.cpp unix:!mac:!symbian*:!vxworks:LIBS+=-lm -- cgit v0.12 From 8f10c91b2fc5ccc2ffaca64db2fbb7e009bd5ae4 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 11 Aug 2009 15:12:07 +0300 Subject: Fixed qlocale autotest compile error for Symbian. --- tests/auto/qlocale/tst_qlocale.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qlocale/tst_qlocale.cpp b/tests/auto/qlocale/tst_qlocale.cpp index 6301d40..1d7e67d 100644 --- a/tests/auto/qlocale/tst_qlocale.cpp +++ b/tests/auto/qlocale/tst_qlocale.cpp @@ -2042,7 +2042,7 @@ void tst_QLocale::symbianSystemLocale() TBuf<50> s60FormattedDate; TRAPD(err, s60Date.FormatL(s60FormattedDate, s60DateFormat)); QVERIFY(err == KErrNone); - QString s60FinalResult = qt_TDes2QStringL(s60FormattedDate); + QString s60FinalResult = qt_TDesC2QString(s60FormattedDate); QString finalResult = date.toString(dateFormat); QCOMPARE(finalResult, s60FinalResult); -- cgit v0.12 From 05b9ac1574ec8333d4b156973766d995b6a9b1e4 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 11 Aug 2009 16:06:56 +0300 Subject: Fixed qstatemachine autotest compilaton for Symbian OS. Apparently Nokia X86 compiler is not able to use templated qCompare when given arguments have different different type but same base class. This error should be isolated and reported to Nokia X86 team. See task: 259508 --- tests/auto/qstatemachine/tst_qstatemachine.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/tst_qstatemachine.cpp index 41347eb..3add362 100644 --- a/tests/auto/qstatemachine/tst_qstatemachine.cpp +++ b/tests/auto/qstatemachine/tst_qstatemachine.cpp @@ -274,7 +274,7 @@ void tst_QStateMachine::transitionToRootState() QAbstractTransition *trans = initialState->addTransition(new EventTransition(QEvent::User, &machine)); QVERIFY(trans != 0); QCOMPARE(trans->sourceState(), initialState); - QCOMPARE(trans->targetState(), &machine); + QCOMPARE(trans->targetState(), static_cast(&machine)); machine.start(); QCoreApplication::processEvents(); @@ -295,9 +295,9 @@ void tst_QStateMachine::transitionFromRootState() QState *root = &machine; QState *s1 = new QState(root); EventTransition *trans = new EventTransition(QEvent::User, s1); - QCOMPARE(root->addTransition(trans), trans); + QCOMPARE(root->addTransition(trans), static_cast(trans)); QCOMPARE(trans->sourceState(), root); - QCOMPARE(trans->targetState(), s1); + QCOMPARE(trans->targetState(), static_cast(s1)); } void tst_QStateMachine::transitionEntersParent() @@ -1024,11 +1024,11 @@ void tst_QStateMachine::rootState() QCOMPARE(machine.machine(), (QStateMachine*)0); QState *s1 = new QState(&machine); - QCOMPARE(s1->parentState(), &machine); + QCOMPARE(s1->parentState(), static_cast(&machine)); QState *s2 = new QState(); s2->setParent(&machine); - QCOMPARE(s2->parentState(), &machine); + QCOMPARE(s2->parentState(), static_cast(&machine)); } void tst_QStateMachine::addAndRemoveState() @@ -1045,8 +1045,8 @@ void tst_QStateMachine::addAndRemoveState() QCOMPARE(s1->parentState(), (QState*)0); QCOMPARE(s1->machine(), (QStateMachine*)0); machine.addState(s1); - QCOMPARE(s1->machine(), &machine); - QCOMPARE(s1->parentState(), &machine); + QCOMPARE(s1->machine(), static_cast(&machine)); + QCOMPARE(s1->parentState(), static_cast(&machine)); QCOMPARE(root_d->childStates().size(), 1); QCOMPARE(root_d->childStates().at(0), (QAbstractState*)s1); @@ -1056,7 +1056,7 @@ void tst_QStateMachine::addAndRemoveState() QState *s2 = new QState(); QCOMPARE(s2->parentState(), (QState*)0); machine.addState(s2); - QCOMPARE(s2->parentState(), &machine); + QCOMPARE(s2->parentState(), static_cast(&machine)); QCOMPARE(root_d->childStates().size(), 2); QCOMPARE(root_d->childStates().at(0), (QAbstractState*)s1); QCOMPARE(root_d->childStates().at(1), (QAbstractState*)s2); -- cgit v0.12 From 06f5b06d05cd994f22cf2e3bce5c4a5e7560fd19 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 11 Aug 2009 16:21:49 +0300 Subject: Fixed qtextstream autotest for Symbian --- tests/auto/qtextstream/test/test.pro | 8 ++++++-- tests/auto/qtextstream/tst_qtextstream.cpp | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/auto/qtextstream/test/test.pro b/tests/auto/qtextstream/test/test.pro index 973c011..9f117d5 100644 --- a/tests/auto/qtextstream/test/test.pro +++ b/tests/auto/qtextstream/test/test.pro @@ -26,11 +26,15 @@ wince*|symbian: { } wince*: { - DEFINES += SRCDIR=\\\"\\\" + DEFINES += SRCDIR=\\\"\\\" }else:symbian { + load(data_caging_paths) # Symbian can't define SRCDIR meaningfully here + codecs_plugins.sources = qcncodecs.dll qjpcodecs.dll qtwcodecs.dll qkrcodecs.dll + codecs_plugins.path = $$QT_PLUGINS_BASE_DIR/codecs + DEPLOYMENT += codecs_plugins }else { - DEFINES += SRCDIR=\\\"$$PWD/../\\\" + DEFINES += SRCDIR=\\\"$$PWD/../\\\" } diff --git a/tests/auto/qtextstream/tst_qtextstream.cpp b/tests/auto/qtextstream/tst_qtextstream.cpp index d8dd618..757bbce 100644 --- a/tests/auto/qtextstream/tst_qtextstream.cpp +++ b/tests/auto/qtextstream/tst_qtextstream.cpp @@ -473,6 +473,8 @@ tst_QTextStream::tst_QTextStream() inBuffer = 0; inString = 0; file_is_empty = FALSE; + + Q_SET_DEFAULT_IAP } tst_QTextStream::~tst_QTextStream() -- cgit v0.12 From 5c5310803f34c8fcf3aee6b7bb5c2bc6caf3107c Mon Sep 17 00:00:00 2001 From: Frans Englich Date: Tue, 11 Aug 2009 15:37:22 +0200 Subject: Prevent unnecessary repaints when moving with zero distance in moveRect(). This path is triggered from the layout system on S60. Reported by Nokia/Dallas' multimedia team. We haven't yet figured out a way to trigger this through auto test. Reviewed-by: Paul --- src/gui/painting/qbackingstore.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp index 40c9bf2..0b34c56 100644 --- a/src/gui/painting/qbackingstore.cpp +++ b/src/gui/painting/qbackingstore.cpp @@ -847,7 +847,7 @@ QWidgetBackingStore::~QWidgetBackingStore() void QWidgetPrivate::moveRect(const QRect &rect, int dx, int dy) { Q_Q(QWidget); - if (!q->isVisible()) + if (!q->isVisible() || (dx == 0 && dy == 0)) return; QWidget *tlw = q->window(); -- cgit v0.12