6 files changed, 61 insertions, 11 deletions
diff --git a/tests/auto/qstringbuilder/scenario1.pro b/tests/auto/qstringbuilder/scenario1.pro
index 4ce7156..d72451c 100644
--- a/tests/auto/qstringbuilder/scenario1.pro
+++ b/tests/auto/qstringbuilder/scenario1.pro
@@ -3,6 +3,7 @@ load(qttest_p4)
 QT = core
 
 SOURCES  += scenario1.cpp
+HEADERS  += tst_qstringbuilder.h
 
 DEFINES += SCENARIO=1
 
diff --git a/tests/auto/qstringbuilder/scenario2.pro b/tests/auto/qstringbuilder/scenario2.pro
index 64c46e2..78e0c68 100644
--- a/tests/auto/qstringbuilder/scenario2.pro
+++ b/tests/auto/qstringbuilder/scenario2.pro
@@ -3,5 +3,6 @@ load(qttest_p4)
 QT = core
 
 SOURCES  += scenario2.cpp
+HEADERS  += tst_qstringbuilder.h
 
 DEFINES += SCENARIO=2
diff --git a/tests/auto/qstringbuilder/scenario3.pro b/tests/auto/qstringbuilder/scenario3.pro
index beedffd..7b9e5af 100644
--- a/tests/auto/qstringbuilder/scenario3.pro
+++ b/tests/auto/qstringbuilder/scenario3.pro
@@ -3,5 +3,6 @@ load(qttest_p4)
 QT = core
 
 SOURCES  += scenario3.cpp
+HEADERS  += tst_qstringbuilder.h
 
 DEFINES += SCENARIO=3
diff --git a/tests/auto/qstringbuilder/scenario4.pro b/tests/auto/qstringbuilder/scenario4.pro
index 1c45a70..1b62b25 100644
--- a/tests/auto/qstringbuilder/scenario4.pro
+++ b/tests/auto/qstringbuilder/scenario4.pro
@@ -3,5 +3,6 @@ load(qttest_p4)
 QT = core
 
 SOURCES  += scenario4.cpp
+HEADERS  += tst_qstringbuilder.h
 
 DEFINES += SCENARIO=4
diff --git a/tests/auto/qstringbuilder/tst_qstringbuilder.cpp b/tests/auto/qstringbuilder/tst_qstringbuilder.cpp
index 72889bc..ffe7739 100644
--- a/tests/auto/qstringbuilder/tst_qstringbuilder.cpp
+++ b/tests/auto/qstringbuilder/tst_qstringbuilder.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -86,20 +86,13 @@
 #endif
 
 #include <QtTest/QtTest>
+#include "tst_qstringbuilder.h"
 
 //TESTED_CLASS=QStringBuilder
 //TESTED_FILES=qstringbuilder.cpp
 
 #define LITERAL "some literal"
 
-class tst_QStringBuilder : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void scenario();
-};
-
 void tst_QStringBuilder::scenario()
 {
     QLatin1Literal l1literal(LITERAL);
@@ -138,5 +131,3 @@ void tst_QStringBuilder::scenario()
 }
 
 QTEST_APPLESS_MAIN(tst_QStringBuilder)
-
-#include "tst_qstringbuilder.moc"
diff --git a/tests/auto/qstringbuilder/tst_qstringbuilder.h b/tests/auto/qstringbuilder/tst_qstringbuilder.h
new file mode 100644
index 0000000..b7e7f5a
--- /dev/null
+++ b/tests/auto/qstringbuilder/tst_qstringbuilder.h
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TST_QSTRINGBUILDER_H
+#define TST_QSTRINGBUILDER_H
+
+#include <qobject.h>
+
+class tst_QStringBuilder : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void scenario();
+};
+
+#endif