Improve QWidget autotest.
authorJason McDonald <jason.mcdonald@nokia.com>
Tue, 1 Nov 2011 03:48:33 +0000 (13:48 +1000)
committerQt by Nokia <qt-info@nokia.com>
Wed, 2 Nov 2011 01:22:16 +0000 (02:22 +0100)
Remove some "#if 1" directives and a line of debug code.

Change-Id: Ib34f5b65470a24ee499799525ffe0645ccc117fe
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp

index 3cd656d..d804b12 100644 (file)
@@ -9444,12 +9444,9 @@ void tst_QWidget::nativeChildFocus()
     QLineEdit *p2 = new QLineEdit;
     layout->addWidget(p1);
     layout->addWidget(p2);
-#if 1
     p1->setObjectName("p1");
     p2->setObjectName("p2");
-#endif
     w.show();
-#if 1
     w.activateWindow();
     p1->setFocus();
     p1->setAttribute(Qt::WA_NativeWindow);
@@ -9458,10 +9455,8 @@ void tst_QWidget::nativeChildFocus()
     QTest::qWaitForWindowShown(&w);
     QTest::qWait(10);
 
-    qDebug() << "checking active window:" << QApplication::activeWindow();
     QCOMPARE(QApplication::activeWindow(), &w);
     QCOMPARE(QApplication::focusWidget(), static_cast<QWidget*>(p1));
-#endif
 
     QTest::qWait(1000);
 }