summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/auto.pro10
-rw-r--r--tests/auto/compilerwarnings/data/test_cpp.txt69
-rw-r--r--tests/auto/guiapplauncher/README.txt2
-rw-r--r--tests/auto/guiapplauncher/demos.txt14
-rw-r--r--tests/auto/guiapplauncher/examples.txt99
-rw-r--r--tests/auto/headersclean/headersclean.pro7
-rw-r--r--tests/auto/headersclean/tst_headersclean.cpp79
-rw-r--r--tests/auto/host.pro4
-rw-r--r--tests/auto/maketestselftest/tst_maketestselftest.cpp3
-rw-r--r--tests/auto/qalgorithms/tst_qalgorithms.cpp2
-rw-r--r--tests/auto/qsidebar/qsidebar.pro2
-rw-r--r--tests/benchmarks/corelib/tools/qregexp/main.cpp12
-rw-r--r--tests/benchmarks/corelib/tools/qregexp/qregexp.pro7
-rw-r--r--tests/global/global.cfg12
14 files changed, 300 insertions, 22 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index c67724958e..02e8b5bebb 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -9,15 +9,5 @@ SUBDIRS += \
other.pro
!cross_compile: SUBDIRS += host.pro
-contains(QT_CONFIG, qt3support):!wince*: SUBDIRS += qt3support.pro
contains(QT_CONFIG, opengl): SUBDIRS += opengl.pro
-contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns.pro
unix:!embedded:contains(QT_CONFIG, dbus): SUBDIRS += dbus.pro
-contains(QT_CONFIG, script): SUBDIRS += script.pro
-contains(QT_CONFIG, webkit): SUBDIRS += webkit.pro
-contains(QT_CONFIG, multimedia): SUBDIRS += multimedia.pro
-contains(QT_CONFIG, phonon): SUBDIRS += phonon.pro
-contains(QT_CONFIG, svg): SUBDIRS += svg.pro
-contains(QT_CONFIG, declarative): SUBDIRS += declarative.pro
-!symbian SUBDIRS += help.pro
-
diff --git a/tests/auto/compilerwarnings/data/test_cpp.txt b/tests/auto/compilerwarnings/data/test_cpp.txt
new file mode 100644
index 0000000000..9b8d11c579
--- /dev/null
+++ b/tests/auto/compilerwarnings/data/test_cpp.txt
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** 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 Technology Preview License Agreement accompanying
+** this package.
+**
+** 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtCore/QtCore>
+#include <QtNetwork/QtNetwork>
+#include <QtXml/QtXml>
+#include <QtSql/QtSql>
+
+#ifndef QT_NO_GUI
+#include <QtGui/QtGui>
+#endif
+
+#ifndef QT_NO_OPENGL
+#include <QtOpenGL/QtOpenGL>
+#endif
+
+#include <QtTest/QtTest>
+
+#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX)
+#include <QtDBus/QtDBus>
+#endif
+
+#include <QtUiTools/QtUiTools>
+
+#ifndef Q_OS_MAC
+int main(int, char **)
+{
+ return 0;
+}
+#endif
diff --git a/tests/auto/guiapplauncher/README.txt b/tests/auto/guiapplauncher/README.txt
new file mode 100644
index 0000000000..d6ea4ef014
--- /dev/null
+++ b/tests/auto/guiapplauncher/README.txt
@@ -0,0 +1,2 @@
+The guiapplauncher from the qtqa repository uses the data in this
+directory to do its testing for this module.
diff --git a/tests/auto/guiapplauncher/demos.txt b/tests/auto/guiapplauncher/demos.txt
new file mode 100644
index 0000000000..2835f09477
--- /dev/null
+++ b/tests/auto/guiapplauncher/demos.txt
@@ -0,0 +1,14 @@
+"Affine Demo", "demos/affine", "affine", 0, -1
+"Books Demo", "demos/books", "books", 0, -1
+"Chip Demo", "demos/chip", "chip", 0, -1
+"Composition Demo", "demos/composition", "composition", 0, -1
+"Deform Demo", "demos/deform", "deform", 0, -1
+"Embeddeddialogs Demo", "demos/embeddeddialogs", "embeddeddialogs", 0, -1
+"Gradients Demo", "demos/gradients", "gradients", 0, -1
+"Interview Demo", "demos/interview", "interview", 0, -1
+"Mainwindow Demo", "demos/mainwindow", "mainwindow", 0, -1
+"PathStroke Demo", "demos/pathstroke", "pathstroke", 0, -1
+"Spreadsheet Demo", "demos/spreadsheet", "spreadsheet", 0, -1
+"Sub-Attac Demo", "demos/sub-attaq", "sub-attaq", 0, -1
+"TextEdit Demo", "demos/textedit", "textedit", 0, -1
+"Undo Demo", "demos/undo", "undo", 0, -1
diff --git a/tests/auto/guiapplauncher/examples.txt b/tests/auto/guiapplauncher/examples.txt
new file mode 100644
index 0000000000..fea7e543f0
--- /dev/null
+++ b/tests/auto/guiapplauncher/examples.txt
@@ -0,0 +1,99 @@
+"animation/animatedtiles Example", "examples/animation/animatedtiles", "animatedtiles", 0, -1
+"animation/appchooser Example", "examples/animation/appchooser", "appchooser", 10, -1
+"animation/easing Example", "examples/animation/easing", "easing", 10, -1
+"animation/moveblocks Example", "examples/animation/moveblocks", "moveblocks", 10, -1
+"animation/states Example", "examples/animation/states", "states", 10, -1
+"animation/stickman Example", "examples/animation/stickman", "stickman", 10, -1
+"designer/calculatorbuilder Example", "examples/designer/calculatorbuilder", "calculatorbuilder", 10, -1
+"dialogs/standarddialogs Example", "examples/dialogs/standarddialogs", "standarddialogs", 10, -1
+"draganddrop/dropsite Example", "examples/draganddrop/dropsite", "dropsite", 10, -1
+"draganddrop/fridgemagnets Example", "examples/draganddrop/fridgemagnets", "fridgemagnets", 10, -1
+"draganddrop/puzzle Example", "examples/draganddrop/puzzle", "puzzle", 10, -1
+"effects/blurpicker Example", "examples/effects/blurpicker", "blurpicker", 10, -1
+"effects/customshader Example", "examples/effects/customshader", "customshader", 10, -1
+"effects/fademessage Example", "examples/effects/fademessage", "fademessage", 10, -1
+"effects/lighting Example", "examples/effects/lighting", "lighting", 10, -1
+"graphicsview/anchorlayout Example", "examples/graphicsview/anchorlayout", "anchorlayout", 10, -1
+"graphicsview/basicgraphicslayouts Example", "examples/graphicsview/basicgraphicslayouts", "basicgraphicslayouts", 0, -1
+"graphicsview/collidingmice Example", "examples/graphicsview/collidingmice", "collidingmice", 10, -1
+"graphicsview/diagramscene Example", "examples/graphicsview/diagramscene", "diagramscene", 10, -1
+"graphicsview/dragdroprobot Example", "examples/graphicsview/dragdroprobot", "dragdroprobot", 10, -1
+"graphicsview/elasticnodes Example", "examples/graphicsview/elasticnodes", "elasticnodes", 10, -1
+"graphicsview/flowlayout Example", "examples/graphicsview/flowlayout", "flowlayout", 10, -1
+"graphicsview/padnavigator Example", "examples/graphicsview/padnavigator", "padnavigator", 0, -1
+"graphicsview/portedasteroids Example", "examples/graphicsview/portedasteroids", "portedasteroids", 10, -1
+"graphicsview/portedcanvas Example", "examples/graphicsview/portedcanvas", "portedcanvas", 10, -1
+"graphicsview/weatheranchorlayout Example", "examples/graphicsview/weatheranchorlayout", "weatheranchorlayout", 10, -1
+"itemviews/addressbook Example", "examples/itemviews/addressbook", "addressbook", 0, -1
+"itemviews/basicsortfiltermodel Example", "examples/itemviews/basicsortfiltermodel", "basicsortfiltermodel", 10, -1
+"itemviews/chart Example", "examples/itemviews/chart", "chart", 0, -1
+"itemviews/coloreditorfactory Example", "examples/itemviews/coloreditorfactory", "coloreditorfactory", 10, -1
+"itemviews/combowidgetmapper Example", "examples/itemviews/combowidgetmapper", "combowidgetmapper", 6, -1
+"itemviews/customsortfiltermodel Example", "examples/itemviews/customsortfiltermodel", "customsortfiltermodel", 6, -1
+"itemviews/dirview Example", "examples/itemviews/dirview", "dirview", 0, -1
+"itemviews/editabletreemodel Example", "examples/itemviews/editabletreemodel", "editabletreemodel", 0, -1
+"itemviews/fetchmore Example", "examples/itemviews/fetchmore", "fetchmore", 10, -1
+"itemviews/frozencolumn Example", "examples/itemviews/frozencolumn", "frozencolumn", 10, -1
+"itemviews/pixelator Example", "examples/itemviews/pixelator", "pixelator", 10, -1
+"itemviews/puzzle Example", "examples/itemviews/puzzle", "puzzle", 10, -1
+"itemviews/simpledommodel Example", "examples/itemviews/simpledommodel", "simpledommodel", 10, -1
+"itemviews/simpletreemodel Example", "examples/itemviews/simpletreemodel", "simpletreemodel", 10, -1
+"itemviews/simplewidgetmapper Example", "examples/itemviews/simplewidgetmapper", "simplewidgetmapper", 10, -1
+"itemviews/spinboxdelegate Example", "examples/itemviews/spinboxdelegate", "spinboxdelegate", 0, -1
+"itemviews/stardelegate Example", "examples/itemviews/stardelegate", "stardelegate", 10, -1
+"layouts/basiclayouts Example", "examples/layouts/basiclayouts", "basiclayouts", 0, -1
+"layouts/borderlayout Example", "examples/layouts/borderlayout", "borderlayout", 10, -1
+"layouts/dynamiclayouts Example", "examples/layouts/dynamiclayouts", "dynamiclayouts", 10, -1
+"layouts/flowlayout Example", "examples/layouts/flowlayout", "flowlayout", 10, -1
+"mainwindows/application Example", "examples/mainwindows/application", "application", 6, -1
+"mainwindows/dockwidgets Example", "examples/mainwindows/dockwidgets", "dockwidgets", 0, -1
+"mainwindows/mdi Example", "examples/mainwindows/mdi", "mdi", 0, -1
+"mainwindows/menus Example", "examples/mainwindows/menus", "menus", 10, -1
+"mainwindows/recentfiles Example", "examples/mainwindows/recentfiles", "recentfiles", 10, -1
+"mainwindows/sdi Example", "examples/mainwindows/sdi", "sdi", 10, -1
+"touch/dials Example", "examples/touch/dials", "dials", 10, -1
+"touch/fingerpaint Example", "examples/touch/fingerpaint", "fingerpaint", 10, -1
+"touch/knobs Example", "examples/touch/knobs", "knobs", 10, -1
+"touch/pinchzoom Example", "examples/touch/pinchzoom", "pinchzoom", 10, -1
+"opengl/2dpainting Example", "examples/opengl/2dpainting", "2dpainting", 10, -1
+"opengl/grabber Example", "examples/opengl/grabber", "grabber", 10, -1
+"opengl/hellogl Example", "examples/opengl/hellogl", "hellogl", 10, -1
+"opengl/overpainting Example", "examples/opengl/overpainting", "overpainting", 10, -1
+"opengl/samplebuffers Example", "examples/opengl/samplebuffers", "samplebuffers", 10, -1
+"opengl/textures Example", "examples/opengl/textures", "textures", 10, -1
+"painting/basicdrawing Example", "examples/painting/basicdrawing", "basicdrawing", 10, -1
+"painting/concentriccircles Example", "examples/painting/concentriccircles", "concentriccircles", 0, -1
+"painting/fontsampler Example", "examples/painting/fontsampler", "fontsampler", 0, -1
+"painting/imagecomposition Example", "examples/painting/imagecomposition", "imagecomposition", 10, -1
+"painting/painterpaths Example", "examples/painting/painterpaths", "painterpaths", 10, -1
+"painting/transformations Example", "examples/painting/transformations", "transformations", 0, -1
+"qtconcurrent/imagescaling Example", "examples/qtconcurrent/imagescaling", "imagescaling", 10, -1
+"richtext/calendar Example", "examples/richtext/calendar", "calendar", 0, -1
+"richtext/orderform Example", "examples/richtext/orderform", "orderform", 10, -1
+"richtext/syntaxhighlighter Example", "examples/richtext/syntaxhighlighter", "syntaxhighlighter", 0, -1
+"richtext/textobject Example", "examples/richtext/textobject", "textobject", 10, -1
+"statemachine/eventtransitions Example", "examples/statemachine/eventtransitions", "eventtransitions", 10, -1
+"statemachine/rogue Example", "examples/statemachine/rogue", "rogue", 10, -1
+"statemachine/trafficlight Example", "examples/statemachine/trafficlight", "trafficlight", 0, -1
+"statemachine/twowaybutton Example", "examples/statemachine/twowaybutton", "twowaybutton", 10, -1
+"tutorials/addressbook/part7 Example", "examples/tutorials/addressbook/part7", "part7", 0, -1
+"widgets/analogclock Example", "examples/widgets/analogclock", "analogclock", 6, -1
+"widgets/calculator Example", "examples/widgets/calculator", "calculator", 6, -1
+"widgets/calendarwidget Example", "examples/widgets/calendarwidget", "calendarwidget", 10, -1
+"widgets/charactermap Example", "examples/widgets/charactermap", "charactermap", 10, -1
+"widgets/codeeditor Example", "examples/widgets/codeeditor", "codeeditor", 0, -1
+"widgets/digitalclock Example", "examples/widgets/digitalclock", "digitalclock", 10, -1
+"widgets/groupbox Example", "examples/widgets/groupbox", "groupbox", 10, -1
+"widgets/icons Example", "examples/widgets/icons", "icons", 10, -1
+"widgets/imageviewer Example", "examples/widgets/imageviewer", "imageviewer", 10, -1
+"widgets/lineedits Example", "examples/widgets/lineedits", "lineedits", 10, -1
+"widgets/scribble Example", "examples/widgets/scribble", "scribble", 10, -1
+"widgets/sliders Example", "examples/widgets/sliders", "sliders", 10, -1
+"widgets/spinboxes Example", "examples/widgets/spinboxes", "spinboxes", 10, -1
+"widgets/styles Example", "examples/widgets/styles", "styles", 0, -1
+"widgets/stylesheet Example", "examples/widgets/stylesheet", "stylesheet", 0, -1
+"widgets/tablet Example", "examples/widgets/tablet", "tablet", 10, -1
+"widgets/tetrix Example", "examples/widgets/tetrix", "tetrix", 0, -1
+"widgets/tooltips Example", "examples/widgets/tooltips", "tooltips", 10, -1
+"widgets/validators Example", "examples/widgets/validators", "validators", 10, -1
+"widgets/wiggly Example", "examples/widgets/wiggly", "wiggly", 10, -1
diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro
new file mode 100644
index 0000000000..d9b6ae3e2a
--- /dev/null
+++ b/tests/auto/headersclean/headersclean.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+SOURCES += tst_headersclean.cpp
+QT = core network xml sql uitools
+
+contains(QT_CONFIG,dbus): QT += dbus
+contains(QT_CONFIG,opengl): QT += opengl
+contains(QT_CONFIG,openvg): QT += openvg \ No newline at end of file
diff --git a/tests/auto/headersclean/tst_headersclean.cpp b/tests/auto/headersclean/tst_headersclean.cpp
new file mode 100644
index 0000000000..fbe68f543c
--- /dev/null
+++ b/tests/auto/headersclean/tst_headersclean.cpp
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** 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 Technology Preview License Agreement accompanying
+** this package.
+**
+** 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#define QT_NO_KEYWORDS
+#define signals int
+#define slots int
+#define emit public:;
+#define foreach public:;
+#define forever public:;
+
+#include <QtCore/QtCore>
+#include <QtTest/QtTest>
+
+#include <QtNetwork/QtNetwork>
+#include <QtXml/QtXml>
+#include <QtSql/QtSql>
+#include <QtGui/QtGui>
+
+#include <QtUiTools/QtUiTools>
+
+#ifndef QT_NO_OPENGL
+#include <QtOpenGL/QtOpenGL>
+#endif
+
+#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX)
+#include <QtDBus/QtDBus>
+#endif
+
+#ifndef QT_NO_OPENVG
+#include <QtOpenVG/QtOpenVG>
+#endif
+
+class tst_HeadersClean: public QObject
+{
+ Q_OBJECT
+public:
+ tst_HeadersClean() {}
+};
+
+QTEST_MAIN(tst_HeadersClean)
+#include "tst_headersclean.moc" \ No newline at end of file
diff --git a/tests/auto/host.pro b/tests/auto/host.pro
index 3ae6a7a09e..44216ae101 100644
--- a/tests/auto/host.pro
+++ b/tests/auto/host.pro
@@ -1,7 +1,7 @@
TEMPLATE=subdirs
SUBDIRS=\
compiler \
- linguist \
+ headersclean \
maketestselftest \
moc \
uic \
@@ -10,5 +10,5 @@ SUBDIRS=\
#atwrapper \ # These tests need significant updating,
#uiloader \ # they have hardcoded machine names etc.
-contains(QT_CONFIG,qt3support):SUBDIRS+=uic3
+#contains(QT_CONFIG,qt3support):SUBDIRS+=uic3
diff --git a/tests/auto/maketestselftest/tst_maketestselftest.cpp b/tests/auto/maketestselftest/tst_maketestselftest.cpp
index 8ed8cb88d0..9fbfd5a2c6 100644
--- a/tests/auto/maketestselftest/tst_maketestselftest.cpp
+++ b/tests/auto/maketestselftest/tst_maketestselftest.cpp
@@ -148,7 +148,8 @@ void tst_MakeTestSelfTest::tests_pro_files_data()
foreach (const QString& subdir, subdirs) {
if (subdir == QString::fromLatin1("tmp")
- || subdir.startsWith("."))
+ || subdir.startsWith(".")
+ || !dir.exists(subdir + "/" + subdir + ".pro"))
{
continue;
}
diff --git a/tests/auto/qalgorithms/tst_qalgorithms.cpp b/tests/auto/qalgorithms/tst_qalgorithms.cpp
index 8dd7cbcc28..d0d8e9aead 100644
--- a/tests/auto/qalgorithms/tst_qalgorithms.cpp
+++ b/tests/auto/qalgorithms/tst_qalgorithms.cpp
@@ -47,7 +47,7 @@
#include <sstream>
#include <algorithm>
#include <qalgorithms.h>
-#include "../../../src/qt3support/tools/q3tl.h"
+#include "q3tl.h"
#include <QStringList>
#include <QString>
#include <QVector>
diff --git a/tests/auto/qsidebar/qsidebar.pro b/tests/auto/qsidebar/qsidebar.pro
index b1fba732c8..91a2137f2c 100644
--- a/tests/auto/qsidebar/qsidebar.pro
+++ b/tests/auto/qsidebar/qsidebar.pro
@@ -1,7 +1,5 @@
CONFIG += qttest_p4
-include(../../src/qfiledialog.pri)
-
SOURCES += tst_qsidebar.cpp
TARGET = tst_qsidebar
diff --git a/tests/benchmarks/corelib/tools/qregexp/main.cpp b/tests/benchmarks/corelib/tools/qregexp/main.cpp
index 98d539f21a..74f9e63ace 100644
--- a/tests/benchmarks/corelib/tools/qregexp/main.cpp
+++ b/tests/benchmarks/corelib/tools/qregexp/main.cpp
@@ -49,9 +49,10 @@
#include <boost/regex.hpp>
#endif
+#ifdef HAVE_JSC
#include <QtScript>
#include "pcre/pcre.h"
-
+#endif
#define ZLIB_VERSION "1.2.3.4"
class tst_qregexp : public QObject
@@ -82,9 +83,11 @@ private slots:
void rangeReplace2();
void matchReplace2();
+#ifdef HAVE_JSC
void simpleFindJSC();
void rangeReplaceJSC();
void matchReplaceJSC();
+#endif
#ifdef HAVE_BOOST
void simpleFindBoost();
@@ -100,8 +103,10 @@ private slots:
void horribleReplace1();
void horribleReplace2();
void horribleWrongReplace2();
+#ifdef HAVE_JSC
void horribleWrongReplaceJSC();
void horribleReplaceJSC();
+#endif
#ifdef HAVE_BOOST
void horribleWrongReplaceBoost();
void horribleReplaceBoost();
@@ -454,8 +459,7 @@ void tst_qregexp::horribleReplace2()
}
QCOMPARE(r, QString("1.2.3"));
}
-
-
+#ifdef HAVE_JSC
void tst_qregexp::simpleFindJSC()
{
int numr;
@@ -525,7 +529,7 @@ void tst_qregexp::horribleReplaceJSC()
}
QCOMPARE(r.toString(), QString("1.2.3"));
}
-
+#endif
#ifdef HAVE_BOOST
void tst_qregexp::simpleFindBoost(){
diff --git a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro
index ffdad12cef..5e53824a96 100644
--- a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro
+++ b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro
@@ -5,14 +5,17 @@ DEPENDPATH += .
INCLUDEPATH += .
RESOURCES+=qregexp.qrc
QT -= gui
-QT += script
CONFIG += release
# Input
SOURCES += main.cpp
-include( $${QT_SOURCE_TREE}/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri )
+!isEmpty(QT.webkit.sources):exists($${QT.webkit.sources}/../JavaScriptCore/JavaScriptCore.pri) {
+ include( $${QT.webkit.sources}/../JavaScriptCore/JavaScriptCore.pri )
+ DEFINES += HAVE_JSC
+ QT += script
+}
exists( /usr/include/boost/regex.hpp ){
DEFINES+=HAVE_BOOST
diff --git a/tests/global/global.cfg b/tests/global/global.cfg
new file mode 100644
index 0000000000..f39f4a0cfd
--- /dev/null
+++ b/tests/global/global.cfg
@@ -0,0 +1,12 @@
+<config>
+<modules>
+<module name="QtCore" qtname="core"/>
+<module name="QtDBus" qtname="dbus"/>
+<module name="QtGui" qtname="gui"/>
+<module name="QtNetwork" qtname="network"/>
+<module name="QtOpenGL" qtname="opengl"/>
+<module name="QtTest" qtname="testlib"/>
+<module name="QtXml" qtname="xml"/>
+<module name="QtSql" qtname="sql"/>
+</modules>
+</config>