Uncomment some tests which accidently got commented

With SHA1 47b3ecf3f4 some tests got
commented out by accident. This re-enables those tests.

Change-Id: If9c7d8a672b66086895a0383fe87d3101fb146fb
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
This commit is contained in:
Andy Shaw 2014-08-07 10:05:16 +02:00
parent 50c418b61d
commit 866c8bc5e3

View File

@ -147,7 +147,7 @@ tst_QStyleSheetStyle::~tst_QStyleSheetStyle()
void tst_QStyleSheetStyle::numinstances()
{
/*QWidget w;
QWidget w;
w.resize(200, 200);
centerOnScreen(&w);
QCommonStyle *style = new QCommonStyle;
@ -180,7 +180,7 @@ void tst_QStyleSheetStyle::numinstances()
c.setStyle(style);
QCOMPARE(QStyleSheetStyle::numinstances, 2);
w.setStyleSheet("");
QCOMPARE(QStyleSheetStyle::numinstances, 0);*/
QCOMPARE(QStyleSheetStyle::numinstances, 0);
}
void tst_QStyleSheetStyle::widgetsBeforeAppStyleSheet()
@ -351,7 +351,7 @@ void tst_QStyleSheetStyle::repolish()
void tst_QStyleSheetStyle::widgetStyle()
{
/*qApp->setStyleSheet("");
qApp->setStyleSheet("");
QWidget *window1 = new QWidget;
window1->setObjectName("window1");
@ -488,12 +488,12 @@ void tst_QStyleSheetStyle::widgetStyle()
delete widget2;
delete window2;
delete style1;
delete style2;*/
delete style2;
}
void tst_QStyleSheetStyle::appStyle()
{
/* qApp->setStyleSheet("");
qApp->setStyleSheet("");
// qApp style can never be 0
QVERIFY(QApplication::style() != 0);
QPointer<QStyle> style1 = QStyleFactory::create("Windows");
@ -531,7 +531,7 @@ void tst_QStyleSheetStyle::appStyle()
QVERIFY(qApp->style() == style1);
qApp->setStyleSheet("");
QVERIFY(qApp->style() == style1);*/
QVERIFY(qApp->style() == style1);
}
void tst_QStyleSheetStyle::dynamicProperty()