--- a/tests/auto/qstyle/tst_qstyle.cpp	Tue Feb 02 00:43:10 2010 +0200
+++ b/tests/auto/qstyle/tst_qstyle.cpp	Wed Mar 31 11:06:36 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -52,6 +52,7 @@
 #include <qstyleoption.h>
 #include <qscrollbar.h>
 #include <qprogressbar.h>
+#include <qtoolbutton.h>
 
 #include <qplastiquestyle.h>
 #include <qwindowsstyle.h>
@@ -445,6 +446,8 @@
 
     if (QSysInfo::WindowsVersion == QSysInfo::WV_VISTA)
         testPainting(&vistastyle, "vista");
+    else if (QSysInfo::WindowsVersion == QSysInfo::WV_XP)
+        testPainting(&vistastyle, "xp");
 #endif
 }
 
@@ -460,6 +463,7 @@
 
 void tst_QStyle::testPainting(QStyle *style, const QString &platform)
 {
+qDebug("TEST PAINTING");
     //Test Menu
     QString fileName = "images/" + platform + "/menu.png";
     QMenu menu;
@@ -538,6 +542,19 @@
     pixmap = QPixmap::grabWidget(&mdiArea);
     mdiArea.hide();
     comparePixmap(fileName, pixmap);
+
+    // QToolButton
+    fileName = "images/" + platform + "/toolbutton.png";
+    QToolButton tb;
+    tb.setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+    tb.setText("AaQqPpXx");
+    tb.setIcon(style->standardPixmap(QStyle::SP_DirHomeIcon));
+    tb.setStyle(style);
+    tb.show();
+    pixmap = QPixmap::grabWidget(&tb);
+    tb.hide();
+    comparePixmap(fileName, pixmap);
+
 }
 
 void tst_QStyle::testMacStyle()