summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-12 08:18:07 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-12 08:18:07 (GMT)
commit76c0bc4f95fce3c5fd9f77b778180d1b50b2b095 (patch)
treed0946e2e59eb9543d787fc7f8ef36b1af58a748d /tests
parent5393499e4500ca7038ab6e95453cff89eface2f3 (diff)
parent72ac56cd49c3c50b8b293b0f9843bafa8e197fcd (diff)
downloadQt-76c0bc4f95fce3c5fd9f77b778180d1b50b2b095.zip
Qt-76c0bc4f95fce3c5fd9f77b778180d1b50b2b095.tar.gz
Qt-76c0bc4f95fce3c5fd9f77b778180d1b50b2b095.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: HotFix for fluidlauncher default size caused by 6d44dadd. Removed compiler warning from qdesktopwidget_s60.cpp.
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qwidget/tst_qwidget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 65f4945..76e20b9 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -10043,8 +10043,8 @@ void tst_QWidget::taskQTBUG_7532_tabOrderWithFocusProxy()
void tst_QWidget::movedAndResizedAttributes()
{
-#if defined (Q_OS_MAC) || defined(Q_WS_QWS)
- QEXPECT_FAIL("", "FixMe, QTBUG-8941", Abort);
+#if defined (Q_OS_MAC) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+ QEXPECT_FAIL("", "FixMe, QTBUG-8941 and QTBUG-8977", Abort);
QVERIFY(false);
#else
QWidget w;