From 5c9f1751336a94542c31cf10c4055e4e5fc7ed8c Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Tue, 29 Apr 2014 13:42:37 +0200
Subject: [PATCH] qbs build: Make the autotest template available as an import.
Just like for QtcPlugin, QtcLibrary etc.
Change-Id: I395f5863f31abba589864be3ad41ad7fc893787f
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
---
tests/auto/autotest.qbs => qbs/imports/QtcAutotest.qbs | 0
tests/auto/aggregation/aggregation.qbs | 4 ++--
tests/auto/auto.qbs | 2 +-
tests/auto/changeset/changeset.qbs | 4 ++--
tests/auto/cplusplus/cplusplusautotest.qbs | 4 ++--
tests/auto/debugger/disassembler.qbs | 4 ++--
tests/auto/debugger/dumpers.qbs | 4 ++--
tests/auto/debugger/gdb.qbs | 4 ++--
tests/auto/debugger/namedemangler.qbs | 4 ++--
tests/auto/debugger/simplifytypes.qbs | 4 ++--
tests/auto/diff/differ/differ.qbs | 4 ++--
tests/auto/environment/environment.qbs | 4 ++--
tests/auto/extensionsystem/pluginmanager/test.qbs | 4 ++--
tests/auto/extensionsystem/pluginspec/test.qbs | 4 ++--
tests/auto/externaltool/externaltool.qbs | 4 ++--
tests/auto/filesearch/filesearch.qbs | 4 ++--
.../highlighterengine/highlighterengine.qbs | 4 ++--
tests/auto/generichighlighter/specificrules/specificrules.qbs | 4 ++--
tests/auto/ioutils/ioutils.qbs | 4 ++--
tests/auto/profilewriter/profilewriter.qbs | 4 ++--
tests/auto/qml/codemodel/check/check.qbs | 4 ++--
tests/auto/qml/persistenttrie/persistenttrie.qbs | 4 ++--
.../auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs | 4 ++--
tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs | 4 ++--
tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs | 4 ++--
tests/auto/qml/qrcparser/qrcparser.qbs | 4 ++--
tests/auto/qml/reformatter/reformatter.qbs | 4 ++--
tests/auto/qtcprocess/qtcprocess.qbs | 4 ++--
tests/auto/treeviewfind/treeviewfind.qbs | 4 ++--
.../utils/ansiescapecodehandler/ansiescapecodehandler.qbs | 4 ++--
tests/auto/utils/fileutils/fileutils.qbs | 4 ++--
tests/auto/utils_stringutils/utils_stringutils.qbs | 4 ++--
tests/auto/valgrind/memcheck/testapps/testapp.qbs | 4 ++--
tests/auto/valgrind/valgrindautotest.qbs | 4 ++--
34 files changed, 65 insertions(+), 65 deletions(-)
rename tests/auto/autotest.qbs => qbs/imports/QtcAutotest.qbs (100%)
diff --git a/tests/auto/autotest.qbs b/qbs/imports/QtcAutotest.qbs
similarity index 100%
rename from tests/auto/autotest.qbs
rename to qbs/imports/QtcAutotest.qbs
diff --git a/tests/auto/aggregation/aggregation.qbs b/tests/auto/aggregation/aggregation.qbs
index e1dc9c8fe1..e8945b95cf 100644
--- a/tests/auto/aggregation/aggregation.qbs
+++ b/tests/auto/aggregation/aggregation.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "Aggregation autotest"
Depends { name: "Aggregation" }
files: "tst_aggregate.cpp"
diff --git a/tests/auto/auto.qbs b/tests/auto/auto.qbs
index 07d8f63d23..b427ed710b 100644
--- a/tests/auto/auto.qbs
+++ b/tests/auto/auto.qbs
@@ -1,7 +1,7 @@
import qbs
Project {
- name: "Autotests"
+ name: "QtcAutotests"
condition: project.withAutotests
references: [
"aggregation/aggregation.qbs",
diff --git a/tests/auto/changeset/changeset.qbs b/tests/auto/changeset/changeset.qbs
index f1f8f00cf2..fe4e52aa9b 100644
--- a/tests/auto/changeset/changeset.qbs
+++ b/tests/auto/changeset/changeset.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "ChangeSet autotest"
Depends { name: "Utils" }
Depends { name: "Qt.gui" } // TODO: Remove once qbs bug is fixed.
diff --git a/tests/auto/cplusplus/cplusplusautotest.qbs b/tests/auto/cplusplus/cplusplusautotest.qbs
index 487f02128c..4c8c640db5 100644
--- a/tests/auto/cplusplus/cplusplusautotest.qbs
+++ b/tests/auto/cplusplus/cplusplusautotest.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
Depends { name: "CppTools" }
Depends { name: "TextEditor" }
Depends { name: "Utils" }
diff --git a/tests/auto/debugger/disassembler.qbs b/tests/auto/debugger/disassembler.qbs
index 94245181b1..b228c90d14 100644
--- a/tests/auto/debugger/disassembler.qbs
+++ b/tests/auto/debugger/disassembler.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "disassembler autotest"
Depends { name: "Qt.network" } // For QHostAddress
Group {
diff --git a/tests/auto/debugger/dumpers.qbs b/tests/auto/debugger/dumpers.qbs
index aa084b1ed6..2ca6226fbc 100644
--- a/tests/auto/debugger/dumpers.qbs
+++ b/tests/auto/debugger/dumpers.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "Debugger dumpers autotest"
Depends { name: "Utils" }
Depends { name: "Qt.network" } // For QHostAddress
diff --git a/tests/auto/debugger/gdb.qbs b/tests/auto/debugger/gdb.qbs
index 159729652a..3a202fc765 100644
--- a/tests/auto/debugger/gdb.qbs
+++ b/tests/auto/debugger/gdb.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "gdb autotest"
Depends { name: "Qt.network" } // For QHostAddress
Group {
diff --git a/tests/auto/debugger/namedemangler.qbs b/tests/auto/debugger/namedemangler.qbs
index c7e03a5cdd..252c17e28d 100644
--- a/tests/auto/debugger/namedemangler.qbs
+++ b/tests/auto/debugger/namedemangler.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "Name demangler autotest"
Group {
name: "Sources from Debugger plugin"
diff --git a/tests/auto/debugger/simplifytypes.qbs b/tests/auto/debugger/simplifytypes.qbs
index f766bbcf97..e81d5a42ff 100644
--- a/tests/auto/debugger/simplifytypes.qbs
+++ b/tests/auto/debugger/simplifytypes.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "simplifytypes autotest"
Depends { name: "Qt.network" } // For QHostAddress
Group {
diff --git a/tests/auto/diff/differ/differ.qbs b/tests/auto/diff/differ/differ.qbs
index 2f678a6e1f..c3edbdb9d6 100644
--- a/tests/auto/diff/differ/differ.qbs
+++ b/tests/auto/diff/differ/differ.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "Differ autotest"
Depends { name: "DiffEditor" }
Depends { name: "Qt.widgets" } // For QTextDocument
diff --git a/tests/auto/environment/environment.qbs b/tests/auto/environment/environment.qbs
index b169e290d8..71a8f79216 100644
--- a/tests/auto/environment/environment.qbs
+++ b/tests/auto/environment/environment.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "Environment autotest"
Depends { name: "Utils" }
Depends { name: "Qt.widgets" } // TODO: qbs bug, remove when fixed
diff --git a/tests/auto/extensionsystem/pluginmanager/test.qbs b/tests/auto/extensionsystem/pluginmanager/test.qbs
index b64f1ef712..cc930a49cf 100644
--- a/tests/auto/extensionsystem/pluginmanager/test.qbs
+++ b/tests/auto/extensionsystem/pluginmanager/test.qbs
@@ -1,8 +1,8 @@
import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
import "../copytransformer.qbs" as CopyTransformer
-Autotest {
+QtcAutotest {
name: "PluginManager autotest"
Depends { name: "Aggregation" }
Depends { name: "ExtensionSystem" }
diff --git a/tests/auto/extensionsystem/pluginspec/test.qbs b/tests/auto/extensionsystem/pluginspec/test.qbs
index 1fa1c8c420..e87698c333 100644
--- a/tests/auto/extensionsystem/pluginspec/test.qbs
+++ b/tests/auto/extensionsystem/pluginspec/test.qbs
@@ -1,9 +1,9 @@
import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
import "../copytransformer.qbs" as CopyTransformer
-Autotest {
+QtcAutotest {
name: "ExtensionSystem pluginspec autotest"
Depends { name: "Aggregation" }
Depends { name: "ExtensionSystem" }
diff --git a/tests/auto/externaltool/externaltool.qbs b/tests/auto/externaltool/externaltool.qbs
index 535e1f0b09..696d8a0ba7 100644
--- a/tests/auto/externaltool/externaltool.qbs
+++ b/tests/auto/externaltool/externaltool.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "ExternalTool autotest"
property path corePluginDir: project.ide_source_tree + "/src/plugins/coreplugin"
// TODO: This should be all that is needed here: Depends { name: "Core" }
diff --git a/tests/auto/filesearch/filesearch.qbs b/tests/auto/filesearch/filesearch.qbs
index 77c197aa03..41653c7458 100644
--- a/tests/auto/filesearch/filesearch.qbs
+++ b/tests/auto/filesearch/filesearch.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "File search autotest"
Depends { name: "Utils" }
Depends { name: "Qt.widgets" } // For QTextDocument
diff --git a/tests/auto/generichighlighter/highlighterengine/highlighterengine.qbs b/tests/auto/generichighlighter/highlighterengine/highlighterengine.qbs
index e09b3161b4..89d649fb2a 100644
--- a/tests/auto/generichighlighter/highlighterengine/highlighterengine.qbs
+++ b/tests/auto/generichighlighter/highlighterengine/highlighterengine.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "Highlighter engine autotest"
Depends { name: "Utils" }
Depends { name: "Qt.widgets" }
diff --git a/tests/auto/generichighlighter/specificrules/specificrules.qbs b/tests/auto/generichighlighter/specificrules/specificrules.qbs
index 9cc208b170..ad9c75312b 100644
--- a/tests/auto/generichighlighter/specificrules/specificrules.qbs
+++ b/tests/auto/generichighlighter/specificrules/specificrules.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "Generic highlighter specific rules autotest"
Depends { name: "Qt.widgets" }
Group {
diff --git a/tests/auto/ioutils/ioutils.qbs b/tests/auto/ioutils/ioutils.qbs
index e339e2cfa6..564ff59e08 100644
--- a/tests/auto/ioutils/ioutils.qbs
+++ b/tests/auto/ioutils/ioutils.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "IoUtils autotest"
Depends { name: "Qt.core" }
files: [
diff --git a/tests/auto/profilewriter/profilewriter.qbs b/tests/auto/profilewriter/profilewriter.qbs
index 6263fade36..17e40af20e 100644
--- a/tests/auto/profilewriter/profilewriter.qbs
+++ b/tests/auto/profilewriter/profilewriter.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "ProFileWriter autotest"
Depends { name: "Qt.xml" }
Group {
diff --git a/tests/auto/qml/codemodel/check/check.qbs b/tests/auto/qml/codemodel/check/check.qbs
index bd37ce8001..5e1cbf3cd2 100644
--- a/tests/auto/qml/codemodel/check/check.qbs
+++ b/tests/auto/qml/codemodel/check/check.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../../../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "QML code model check autotest"
Depends { name: "LanguageUtils" }
Depends { name: "QmlJS" }
diff --git a/tests/auto/qml/persistenttrie/persistenttrie.qbs b/tests/auto/qml/persistenttrie/persistenttrie.qbs
index 36181f04ea..561d699d06 100644
--- a/tests/auto/qml/persistenttrie/persistenttrie.qbs
+++ b/tests/auto/qml/persistenttrie/persistenttrie.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "QML persistenttrie autotest"
Depends { name: "QmlJS" }
Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
diff --git a/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs b/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs
index 76e3f9d5a7..c88b930245 100644
--- a/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs
+++ b/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../../../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "QML code formatter autotest"
Depends { name: "QmlJS" }
Depends { name: "QmlJSTools" }
diff --git a/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs b/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs
index c607c03ed3..ccb4ba7886 100644
--- a/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs
+++ b/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "QMLJS simple reader autotest"
Depends { name: "QmlJS" }
Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
index 134731675a..75d487c95a 100644
--- a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
+++ b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../../../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "QmlProjectManager file format autotest"
Depends { name: "QmlJS" }
Depends { name: "Utils" }
diff --git a/tests/auto/qml/qrcparser/qrcparser.qbs b/tests/auto/qml/qrcparser/qrcparser.qbs
index f5d138af11..977e3bedb1 100644
--- a/tests/auto/qml/qrcparser/qrcparser.qbs
+++ b/tests/auto/qml/qrcparser/qrcparser.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "QML qrc parser autotest"
Depends { name: "QmlJS" }
Depends { name: "QmlJSTools" }
diff --git a/tests/auto/qml/reformatter/reformatter.qbs b/tests/auto/qml/reformatter/reformatter.qbs
index 0fc2c4dd92..e1f9655cff 100644
--- a/tests/auto/qml/reformatter/reformatter.qbs
+++ b/tests/auto/qml/reformatter/reformatter.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "QML reformatter autotest"
Depends { name: "QmlJS" }
Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
diff --git a/tests/auto/qtcprocess/qtcprocess.qbs b/tests/auto/qtcprocess/qtcprocess.qbs
index 1050f6c36a..158bf1e9fa 100644
--- a/tests/auto/qtcprocess/qtcprocess.qbs
+++ b/tests/auto/qtcprocess/qtcprocess.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "QtcProcess autotest"
Depends { name: "Utils" }
Depends { name: "Qt.widgets" } // TODO: qbs bug, remove when fixed
diff --git a/tests/auto/treeviewfind/treeviewfind.qbs b/tests/auto/treeviewfind/treeviewfind.qbs
index 915e6671d0..212a62a5f3 100644
--- a/tests/auto/treeviewfind/treeviewfind.qbs
+++ b/tests/auto/treeviewfind/treeviewfind.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "TreeViewFind autotest"
Depends { name: "Core" }
Depends { name: "Qt.widgets" } // For QTextDocument
diff --git a/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs b/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs
index 3192c76e38..e5517ece26 100644
--- a/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs
+++ b/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "ANSI autotest"
Depends { name: "Utils" }
Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
diff --git a/tests/auto/utils/fileutils/fileutils.qbs b/tests/auto/utils/fileutils/fileutils.qbs
index fc2539a24b..8a8b202087 100644
--- a/tests/auto/utils/fileutils/fileutils.qbs
+++ b/tests/auto/utils/fileutils/fileutils.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "FileUtils autotest"
Depends { name: "Utils" }
Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
diff --git a/tests/auto/utils_stringutils/utils_stringutils.qbs b/tests/auto/utils_stringutils/utils_stringutils.qbs
index 609dbd08f9..00c2af5169 100644
--- a/tests/auto/utils_stringutils/utils_stringutils.qbs
+++ b/tests/auto/utils_stringutils/utils_stringutils.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "StringUtils autotest"
Depends { name: "Utils" }
Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
diff --git a/tests/auto/valgrind/memcheck/testapps/testapp.qbs b/tests/auto/valgrind/memcheck/testapps/testapp.qbs
index 695997e45d..f4ded88748 100644
--- a/tests/auto/valgrind/memcheck/testapps/testapp.qbs
+++ b/tests/auto/valgrind/memcheck/testapps/testapp.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../../../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
name: "Memcheck " + testName + " autotest"
property string testName
targetName: testName // Test runner hardcodes the names of the executables
diff --git a/tests/auto/valgrind/valgrindautotest.qbs b/tests/auto/valgrind/valgrindautotest.qbs
index 0b0aee4d77..b7745f98f6 100644
--- a/tests/auto/valgrind/valgrindautotest.qbs
+++ b/tests/auto/valgrind/valgrindautotest.qbs
@@ -1,7 +1,7 @@
import qbs
-import "../autotest.qbs" as Autotest
+import QtcAutotest
-Autotest {
+QtcAutotest {
Depends { name: "QtcSsh" }
Depends { name: "Utils" }
Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
--
GitLab