From ed30c612f43bff05a1855ca0d6e2c9edd0d0bc2f Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@theqtcompany.com>
Date: Thu, 27 Aug 2015 17:43:04 +0200
Subject: [PATCH] qbs build: Remove workarounds for fixed qbs bug.
That was most likely QBS-755.
Change-Id: I43d0316113fcca79554bfee9eee9b8bd706fce07
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
tests/auto/changeset/changeset.qbs | 1 -
tests/auto/environment/environment.qbs | 1 -
tests/auto/externaltool/externaltool.qbs | 1 -
tests/auto/qml/persistenttrie/persistenttrie.qbs | 1 -
tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs | 2 +-
tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs | 1 -
tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs | 1 -
tests/auto/qml/reformatter/reformatter.qbs | 2 +-
tests/auto/qtcprocess/qtcprocess.qbs | 1 -
.../auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs | 1 -
tests/auto/utils/fileutils/fileutils.qbs | 1 -
tests/auto/utils/stringutils/stringutils.qbs | 1 -
tests/auto/utils/treemodel/treemodel.qbs | 1 -
tests/auto/valgrind/valgrindautotest.qbs | 1 -
14 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/tests/auto/changeset/changeset.qbs b/tests/auto/changeset/changeset.qbs
index 897ce8ac9cc..f4649183583 100644
--- a/tests/auto/changeset/changeset.qbs
+++ b/tests/auto/changeset/changeset.qbs
@@ -3,6 +3,5 @@ import qbs
QtcAutotest {
name: "ChangeSet autotest"
Depends { name: "Utils" }
- Depends { name: "Qt.gui" } // TODO: Remove once qbs bug is fixed.
files: "tst_changeset.cpp"
}
diff --git a/tests/auto/environment/environment.qbs b/tests/auto/environment/environment.qbs
index 2383e0e8569..476342fbd95 100644
--- a/tests/auto/environment/environment.qbs
+++ b/tests/auto/environment/environment.qbs
@@ -3,6 +3,5 @@ import qbs
QtcAutotest {
name: "Environment autotest"
Depends { name: "Utils" }
- Depends { name: "Qt.widgets" } // TODO: qbs bug, remove when fixed
files: "tst_environment.cpp"
}
diff --git a/tests/auto/externaltool/externaltool.qbs b/tests/auto/externaltool/externaltool.qbs
index 8a2c7afcc87..932ad725fb7 100644
--- a/tests/auto/externaltool/externaltool.qbs
+++ b/tests/auto/externaltool/externaltool.qbs
@@ -4,7 +4,6 @@ QtcAutotest {
name: "ExternalTool autotest"
Depends { name: "Core" }
Depends { name: "app_version_header" }
- Depends { name: "Qt.widgets" } // TODO: qbs bug, remove when fixed
Group {
name: "Duplicated sources from Core plugin" // Ewww. But the .pro file does the same.
diff --git a/tests/auto/qml/persistenttrie/persistenttrie.qbs b/tests/auto/qml/persistenttrie/persistenttrie.qbs
index 457f457bebb..0e07e49423a 100644
--- a/tests/auto/qml/persistenttrie/persistenttrie.qbs
+++ b/tests/auto/qml/persistenttrie/persistenttrie.qbs
@@ -3,7 +3,6 @@ import qbs
QtcAutotest {
name: "QML persistenttrie autotest"
Depends { name: "QmlJS" }
- Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
files: [ "tst_testtrie.h", "tst_testtrie.cpp" ]
cpp.defines: base.concat([
'QMLJS_BUILD_DIR',
diff --git a/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs b/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs
index c3babbc9c1b..3cccb75c166 100644
--- a/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs
+++ b/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.qbs
@@ -4,6 +4,6 @@ QtcAutotest {
name: "QML code formatter autotest"
Depends { name: "QmlJS" }
Depends { name: "QmlJSTools" }
- Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
+ Depends { name: "Qt.widgets" }
files: "tst_qmlcodeformatter.cpp"
}
diff --git a/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs b/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs
index df386b86fd5..57d7ee5e54e 100644
--- a/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs
+++ b/tests/auto/qml/qmljssimplereader/qmljssimplereader.qbs
@@ -3,7 +3,6 @@ import qbs
QtcAutotest {
name: "QMLJS simple reader autotest"
Depends { name: "QmlJS" }
- Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
files: "tst_qmljssimplereader.cpp"
cpp.defines: base.concat(["QT_CREATOR"])
}
diff --git a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
index f6163c4e676..bd269c499a0 100644
--- a/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
+++ b/tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
@@ -5,7 +5,6 @@ QtcAutotest {
Depends { name: "QmlJS" }
Depends { name: "Utils" }
Depends { name: "Qt"; submodules: ["script"]; }
- Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
property path fileFormatDir: project.ide_source_tree + "/src/plugins/qmlprojectmanager/fileformat"
files: "tst_fileformat.cpp"
Group {
diff --git a/tests/auto/qml/reformatter/reformatter.qbs b/tests/auto/qml/reformatter/reformatter.qbs
index 02e938e528f..7c009748ee1 100644
--- a/tests/auto/qml/reformatter/reformatter.qbs
+++ b/tests/auto/qml/reformatter/reformatter.qbs
@@ -3,7 +3,7 @@ import qbs
QtcAutotest {
name: "QML reformatter autotest"
Depends { name: "QmlJS" }
- Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
+ Depends { name: "Qt.widgets" }
files: "tst_reformatter.cpp"
cpp.defines: base.concat([
'QT_CREATOR',
diff --git a/tests/auto/qtcprocess/qtcprocess.qbs b/tests/auto/qtcprocess/qtcprocess.qbs
index 75888cdf6ca..53f5dcfd2fe 100644
--- a/tests/auto/qtcprocess/qtcprocess.qbs
+++ b/tests/auto/qtcprocess/qtcprocess.qbs
@@ -3,7 +3,6 @@ import qbs
QtcAutotest {
name: "QtcProcess autotest"
Depends { name: "Utils" }
- Depends { name: "Qt.widgets" } // TODO: qbs bug, remove when fixed
files: "tst_qtcprocess.cpp"
Properties {
condition: qbs.targetOS === "windows"
diff --git a/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs b/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs
index 0abfdeb88f6..8a6e9f6bf03 100644
--- a/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs
+++ b/tests/auto/utils/ansiescapecodehandler/ansiescapecodehandler.qbs
@@ -3,6 +3,5 @@ import qbs
QtcAutotest {
name: "ANSI autotest"
Depends { name: "Utils" }
- Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
files: "tst_ansiescapecodehandler.cpp"
}
diff --git a/tests/auto/utils/fileutils/fileutils.qbs b/tests/auto/utils/fileutils/fileutils.qbs
index 3b9726c3fc9..e19452481ed 100644
--- a/tests/auto/utils/fileutils/fileutils.qbs
+++ b/tests/auto/utils/fileutils/fileutils.qbs
@@ -3,7 +3,6 @@ import qbs
QtcAutotest {
name: "FileUtils autotest"
Depends { name: "Utils" }
- Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
Properties {
condition: qbs.toolchain.contains("gcc")
cpp.cxxFlags: base.concat(["-Wno-trigraphs"])
diff --git a/tests/auto/utils/stringutils/stringutils.qbs b/tests/auto/utils/stringutils/stringutils.qbs
index be2f4ddb552..4a36fe9cb1f 100644
--- a/tests/auto/utils/stringutils/stringutils.qbs
+++ b/tests/auto/utils/stringutils/stringutils.qbs
@@ -3,6 +3,5 @@ import qbs
QtcAutotest {
name: "StringUtils autotest"
Depends { name: "Utils" }
- Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
files: "tst_stringutils.cpp"
}
diff --git a/tests/auto/utils/treemodel/treemodel.qbs b/tests/auto/utils/treemodel/treemodel.qbs
index bc86fcb9ff0..4a1659e8b0e 100644
--- a/tests/auto/utils/treemodel/treemodel.qbs
+++ b/tests/auto/utils/treemodel/treemodel.qbs
@@ -3,6 +3,5 @@ import qbs
QtcAutotest {
name: "TreeModel autotest"
Depends { name: "Utils" }
- Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
files: "tst_treemodel.cpp"
}
diff --git a/tests/auto/valgrind/valgrindautotest.qbs b/tests/auto/valgrind/valgrindautotest.qbs
index 1de90b646fc..bf500d50425 100644
--- a/tests/auto/valgrind/valgrindautotest.qbs
+++ b/tests/auto/valgrind/valgrindautotest.qbs
@@ -5,7 +5,6 @@ QtcAutotest {
Depends { name: "QtcSsh" }
Depends { name: "Utils" }
Depends { name: "ProjectExplorer" }
- Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
property path pluginDir: project.ide_source_tree + "/src/plugins/valgrind"
Group {
--
GitLab