summaryrefslogtreecommitdiff
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro26
-rw-r--r--tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro22
-rw-r--r--tests/auto/qhelpenginecore/qhelpenginecore.pro27
-rw-r--r--tests/auto/qhelpenginecore/tst_qhelpenginecore.pro23
-rw-r--r--tests/auto/qhelpgenerator/qhelpgenerator.pro15
-rw-r--r--tests/auto/qhelpgenerator/tst_qhelpgenerator.pro9
-rw-r--r--tests/auto/qhelpindexmodel/qhelpindexmodel.pro15
-rw-r--r--tests/auto/qhelpindexmodel/tst_qhelpindexmodel.pro9
-rw-r--r--tests/auto/qhelpprojectdata/qhelpprojectdata.pro13
-rw-r--r--tests/auto/qhelpprojectdata/tst_qhelpprojectdata.pro9
10 files changed, 59 insertions, 109 deletions
diff --git a/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro b/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro
index 79bb44c799..889aac9728 100644
--- a/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro
+++ b/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro
@@ -1,10 +1,22 @@
-TEMPLATE = subdirs
-CONFIG += ordered
+load(qttest_p4)
+SOURCES += tst_qhelpcontentmodel.cpp
-contains(QT_BUILD_PARTS, tools): {
- SUBDIRS += ../../../tools/assistant/lib/fulltextsearch \
- ../../../tools/assistant/lib
-}
+CONFIG += help
-SUBDIRS += tst_qhelpcontentmodel.pro
+DEFINES += QT_USE_USING_NAMESPACE
+!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
+wince*: {
+ DEFINES += SRCDIR=\\\"./\\\"
+ QT += network
+ addFiles.sources = $$PWD/data/*.*
+ addFiles.path = data
+ clucene.sources = $$QT_BUILD_TREE/lib/QtCLucene*.dll
+
+ DEPLOYMENT += addFiles
+ DEPLOYMENT += clucene
+
+ DEPLOYMENT_PLUGIN += qsqlite
+} else {
+ DEFINES += SRCDIR=\\\"$$PWD\\\"
+} \ No newline at end of file
diff --git a/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro b/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro
deleted file mode 100644
index 889aac9728..0000000000
--- a/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro
+++ /dev/null
@@ -1,22 +0,0 @@
-load(qttest_p4)
-SOURCES += tst_qhelpcontentmodel.cpp
-
-CONFIG += help
-
-DEFINES += QT_USE_USING_NAMESPACE
-!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
-
-wince*: {
- DEFINES += SRCDIR=\\\"./\\\"
- QT += network
- addFiles.sources = $$PWD/data/*.*
- addFiles.path = data
- clucene.sources = $$QT_BUILD_TREE/lib/QtCLucene*.dll
-
- DEPLOYMENT += addFiles
- DEPLOYMENT += clucene
-
- DEPLOYMENT_PLUGIN += qsqlite
-} else {
- DEFINES += SRCDIR=\\\"$$PWD\\\"
-} \ No newline at end of file
diff --git a/tests/auto/qhelpenginecore/qhelpenginecore.pro b/tests/auto/qhelpenginecore/qhelpenginecore.pro
index ee9b0c4452..27ebd0fc45 100644
--- a/tests/auto/qhelpenginecore/qhelpenginecore.pro
+++ b/tests/auto/qhelpenginecore/qhelpenginecore.pro
@@ -1,10 +1,23 @@
-TEMPLATE = subdirs
-CONFIG += ordered
+load(qttest_p4)
+SOURCES += tst_qhelpenginecore.cpp
+CONFIG += help
+QT += sql
-contains(QT_BUILD_PARTS, tools): {
- SUBDIRS += ../../../tools/assistant/lib/fulltextsearch \
- ../../../tools/assistant/lib
-}
-SUBDIRS += tst_qhelpenginecore.pro
+DEFINES += QT_USE_USING_NAMESPACE
+!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
+
+wince*: {
+ DEFINES += SRCDIR=\\\"./\\\"
+ QT += network
+ addFiles.sources = $$PWD/data/*.*
+ addFiles.path = data
+ clucene.sources = $$QT_BUILD_TREE/lib/QtCLucene*.dll
+ DEPLOYMENT += addFiles
+ DEPLOYMENT += clucene
+
+ DEPLOYMENT_PLUGIN += qsqlite
+} else {
+ DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
diff --git a/tests/auto/qhelpenginecore/tst_qhelpenginecore.pro b/tests/auto/qhelpenginecore/tst_qhelpenginecore.pro
deleted file mode 100644
index 27ebd0fc45..0000000000
--- a/tests/auto/qhelpenginecore/tst_qhelpenginecore.pro
+++ /dev/null
@@ -1,23 +0,0 @@
-load(qttest_p4)
-SOURCES += tst_qhelpenginecore.cpp
-CONFIG += help
-QT += sql
-
-
-DEFINES += QT_USE_USING_NAMESPACE
-!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
-
-wince*: {
- DEFINES += SRCDIR=\\\"./\\\"
- QT += network
- addFiles.sources = $$PWD/data/*.*
- addFiles.path = data
- clucene.sources = $$QT_BUILD_TREE/lib/QtCLucene*.dll
-
- DEPLOYMENT += addFiles
- DEPLOYMENT += clucene
-
- DEPLOYMENT_PLUGIN += qsqlite
-} else {
- DEFINES += SRCDIR=\\\"$$PWD\\\"
-}
diff --git a/tests/auto/qhelpgenerator/qhelpgenerator.pro b/tests/auto/qhelpgenerator/qhelpgenerator.pro
index efa1ef500d..b4b07dd410 100644
--- a/tests/auto/qhelpgenerator/qhelpgenerator.pro
+++ b/tests/auto/qhelpgenerator/qhelpgenerator.pro
@@ -1,10 +1,9 @@
-TEMPLATE = subdirs
-CONFIG += ordered
+load(qttest_p4)
-contains(QT_BUILD_PARTS, tools): {
- SUBDIRS += ../../../tools/assistant/lib/fulltextsearch \
- ../../../tools/assistant/lib
-}
-
-SUBDIRS += tst_qhelpgenerator.pro
+SOURCES += tst_qhelpgenerator.cpp
+CONFIG += help
+QT += sql
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+DEFINES += QT_USE_USING_NAMESPACE
+!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
diff --git a/tests/auto/qhelpgenerator/tst_qhelpgenerator.pro b/tests/auto/qhelpgenerator/tst_qhelpgenerator.pro
deleted file mode 100644
index b4b07dd410..0000000000
--- a/tests/auto/qhelpgenerator/tst_qhelpgenerator.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-load(qttest_p4)
-
-SOURCES += tst_qhelpgenerator.cpp
-CONFIG += help
-QT += sql
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-DEFINES += QT_USE_USING_NAMESPACE
-!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
diff --git a/tests/auto/qhelpindexmodel/qhelpindexmodel.pro b/tests/auto/qhelpindexmodel/qhelpindexmodel.pro
index 1325e09b7c..927c2e19ed 100644
--- a/tests/auto/qhelpindexmodel/qhelpindexmodel.pro
+++ b/tests/auto/qhelpindexmodel/qhelpindexmodel.pro
@@ -1,10 +1,9 @@
-TEMPLATE = subdirs
-CONFIG += ordered
+load(qttest_p4)
-contains(QT_BUILD_PARTS, tools): {
- SUBDIRS += ../../../tools/assistant/lib/fulltextsearch \
- ../../../tools/assistant/lib
-}
-
-SUBDIRS += tst_qhelpindexmodel.pro
+SOURCES += tst_qhelpindexmodel.cpp
+CONFIG += help
+QT += sql
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+DEFINES += QT_USE_USING_NAMESPACE
+!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
diff --git a/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.pro b/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.pro
deleted file mode 100644
index 927c2e19ed..0000000000
--- a/tests/auto/qhelpindexmodel/tst_qhelpindexmodel.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-load(qttest_p4)
-
-SOURCES += tst_qhelpindexmodel.cpp
-CONFIG += help
-QT += sql
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-DEFINES += QT_USE_USING_NAMESPACE
-!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
diff --git a/tests/auto/qhelpprojectdata/qhelpprojectdata.pro b/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
index 9617416155..92dc620e13 100644
--- a/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
+++ b/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
@@ -1,10 +1,9 @@
-TEMPLATE = subdirs
-CONFIG += ordered
+load(qttest_p4)
-contains(QT_BUILD_PARTS, tools): {
- SUBDIRS += ../../../tools/assistant/lib/fulltextsearch \
- ../../../tools/assistant/lib
-}
+SOURCES += tst_qhelpprojectdata.cpp
+CONFIG += help
-SUBDIRS += tst_qhelpprojectdata.pro
+DEFINES += SRCDIR=\\\"$$PWD\\\"
+DEFINES += QT_USE_USING_NAMESPACE
+!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
diff --git a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.pro b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.pro
deleted file mode 100644
index 92dc620e13..0000000000
--- a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-load(qttest_p4)
-
-SOURCES += tst_qhelpprojectdata.cpp
-CONFIG += help
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-DEFINES += QT_USE_USING_NAMESPACE
-!contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS
-