diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2021-07-27 16:43:20 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2021-08-04 08:06:41 +0000 |
commit | 0aaefe74eef7444d093fa6b54b29bb1630777360 (patch) | |
tree | 8982493e9b7e84ef1185a77ef9e51fd1ed5fe2f9 /src/app | |
parent | 57bc6d8d9613f257b899fe8b94660142d4f91c07 (diff) |
Remove `import qbs` from all project files
... because we don't need in this inclusion at all.
But for some cases it is impossible to remove that inclusions
(and even to move on next lines) because then the some tests
are failed by unknown reason. For those tests were added the
following comments on the inclusion lines:
`// FIXME: Don't remove this import because then the test fails!`
Change-Id: I9153fd0e38b94af08168e499ee46a23889ee4d73
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/app')
-rw-r--r-- | src/app/apps.qbs | 2 | ||||
-rw-r--r-- | src/app/config-ui/config-ui.qbs | 2 | ||||
-rw-r--r-- | src/app/config/config.qbs | 2 | ||||
-rw-r--r-- | src/app/qbs-create-project/createproject.cpp | 1 | ||||
-rw-r--r-- | src/app/qbs-create-project/qbs-create-project.qbs | 2 | ||||
-rw-r--r-- | src/app/qbs-setup-android/qbs-setup-android.qbs | 2 | ||||
-rw-r--r-- | src/app/qbs-setup-qt/qbs-setup-qt.qbs | 2 | ||||
-rw-r--r-- | src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs | 2 | ||||
-rw-r--r-- | src/app/qbs/qbs.qbs | 1 |
9 files changed, 0 insertions, 16 deletions
diff --git a/src/app/apps.qbs b/src/app/apps.qbs index ba20515f2..4ea0a2c87 100644 --- a/src/app/apps.qbs +++ b/src/app/apps.qbs @@ -1,5 +1,3 @@ -import qbs - Project { references: [ "config/config.qbs", diff --git a/src/app/config-ui/config-ui.qbs b/src/app/config-ui/config-ui.qbs index 8b5e37559..544542ca4 100644 --- a/src/app/config-ui/config-ui.qbs +++ b/src/app/config-ui/config-ui.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - QbsApp { Depends { name: "Qt.widgets" } name: "qbs-config-ui" diff --git a/src/app/config/config.qbs b/src/app/config/config.qbs index 9daa701f6..2744b93f7 100644 --- a/src/app/config/config.qbs +++ b/src/app/config/config.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - QbsApp { name: "qbs-config" files: [ diff --git a/src/app/qbs-create-project/createproject.cpp b/src/app/qbs-create-project/createproject.cpp index cb6229ce3..f2f1364f5 100644 --- a/src/app/qbs-create-project/createproject.cpp +++ b/src/app/qbs-create-project/createproject.cpp @@ -104,7 +104,6 @@ void ProjectCreator::serializeProject(const ProjectCreator::Project &project) } QTextStream fileContents(&projectFile); qbs::setupDefaultCodec(fileContents); - fileContents << "import qbs\n\n"; if (!project.fileNames.empty() || m_projectStructure == ProjectStructure::Flat) { fileContents << "Product {\n"; const ProductFlags productFlags = getFlags(project); diff --git a/src/app/qbs-create-project/qbs-create-project.qbs b/src/app/qbs-create-project/qbs-create-project.qbs index b65f9177f..ae79001ee 100644 --- a/src/app/qbs-create-project/qbs-create-project.qbs +++ b/src/app/qbs-create-project/qbs-create-project.qbs @@ -1,5 +1,3 @@ -import qbs - QbsApp { name: "qbs-create-project" files: [ diff --git a/src/app/qbs-setup-android/qbs-setup-android.qbs b/src/app/qbs-setup-android/qbs-setup-android.qbs index 949c07c45..b18e152b0 100644 --- a/src/app/qbs-setup-android/qbs-setup-android.qbs +++ b/src/app/qbs-setup-android/qbs-setup-android.qbs @@ -1,5 +1,3 @@ -import qbs - QbsApp { name: "qbs-setup-android" files: [ diff --git a/src/app/qbs-setup-qt/qbs-setup-qt.qbs b/src/app/qbs-setup-qt/qbs-setup-qt.qbs index 44f2b7f05..3be090155 100644 --- a/src/app/qbs-setup-qt/qbs-setup-qt.qbs +++ b/src/app/qbs-setup-qt/qbs-setup-qt.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - QbsApp { name: "qbs-setup-qt" files: [ diff --git a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs index d33b4c8fb..2daf916e9 100644 --- a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs +++ b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs @@ -1,5 +1,3 @@ -import qbs 1.0 - QbsApp { name: "qbs-setup-toolchains" cpp.dynamicLibraries: qbs.targetOS.contains("windows") ? base.concat("shell32") : base diff --git a/src/app/qbs/qbs.qbs b/src/app/qbs/qbs.qbs index 530036f3a..03685dd21 100644 --- a/src/app/qbs/qbs.qbs +++ b/src/app/qbs/qbs.qbs @@ -1,4 +1,3 @@ -import qbs 1.0 import qbs.Utilities QbsApp { |