aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <[email protected]>2014-11-10 15:29:34 +0100
committerChristian Kandeler <[email protected]>2014-11-10 15:45:14 +0100
commit9d677e33021d296036f259e1abd789c4c85c7fd9 (patch)
treec839235f7c301d9e29aa75eea80e0e5e4cff40fe
parent5b00bf9a6c5ef347966c1009340b1dd5b968334e (diff)
qbs build: Remove unneeded import statements.
The respective items are available without it. Change-Id: Idc840cf08e7bec84f561c096afe8de25b1fb8468 Reviewed-by: Joerg Bornemann <[email protected]>
-rw-r--r--qbs/imports/QtcAutotest.qbs1
-rw-r--r--qbs/imports/QtcLibrary.qbs1
-rw-r--r--qbs/imports/QtcPlugin.qbs1
-rw-r--r--qbs/imports/QtcTool.qbs1
-rw-r--r--src/libs/aggregation/aggregation.qbs1
-rw-r--r--src/libs/cplusplus/cplusplus.qbs1
-rw-r--r--src/libs/extensionsystem/extensionsystem.qbs1
-rw-r--r--src/libs/glsl/glsl.qbs1
-rw-r--r--src/libs/languageutils/languageutils.qbs1
-rw-r--r--src/libs/qmldebug/qmldebug.qbs1
-rw-r--r--src/libs/qmleditorwidgets/qmleditorwidgets.qbs1
-rw-r--r--src/libs/qmljs/qmljs.qbs1
-rw-r--r--src/libs/ssh/ssh.qbs1
-rw-r--r--src/libs/utils/process_ctrlc_stub.qbs1
-rw-r--r--src/libs/utils/process_stub.qbs1
-rw-r--r--src/libs/utils/utils.qbs1
-rw-r--r--src/plugins/analyzerbase/analyzerbase.qbs2
-rw-r--r--src/plugins/android/android.qbs2
-rw-r--r--src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs2
-rw-r--r--src/plugins/baremetal/baremetal.qbs2
-rw-r--r--src/plugins/bazaar/bazaar.qbs2
-rw-r--r--src/plugins/beautifier/beautifier.qbs2
-rw-r--r--src/plugins/bineditor/bineditor.qbs2
-rw-r--r--src/plugins/bookmarks/bookmarks.qbs2
-rw-r--r--src/plugins/classview/classview.qbs2
-rw-r--r--src/plugins/clearcase/clearcase.qbs2
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs2
-rw-r--r--src/plugins/coreplugin/coreplugin.qbs1
-rw-r--r--src/plugins/cpaster/cpaster.qbs2
-rw-r--r--src/plugins/cpaster/frontend/frontend.qbs1
-rw-r--r--src/plugins/cppeditor/cppeditor.qbs2
-rw-r--r--src/plugins/cpptools/cpptools.qbs2
-rw-r--r--src/plugins/cvs/cvs.qbs2
-rw-r--r--src/plugins/debugger/debugger.qbs2
-rw-r--r--src/plugins/debugger/ptracepreload.qbs1
-rw-r--r--src/plugins/designer/designer.qbs2
-rw-r--r--src/plugins/diffeditor/diffeditor.qbs2
-rw-r--r--src/plugins/emacskeys/emacskeys.qbs2
-rw-r--r--src/plugins/fakevim/fakevim.qbs2
-rw-r--r--src/plugins/genericprojectmanager/genericprojectmanager.qbs2
-rw-r--r--src/plugins/git/git.qbs2
-rw-r--r--src/plugins/glsleditor/glsleditor.qbs2
-rw-r--r--src/plugins/helloworld/helloworld.qbs2
-rw-r--r--src/plugins/help/help.qbs2
-rw-r--r--src/plugins/imageviewer/imageviewer.qbs2
-rw-r--r--src/plugins/ios/ios.qbs2
-rw-r--r--src/plugins/macros/macros.qbs2
-rw-r--r--src/plugins/mercurial/mercurial.qbs2
-rw-r--r--src/plugins/perforce/perforce.qbs2
-rw-r--r--src/plugins/projectexplorer/projectexplorer.qbs3
-rw-r--r--src/plugins/pythoneditor/pythoneditor.qbs2
-rw-r--r--src/plugins/qbsprojectmanager/qbsprojectmanager.qbs2
-rw-r--r--src/plugins/qmakeandroidsupport/qmakeandroidsupport.qbs2
-rw-r--r--src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs2
-rw-r--r--src/plugins/qmljseditor/qmljseditor.qbs2
-rw-r--r--src/plugins/qmljstools/qmljstools.qbs2
-rw-r--r--src/plugins/qmlprofiler/qmlprofiler.qbs2
-rw-r--r--src/plugins/qmlprojectmanager/qmlprojectmanager.qbs2
-rw-r--r--src/plugins/qnx/qnx.qbs2
-rw-r--r--src/plugins/qtsupport/qtsupport.qbs3
-rw-r--r--src/plugins/remotelinux/remotelinux.qbs2
-rw-r--r--src/plugins/resourceeditor/resourceeditor.qbs2
-rw-r--r--src/plugins/subversion/subversion.qbs2
-rw-r--r--src/plugins/tasklist/tasklist.qbs2
-rw-r--r--src/plugins/texteditor/texteditor.qbs2
-rw-r--r--src/plugins/todo/todo.qbs2
-rw-r--r--src/plugins/updateinfo/updateinfo.qbs2
-rw-r--r--src/plugins/valgrind/valgrind.qbs2
-rw-r--r--src/plugins/vcsbase/vcsbase.qbs2
-rw-r--r--src/plugins/welcome/welcome.qbs2
-rw-r--r--src/plugins/winrt/winrt.qbs2
-rw-r--r--src/tools/3rdparty/iossim/iossim.qbs1
-rw-r--r--src/tools/buildoutputparser/buildoutputparser.qbs1
-rw-r--r--src/tools/iostool/iostool.qbs1
-rw-r--r--src/tools/qtcdebugger/qtcdebugger.qbs1
-rw-r--r--src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs1
-rw-r--r--src/tools/qtpromaker/qtpromaker.qbs1
-rw-r--r--src/tools/sdktool/sdktool.qbs1
-rw-r--r--src/tools/winrtdebughelper/winrtdebughelper.qbs1
-rw-r--r--tests/auto/aggregation/aggregation.qbs1
-rw-r--r--tests/auto/changeset/changeset.qbs1
-rw-r--r--tests/auto/cplusplus/cplusplusautotest.qbs1
-rw-r--r--tests/auto/debugger/disassembler.qbs1
-rw-r--r--tests/auto/debugger/dumpers.qbs1
-rw-r--r--tests/auto/debugger/gdb.qbs1
-rw-r--r--tests/auto/debugger/namedemangler.qbs1
-rw-r--r--tests/auto/debugger/simplifytypes.qbs1
-rw-r--r--tests/auto/diff/differ/differ.qbs1
-rw-r--r--tests/auto/environment/environment.qbs1
-rw-r--r--tests/auto/extensionsystem/pluginmanager/test.qbs1
-rw-r--r--tests/auto/extensionsystem/pluginspec/test.qbs1
-rw-r--r--tests/auto/externaltool/externaltool.qbs1
-rw-r--r--tests/auto/filesearch/filesearch.qbs1
-rw-r--r--tests/auto/generichighlighter/highlighterengine/highlighterengine.qbs1
-rw-r--r--tests/auto/generichighlighter/specificrules/specificrules.qbs1
-rw-r--r--tests/auto/ioutils/ioutils.qbs1
-rw-r--r--tests/auto/profilewriter/profilewriter.qbs1
-rw-r--r--tests/auto/qml/codemodel/check/check.qbs1
-rw-r--r--tests/auto/qml/codemodel/importscheck/importscheck.qbs1
-rw-r--r--tests/auto/qml/persistenttrie/persistenttrie.qbs1
-rw-r--r--tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs1
-rw-r--r--tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs1
-rw-r--r--tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs1
-rw-r--r--tests/auto/qml/qrcparser/qrcparser.qbs1
-rw-r--r--tests/auto/qml/reformatter/reformatter.qbs1
-rw-r--r--tests/auto/qtcprocess/qtcprocess.qbs1
-rw-r--r--tests/auto/treeviewfind/treeviewfind.qbs1
-rw-r--r--tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs1
-rw-r--r--tests/auto/utils/fileutils/fileutils.qbs1
-rw-r--r--tests/auto/utils_stringutils/utils_stringutils.qbs1
-rw-r--r--tests/auto/valgrind/memcheck/testapps/testapp.qbs1
-rw-r--r--tests/auto/valgrind/valgrindautotest.qbs1
112 files changed, 0 insertions, 166 deletions
diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs
index 0bd37a905b2..f24e11c7c55 100644
--- a/qbs/imports/QtcAutotest.qbs
+++ b/qbs/imports/QtcAutotest.qbs
@@ -1,6 +1,5 @@
import qbs
import qbs.FileInfo
-import QtcProduct
QtcProduct {
type: "application"
diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs
index 6792c834c3c..a4fc14bdd68 100644
--- a/qbs/imports/QtcLibrary.qbs
+++ b/qbs/imports/QtcLibrary.qbs
@@ -1,6 +1,5 @@
import qbs 1.0
import QtcFunctions
-import QtcProduct
QtcProduct {
type: "dynamiclibrary"
diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs
index d896411c90a..713e388c3ae 100644
--- a/qbs/imports/QtcPlugin.qbs
+++ b/qbs/imports/QtcPlugin.qbs
@@ -1,7 +1,6 @@
import qbs 1.0
import qbs.FileInfo
import QtcFunctions
-import QtcProduct
QtcProduct {
type: ["dynamiclibrary", "pluginSpec"]
diff --git a/qbs/imports/QtcTool.qbs b/qbs/imports/QtcTool.qbs
index 3581662f396..9000f76b1e2 100644
--- a/qbs/imports/QtcTool.qbs
+++ b/qbs/imports/QtcTool.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcProduct
QtcProduct {
type: "application" // no Mac app bundle
diff --git a/src/libs/aggregation/aggregation.qbs b/src/libs/aggregation/aggregation.qbs
index 4225adf64eb..ddddd99fb38 100644
--- a/src/libs/aggregation/aggregation.qbs
+++ b/src/libs/aggregation/aggregation.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcLibrary
QtcLibrary {
name: "Aggregation"
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index e4db761e042..7b2f3120f28 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcLibrary
QtcLibrary {
name: "CPlusPlus"
diff --git a/src/libs/extensionsystem/extensionsystem.qbs b/src/libs/extensionsystem/extensionsystem.qbs
index 1320a43ec87..05b8051b7fd 100644
--- a/src/libs/extensionsystem/extensionsystem.qbs
+++ b/src/libs/extensionsystem/extensionsystem.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcLibrary
QtcLibrary {
name: "ExtensionSystem"
diff --git a/src/libs/glsl/glsl.qbs b/src/libs/glsl/glsl.qbs
index ade3e6d86b9..d37e74d565f 100644
--- a/src/libs/glsl/glsl.qbs
+++ b/src/libs/glsl/glsl.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcLibrary
QtcLibrary {
name: "GLSL"
diff --git a/src/libs/languageutils/languageutils.qbs b/src/libs/languageutils/languageutils.qbs
index eef6bf3c3d1..244b41d8fcc 100644
--- a/src/libs/languageutils/languageutils.qbs
+++ b/src/libs/languageutils/languageutils.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcLibrary
QtcLibrary {
name: "LanguageUtils"
diff --git a/src/libs/qmldebug/qmldebug.qbs b/src/libs/qmldebug/qmldebug.qbs
index 4d96a595891..6ab60e8d492 100644
--- a/src/libs/qmldebug/qmldebug.qbs
+++ b/src/libs/qmldebug/qmldebug.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcLibrary
QtcLibrary {
name: "QmlDebug"
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
index fb3334f2083..ffaa980c923 100644
--- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcLibrary
QtcLibrary {
name: "QmlEditorWidgets"
diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs
index 1bd85d4e566..8db2ad96caa 100644
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcLibrary
QtcLibrary {
name: "QmlJS"
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs
index 64cdb55c916..486fa212cd3 100644
--- a/src/libs/ssh/ssh.qbs
+++ b/src/libs/ssh/ssh.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcLibrary
QtcLibrary {
name: "QtcSsh"
diff --git a/src/libs/utils/process_ctrlc_stub.qbs b/src/libs/utils/process_ctrlc_stub.qbs
index aec4ffbf7e8..c92215df8e3 100644
--- a/src/libs/utils/process_ctrlc_stub.qbs
+++ b/src/libs/utils/process_ctrlc_stub.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcTool
QtcTool {
name: "qtcreator_ctrlc_stub"
diff --git a/src/libs/utils/process_stub.qbs b/src/libs/utils/process_stub.qbs
index 8ef2dd51fb5..341fb57791b 100644
--- a/src/libs/utils/process_stub.qbs
+++ b/src/libs/utils/process_stub.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcTool
QtcTool {
name: "qtcreator_process_stub"
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 7371fbf6b25..4a79fa9b4f7 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcLibrary
QtcLibrary {
name: "Utils"
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index 14c1ce79a50..259e5f8ddf9 100644
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/src/plugins/analyzerbase/analyzerbase.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "AnalyzerBase"
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index e97b868ed57..76fcd09ff39 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "Android"
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
index 0d377593c4f..0c7c6f2c1bc 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "AutotoolsProjectManager"
diff --git a/src/plugins/baremetal/baremetal.qbs b/src/plugins/baremetal/baremetal.qbs
index 72a2f3f71f2..54dfff066e3 100644
--- a/src/plugins/baremetal/baremetal.qbs
+++ b/src/plugins/baremetal/baremetal.qbs
@@ -1,7 +1,5 @@
import qbs
-import QtcPlugin
-
QtcPlugin {
name: "BareMetal"
diff --git a/src/plugins/bazaar/bazaar.qbs b/src/plugins/bazaar/bazaar.qbs
index cf7d7f33638..45a59be37ce 100644
--- a/src/plugins/bazaar/bazaar.qbs
+++ b/src/plugins/bazaar/bazaar.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "Bazaar"
diff --git a/src/plugins/beautifier/beautifier.qbs b/src/plugins/beautifier/beautifier.qbs
index d22464eb6a6..8e92420bdd3 100644
--- a/src/plugins/beautifier/beautifier.qbs
+++ b/src/plugins/beautifier/beautifier.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "Beautifier"
diff --git a/src/plugins/bineditor/bineditor.qbs b/src/plugins/bineditor/bineditor.qbs
index 7951c1180e3..72f906c384b 100644
--- a/src/plugins/bineditor/bineditor.qbs
+++ b/src/plugins/bineditor/bineditor.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "BinEditor"
diff --git a/src/plugins/bookmarks/bookmarks.qbs b/src/plugins/bookmarks/bookmarks.qbs
index 693357ebe1c..979f06b084f 100644
--- a/src/plugins/bookmarks/bookmarks.qbs
+++ b/src/plugins/bookmarks/bookmarks.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "Bookmarks"
diff --git a/src/plugins/classview/classview.qbs b/src/plugins/classview/classview.qbs
index f4f1b438d29..d564800f117 100644
--- a/src/plugins/classview/classview.qbs
+++ b/src/plugins/classview/classview.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "ClassView"
diff --git a/src/plugins/clearcase/clearcase.qbs b/src/plugins/clearcase/clearcase.qbs
index 7c8c24a7174..2c52f4690a0 100644
--- a/src/plugins/clearcase/clearcase.qbs
+++ b/src/plugins/clearcase/clearcase.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "ClearCase"
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
index fc8eabc50bc..2415f71e548 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "CMakeProjectManager"
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index f056dd100a6..cd7c2bd9c65 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -1,6 +1,5 @@
import qbs 1.0
import qbs.FileInfo
-import QtcPlugin
QtcPlugin {
name: "Core"
diff --git a/src/plugins/cpaster/cpaster.qbs b/src/plugins/cpaster/cpaster.qbs
index 69eeace2eb2..033b570b8ee 100644
--- a/src/plugins/cpaster/cpaster.qbs
+++ b/src/plugins/cpaster/cpaster.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "CodePaster"
diff --git a/src/plugins/cpaster/frontend/frontend.qbs b/src/plugins/cpaster/frontend/frontend.qbs
index 6c9ac521389..d42265ad574 100644
--- a/src/plugins/cpaster/frontend/frontend.qbs
+++ b/src/plugins/cpaster/frontend/frontend.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcTool
QtcTool {
name: "cpaster"
diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs
index 7c137c75035..bceb436e572 100644
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/src/plugins/cppeditor/cppeditor.qbs
@@ -1,8 +1,6 @@
import qbs 1.0
import qbs.FileInfo
-import QtcPlugin
-
QtcPlugin {
name: "CppEditor"
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index d4656891fd9..8977c85f609 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -1,8 +1,6 @@
import qbs 1.0
import qbs.FileInfo
-import QtcPlugin
-
QtcPlugin {
name: "CppTools"
diff --git a/src/plugins/cvs/cvs.qbs b/src/plugins/cvs/cvs.qbs
index 8d4dfc564d5..e07f71f55ae 100644
--- a/src/plugins/cvs/cvs.qbs
+++ b/src/plugins/cvs/cvs.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "CVS"
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index 69867c4036b..e03c038beb8 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "Debugger"
diff --git a/src/plugins/debugger/ptracepreload.qbs b/src/plugins/debugger/ptracepreload.qbs
index 90a323d4d5e..0068b9b3d0b 100644
--- a/src/plugins/debugger/ptracepreload.qbs
+++ b/src/plugins/debugger/ptracepreload.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcLibrary
QtcLibrary {
name: "ptracepreload"
diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs
index 272622afd04..0cc3c0b514e 100644
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -1,8 +1,6 @@
import qbs 1.0
import qbs.FileInfo
-import QtcPlugin
-
QtcPlugin {
name: "Designer"
diff --git a/src/plugins/diffeditor/diffeditor.qbs b/src/plugins/diffeditor/diffeditor.qbs
index ce9e509a7e9..4bf6a5d1d60 100644
--- a/src/plugins/diffeditor/diffeditor.qbs
+++ b/src/plugins/diffeditor/diffeditor.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "DiffEditor"
diff --git a/src/plugins/emacskeys/emacskeys.qbs b/src/plugins/emacskeys/emacskeys.qbs
index 40bbf51c688..b71caa3e4a5 100644
--- a/src/plugins/emacskeys/emacskeys.qbs
+++ b/src/plugins/emacskeys/emacskeys.qbs
@@ -1,7 +1,5 @@
import qbs.base 1.0
-import QtcPlugin
-
QtcPlugin {
name: "EmacsKeys"
diff --git a/src/plugins/fakevim/fakevim.qbs b/src/plugins/fakevim/fakevim.qbs
index b70f68d7a19..700ee79d272 100644
--- a/src/plugins/fakevim/fakevim.qbs
+++ b/src/plugins/fakevim/fakevim.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "FakeVim"
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.qbs b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
index e8193ae00b1..62572d4457b 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.qbs
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
@@ -1,8 +1,6 @@
import qbs 1.0
import qbs.FileInfo
-import QtcPlugin
-
QtcPlugin {
name: "GenericProjectManager"
diff --git a/src/plugins/git/git.qbs b/src/plugins/git/git.qbs
index 8e19c15971e..381168e73a1 100644
--- a/src/plugins/git/git.qbs
+++ b/src/plugins/git/git.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "Git"
diff --git a/src/plugins/glsleditor/glsleditor.qbs b/src/plugins/glsleditor/glsleditor.qbs
index 5ccea4a0012..6a809a6e5cb 100644
--- a/src/plugins/glsleditor/glsleditor.qbs
+++ b/src/plugins/glsleditor/glsleditor.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "GLSLEditor"
diff --git a/src/plugins/helloworld/helloworld.qbs b/src/plugins/helloworld/helloworld.qbs
index ee285462815..c51e2717659 100644
--- a/src/plugins/helloworld/helloworld.qbs
+++ b/src/plugins/helloworld/helloworld.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "HelloWorld"
diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs
index c38c9a68915..d4b4535b6d9 100644
--- a/src/plugins/help/help.qbs
+++ b/src/plugins/help/help.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "Help"
diff --git a/src/plugins/imageviewer/imageviewer.qbs b/src/plugins/imageviewer/imageviewer.qbs
index d12d2b53454..d47336d0fc3 100644
--- a/src/plugins/imageviewer/imageviewer.qbs
+++ b/src/plugins/imageviewer/imageviewer.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "ImageViewer"
diff --git a/src/plugins/ios/ios.qbs b/src/plugins/ios/ios.qbs
index dbfd995eb27..91f9c86eb9b 100644
--- a/src/plugins/ios/ios.qbs
+++ b/src/plugins/ios/ios.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "Ios"
diff --git a/src/plugins/macros/macros.qbs b/src/plugins/macros/macros.qbs
index 541b356e008..b4055456ead 100644
--- a/src/plugins/macros/macros.qbs
+++ b/src/plugins/macros/macros.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "Macros"
diff --git a/src/plugins/mercurial/mercurial.qbs b/src/plugins/mercurial/mercurial.qbs
index 77aaa39ea2e..3198da245c5 100644
--- a/src/plugins/mercurial/mercurial.qbs
+++ b/src/plugins/mercurial/mercurial.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "Mercurial"
diff --git a/src/plugins/perforce/perforce.qbs b/src/plugins/perforce/perforce.qbs
index 2a0ac5bd984..1f5136c65cf 100644
--- a/src/plugins/perforce/perforce.qbs
+++ b/src/plugins/perforce/perforce.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "Perforce"
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index 887fa0bfa83..a7c62f689f5 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -1,8 +1,5 @@
import qbs 1.0
-import QtcFunctions
-import QtcPlugin
-
QtcPlugin {
name: "ProjectExplorer"
diff --git a/src/plugins/pythoneditor/pythoneditor.qbs b/src/plugins/pythoneditor/pythoneditor.qbs
index ffd924b6dac..fa99a59472b 100644
--- a/src/plugins/pythoneditor/pythoneditor.qbs
+++ b/src/plugins/pythoneditor/pythoneditor.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "PythonEditor"
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
index d026f069f3a..e9be220f3e0 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
@@ -1,8 +1,6 @@
import qbs 1.0
import qbs.FileInfo
-import QtcPlugin
-
QtcPlugin {
name: "QbsProjectManager"
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.qbs b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.qbs
index 9249e0bb3b7..5566daa83ef 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.qbs
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.qbs
@@ -1,7 +1,5 @@
import qbs
-import QtcPlugin
-
QtcPlugin {
name: "QmakeAndroidSupport"
Depends { name: "Android" }
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs
index 929c868d5f9..950d7a7d73f 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "QmakeProjectManager"
diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs
index 8cc532e62e9..a4296540920 100644
--- a/src/plugins/qmljseditor/qmljseditor.qbs
+++ b/src/plugins/qmljseditor/qmljseditor.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "QmlJSEditor"
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index c47c5039998..62889c9ed00 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "QmlJSTools"
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs
index 5ab6e00af6b..198b58b070d 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "QmlProfiler"
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
index be5d123edb7..ef9b6014db8 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "QmlProjectManager"
diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs
index f03ea92cba7..cd11eb81b12 100644
--- a/src/plugins/qnx/qnx.qbs
+++ b/src/plugins/qnx/qnx.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "Qnx"
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index 41c79706485..9ef7bb7a9c1 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -1,8 +1,5 @@
import qbs 1.0
-import QtcFunctions
-import QtcPlugin
-
QtcPlugin {
name: "QtSupport"
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index bf8bf94242f..b47aaa83a3d 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "RemoteLinux"
diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs
index c7dfd114381..d96bafe3ac4 100644
--- a/src/plugins/resourceeditor/resourceeditor.qbs
+++ b/src/plugins/resourceeditor/resourceeditor.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "ResourceEditor"
diff --git a/src/plugins/subversion/subversion.qbs b/src/plugins/subversion/subversion.qbs
index 87d207528b9..045595618f0 100644
--- a/src/plugins/subversion/subversion.qbs
+++ b/src/plugins/subversion/subversion.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "Subversion"
diff --git a/src/plugins/tasklist/tasklist.qbs b/src/plugins/tasklist/tasklist.qbs
index 8b89df02d03..22039d55f6a 100644
--- a/src/plugins/tasklist/tasklist.qbs
+++ b/src/plugins/tasklist/tasklist.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "TaskList"
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index cb40fd5ab6d..0e3ad79dad9 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "TextEditor"
diff --git a/src/plugins/todo/todo.qbs b/src/plugins/todo/todo.qbs
index 0ee3e4c2eec..78640179250 100644
--- a/src/plugins/todo/todo.qbs
+++ b/src/plugins/todo/todo.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "Todo"
diff --git a/src/plugins/updateinfo/updateinfo.qbs b/src/plugins/updateinfo/updateinfo.qbs
index 36e7e5c20bf..02161420e30 100644
--- a/src/plugins/updateinfo/updateinfo.qbs
+++ b/src/plugins/updateinfo/updateinfo.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "UpdateInfo"
diff --git a/src/plugins/valgrind/valgrind.qbs b/src/plugins/valgrind/valgrind.qbs
index 0105d887bc5..527cf201cbd 100644
--- a/src/plugins/valgrind/valgrind.qbs
+++ b/src/plugins/valgrind/valgrind.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "Valgrind"
diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs
index 61de33b1d45..c6a0bbe879a 100644
--- a/src/plugins/vcsbase/vcsbase.qbs
+++ b/src/plugins/vcsbase/vcsbase.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "VcsBase"
diff --git a/src/plugins/welcome/welcome.qbs b/src/plugins/welcome/welcome.qbs
index 9b880013485..8bdafc044c0 100644
--- a/src/plugins/welcome/welcome.qbs
+++ b/src/plugins/welcome/welcome.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "Welcome"
diff --git a/src/plugins/winrt/winrt.qbs b/src/plugins/winrt/winrt.qbs
index 8e657c66f86..37121850437 100644
--- a/src/plugins/winrt/winrt.qbs
+++ b/src/plugins/winrt/winrt.qbs
@@ -1,7 +1,5 @@
import qbs 1.0
-import QtcPlugin
-
QtcPlugin {
name: "WinRt"
diff --git a/src/tools/3rdparty/iossim/iossim.qbs b/src/tools/3rdparty/iossim/iossim.qbs
index 0e3704530af..c667ce8a3da 100644
--- a/src/tools/3rdparty/iossim/iossim.qbs
+++ b/src/tools/3rdparty/iossim/iossim.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcTool
QtcTool {
name: "iossim"
diff --git a/src/tools/buildoutputparser/buildoutputparser.qbs b/src/tools/buildoutputparser/buildoutputparser.qbs
index ef7727b1e6d..cbed1bfe636 100644
--- a/src/tools/buildoutputparser/buildoutputparser.qbs
+++ b/src/tools/buildoutputparser/buildoutputparser.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcTool
QtcTool {
name: "buildoutputparser"
diff --git a/src/tools/iostool/iostool.qbs b/src/tools/iostool/iostool.qbs
index fb272c75123..e57c8f973c6 100644
--- a/src/tools/iostool/iostool.qbs
+++ b/src/tools/iostool/iostool.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcTool
QtcTool {
name: "iostool"
diff --git a/src/tools/qtcdebugger/qtcdebugger.qbs b/src/tools/qtcdebugger/qtcdebugger.qbs
index 7358d74eb34..490ed9d134a 100644
--- a/src/tools/qtcdebugger/qtcdebugger.qbs
+++ b/src/tools/qtcdebugger/qtcdebugger.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcTool
QtcTool {
name: "qtcdebugger"
diff --git a/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs b/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs
index 9d0bd4524b3..4fdc5788705 100644
--- a/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs
+++ b/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcTool
QtcTool {
name: "qtcreator_crash_handler"
diff --git a/src/tools/qtpromaker/qtpromaker.qbs b/src/tools/qtpromaker/qtpromaker.qbs
index 63d01368bcc..50c77f039d3 100644
--- a/src/tools/qtpromaker/qtpromaker.qbs
+++ b/src/tools/qtpromaker/qtpromaker.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcTool
QtcTool {
name: "qtpromaker"
diff --git a/src/tools/sdktool/sdktool.qbs b/src/tools/sdktool/sdktool.qbs
index 72d6188052d..88be3dcd66e 100644
--- a/src/tools/sdktool/sdktool.qbs
+++ b/src/tools/sdktool/sdktool.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcTool
QtcTool {
name: "sdktool"
diff --git a/src/tools/winrtdebughelper/winrtdebughelper.qbs b/src/tools/winrtdebughelper/winrtdebughelper.qbs
index e267bb0311d..d4d27a12ae4 100644
--- a/src/tools/winrtdebughelper/winrtdebughelper.qbs
+++ b/src/tools/winrtdebughelper/winrtdebughelper.qbs
@@ -1,5 +1,4 @@
import qbs 1.0
-import QtcTool
QtcTool {
name: "winrtdebughelper"
diff --git a/tests/auto/aggregation/aggregation.qbs b/tests/auto/aggregation/aggregation.qbs
index e8945b95cff..5ade0ce6c88 100644
--- a/tests/auto/aggregation/aggregation.qbs
+++ b/tests/auto/aggregation/aggregation.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "Aggregation autotest"
diff --git a/tests/auto/changeset/changeset.qbs b/tests/auto/changeset/changeset.qbs
index fe4e52aa9b4..897ce8ac9cc 100644
--- a/tests/auto/changeset/changeset.qbs
+++ b/tests/auto/changeset/changeset.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "ChangeSet autotest"
diff --git a/tests/auto/cplusplus/cplusplusautotest.qbs b/tests/auto/cplusplus/cplusplusautotest.qbs
index 4c8c640db5f..f666a020766 100644
--- a/tests/auto/cplusplus/cplusplusautotest.qbs
+++ b/tests/auto/cplusplus/cplusplusautotest.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
Depends { name: "CppTools" }
diff --git a/tests/auto/debugger/disassembler.qbs b/tests/auto/debugger/disassembler.qbs
index b228c90d14c..5b204826d43 100644
--- a/tests/auto/debugger/disassembler.qbs
+++ b/tests/auto/debugger/disassembler.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "disassembler autotest"
diff --git a/tests/auto/debugger/dumpers.qbs b/tests/auto/debugger/dumpers.qbs
index eff2a1c5288..050a44881f9 100644
--- a/tests/auto/debugger/dumpers.qbs
+++ b/tests/auto/debugger/dumpers.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "Debugger dumpers autotest"
diff --git a/tests/auto/debugger/gdb.qbs b/tests/auto/debugger/gdb.qbs
index 3a202fc765a..b7ea870325c 100644
--- a/tests/auto/debugger/gdb.qbs
+++ b/tests/auto/debugger/gdb.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "gdb autotest"
diff --git a/tests/auto/debugger/namedemangler.qbs b/tests/auto/debugger/namedemangler.qbs
index 252c17e28d6..a22d294ad0b 100644
--- a/tests/auto/debugger/namedemangler.qbs
+++ b/tests/auto/debugger/namedemangler.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "Name demangler autotest"
diff --git a/tests/auto/debugger/simplifytypes.qbs b/tests/auto/debugger/simplifytypes.qbs
index e81d5a42ff0..1b2cb3d5bec 100644
--- a/tests/auto/debugger/simplifytypes.qbs
+++ b/tests/auto/debugger/simplifytypes.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "simplifytypes autotest"
diff --git a/tests/auto/diff/differ/differ.qbs b/tests/auto/diff/differ/differ.qbs
index c3edbdb9d61..8540e000804 100644
--- a/tests/auto/diff/differ/differ.qbs
+++ b/tests/auto/diff/differ/differ.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "Differ autotest"
diff --git a/tests/auto/environment/environment.qbs b/tests/auto/environment/environment.qbs
index 71a8f792168..2383e0e8569 100644
--- a/tests/auto/environment/environment.qbs
+++ b/tests/auto/environment/environment.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "Environment autotest"
diff --git a/tests/auto/extensionsystem/pluginmanager/test.qbs b/tests/auto/extensionsystem/pluginmanager/test.qbs
index 7fd1bccf367..21ff8f6bf15 100644
--- a/tests/auto/extensionsystem/pluginmanager/test.qbs
+++ b/tests/auto/extensionsystem/pluginmanager/test.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "PluginManager autotest"
diff --git a/tests/auto/extensionsystem/pluginspec/test.qbs b/tests/auto/extensionsystem/pluginspec/test.qbs
index a6e65844ed1..3ec71096388 100644
--- a/tests/auto/extensionsystem/pluginspec/test.qbs
+++ b/tests/auto/extensionsystem/pluginspec/test.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "ExtensionSystem pluginspec autotest"
diff --git a/tests/auto/externaltool/externaltool.qbs b/tests/auto/externaltool/externaltool.qbs
index 99d3e27af57..8a2c7afcc87 100644
--- a/tests/auto/externaltool/externaltool.qbs
+++ b/tests/auto/externaltool/externaltool.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "ExternalTool autotest"
diff --git a/tests/auto/filesearch/filesearch.qbs b/tests/auto/filesearch/filesearch.qbs
index 41653c74584..6468e5a968c 100644
--- a/tests/auto/filesearch/filesearch.qbs
+++ b/tests/auto/filesearch/filesearch.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "File search autotest"
diff --git a/tests/auto/generichighlighter/highlighterengine/highlighterengine.qbs b/tests/auto/generichighlighter/highlighterengine/highlighterengine.qbs
index 9ecfb76efc5..af3a7b2cc0a 100644
--- a/tests/auto/generichighlighter/highlighterengine/highlighterengine.qbs
+++ b/tests/auto/generichighlighter/highlighterengine/highlighterengine.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "Highlighter engine autotest"
diff --git a/tests/auto/generichighlighter/specificrules/specificrules.qbs b/tests/auto/generichighlighter/specificrules/specificrules.qbs
index ad9c75312b7..9548bf0668d 100644
--- a/tests/auto/generichighlighter/specificrules/specificrules.qbs
+++ b/tests/auto/generichighlighter/specificrules/specificrules.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "Generic highlighter specific rules autotest"
diff --git a/tests/auto/ioutils/ioutils.qbs b/tests/auto/ioutils/ioutils.qbs
index 564ff59e087..0abf2c96c32 100644
--- a/tests/auto/ioutils/ioutils.qbs
+++ b/tests/auto/ioutils/ioutils.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "IoUtils autotest"
diff --git a/tests/auto/profilewriter/profilewriter.qbs b/tests/auto/profilewriter/profilewriter.qbs
index 17e40af20e4..e05ec165661 100644
--- a/tests/auto/profilewriter/profilewriter.qbs
+++ b/tests/auto/profilewriter/profilewriter.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "ProFileWriter autotest"
diff --git a/tests/auto/qml/codemodel/check/check.qbs b/tests/auto/qml/codemodel/check/check.qbs
index 5e1cbf3cd2b..23101671792 100644
--- a/tests/auto/qml/codemodel/check/check.qbs
+++ b/tests/auto/qml/codemodel/check/check.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "QML code model check autotest"
diff --git a/tests/auto/qml/codemodel/importscheck/importscheck.qbs b/tests/auto/qml/codemodel/importscheck/importscheck.qbs
index fe50705f066..91fa60090dc 100644
--- a/tests/auto/qml/codemodel/importscheck/importscheck.qbs
+++ b/tests/auto/qml/codemodel/importscheck/importscheck.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "QML code model imports check autotest"
diff --git a/tests/auto/qml/persistenttrie/persistenttrie.qbs b/tests/auto/qml/persistenttrie/persistenttrie.qbs
index 561d699d066..457f457bebb 100644
--- a/tests/auto/qml/persistenttrie/persistenttrie.qbs
+++ b/tests/auto/qml/persistenttrie/persistenttrie.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "QML persistenttrie autotest"
diff --git a/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs b/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs
index c88b9302454..c3babbc9c1b 100644
--- a/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs
+++ b/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "QML code formatter autotest"
diff --git a/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs b/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs
index ccb4ba78866..df386b86fd5 100644
--- a/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs
+++ b/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "QMLJS simple reader autotest"
diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
index 75d487c95a2..0cc8f0aaf76 100644
--- a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
+++ b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "QmlProjectManager file format autotest"
diff --git a/tests/auto/qml/qrcparser/qrcparser.qbs b/tests/auto/qml/qrcparser/qrcparser.qbs
index 977e3bedb16..f08e32a0630 100644
--- a/tests/auto/qml/qrcparser/qrcparser.qbs
+++ b/tests/auto/qml/qrcparser/qrcparser.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "QML qrc parser autotest"
diff --git a/tests/auto/qml/reformatter/reformatter.qbs b/tests/auto/qml/reformatter/reformatter.qbs
index e1f9655cff4..02e938e528f 100644
--- a/tests/auto/qml/reformatter/reformatter.qbs
+++ b/tests/auto/qml/reformatter/reformatter.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "QML reformatter autotest"
diff --git a/tests/auto/qtcprocess/qtcprocess.qbs b/tests/auto/qtcprocess/qtcprocess.qbs
index 158bf1e9fa2..75888cdf6ca 100644
--- a/tests/auto/qtcprocess/qtcprocess.qbs
+++ b/tests/auto/qtcprocess/qtcprocess.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "QtcProcess autotest"
diff --git a/tests/auto/treeviewfind/treeviewfind.qbs b/tests/auto/treeviewfind/treeviewfind.qbs
index 212a62a5f3b..88f6bfad240 100644
--- a/tests/auto/treeviewfind/treeviewfind.qbs
+++ b/tests/auto/treeviewfind/treeviewfind.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "TreeViewFind autotest"
diff --git a/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs b/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs
index e5517ece262..0abfdeb88f6 100644
--- a/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs
+++ b/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "ANSI autotest"
diff --git a/tests/auto/utils/fileutils/fileutils.qbs b/tests/auto/utils/fileutils/fileutils.qbs
index 8a8b2020870..3b9726c3fc9 100644
--- a/tests/auto/utils/fileutils/fileutils.qbs
+++ b/tests/auto/utils/fileutils/fileutils.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "FileUtils autotest"
diff --git a/tests/auto/utils_stringutils/utils_stringutils.qbs b/tests/auto/utils_stringutils/utils_stringutils.qbs
index 00c2af5169e..be2f4ddb552 100644
--- a/tests/auto/utils_stringutils/utils_stringutils.qbs
+++ b/tests/auto/utils_stringutils/utils_stringutils.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "StringUtils autotest"
diff --git a/tests/auto/valgrind/memcheck/testapps/testapp.qbs b/tests/auto/valgrind/memcheck/testapps/testapp.qbs
index fa88860dff3..1f2de2578fd 100644
--- a/tests/auto/valgrind/memcheck/testapps/testapp.qbs
+++ b/tests/auto/valgrind/memcheck/testapps/testapp.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
name: "Memcheck " + testName + " autotest"
diff --git a/tests/auto/valgrind/valgrindautotest.qbs b/tests/auto/valgrind/valgrindautotest.qbs
index f51f161cc6a..22b79069263 100644
--- a/tests/auto/valgrind/valgrindautotest.qbs
+++ b/tests/auto/valgrind/valgrindautotest.qbs
@@ -1,5 +1,4 @@
import qbs
-import QtcAutotest
QtcAutotest {
Depends { name: "QtcSsh" }