From d6465142ebeb8c24619a0a63f0cb53f5ba637c73 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Tue, 10 Apr 2012 15:57:24 +0200
Subject: [PATCH] qbs files: build with Qt5
Help plugin and QmlDesigner have been disabled for Qt5.
Change-Id: I9345d0fd00f9a575333dc972cc7adbdf146cd6cb
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
---
src/libs/utils/utils.qbs | 6 +++++-
src/plugins/coreplugin/coreplugin.qbs | 8 +++++++-
src/plugins/help/help.qbs | 2 ++
src/plugins/qmldesigner/qmldesigner.qbs | 2 ++
4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 2de95600849..2d2a937c70d 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -18,7 +18,7 @@ QtcLibrary {
}
Depends { name: "cpp" }
- Depends { name: "Qt"; submodules: ['widgets', 'network', 'script'] }
+ Depends { name: "Qt"; submodules: ['widgets', 'network', 'script', 'concurrent'] }
Depends { name: "Botan" }
Depends { name: "app_version_header" }
@@ -253,5 +253,9 @@ QtcLibrary {
"unixutils.cpp"
]
}
+
+ ProductModule {
+ Depends { name: "Qt"; submodules: ["concurrent"] }
+ }
}
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 918a0e6f152..2a1c1239766 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -4,7 +4,13 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Core"
- Depends { name: "qt"; submodules: ['core', 'widgets', 'xml', 'network', 'script', 'sql', 'help'] }
+ Depends {
+ name: "qt"
+ submodules: [
+ 'core', 'widgets', 'xml', 'network',
+ 'script', 'sql', 'help', 'printsupport'
+ ]
+ }
Depends { name: "Utils" }
Depends { name: "ExtensionSystem" }
Depends { name: "Aggregation" }
diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs
index 88e62434104..6d1df282479 100644
--- a/src/plugins/help/help.qbs
+++ b/src/plugins/help/help.qbs
@@ -5,6 +5,8 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Help"
+ condition: qtcore.versionMajor === 4
+ Depends { id: qtcore; name: "qt.core" }
Depends { name: "qt"; submodules: ['widgets', 'help', 'webkit'] }
Depends { name: "Core" }
Depends { name: "Find" }
diff --git a/src/plugins/qmldesigner/qmldesigner.qbs b/src/plugins/qmldesigner/qmldesigner.qbs
index c6dfb243baa..e77f8dbca52 100644
--- a/src/plugins/qmldesigner/qmldesigner.qbs
+++ b/src/plugins/qmldesigner/qmldesigner.qbs
@@ -5,6 +5,8 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "QmlDesigner"
+ condition: qtcore.versionMajor === 4
+ Depends { id: qtcore; name: "qt.core" }
Depends { name: "qt"; submodules: ['widgets', 'quick1'] }
Depends { name: "Core" }
Depends { name: "QmlJS" }
--
GitLab