Commit 96a7fbe3 authored by Joerg Bornemann's avatar Joerg Bornemann

qbs files: use Qt5 module dependencies

Renamed gui -> widgets.
Renamed declarative -> quick1.

With qbs the usage of qt.widgets and qt.quick1 with Qt4 is supported.

Change-Id: I6cadaf34527f1f880d74ced7d2d18dd9801b7de1
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@nokia.com>
parent b8d69b37
......@@ -135,7 +135,7 @@ Project {
Depends { name: "app_version_header" }
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["gui", "network"] }
Depends { name: "Qt"; submodules: ["widgets", "network"] }
Depends { name: "Utils" }
Depends { name: "ExtensionSystem" }
......
......@@ -17,7 +17,7 @@ QtcLibrary {
cpp.optimization: "fast"
Depends { name: "cpp" }
Depends { name: "Qt.gui" }
Depends { name: "Qt.widgets" }
Group {
prefix: "../3rdparty/cplusplus/"
......
......@@ -14,7 +14,7 @@ QtcLibrary {
]
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["core", "gui"] }
Depends { name: "Qt"; submodules: ["core", "widgets"] }
Depends { name: "Aggregation" }
files: [
......
......@@ -17,7 +17,7 @@ QtcLibrary {
cpp.optimization: "fast"
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["gui", "declarative", "script"] }
Depends { name: "Qt"; submodules: ["widgets", "quick1", "script"] }
Depends { name: "QmlJS" }
files: [
......
......@@ -18,7 +18,7 @@ QtcLibrary {
Depends { name: "Utils" }
Depends { name: "LanguageUtils" }
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ['gui', 'script'] }
Depends { name: "Qt"; submodules: ['widgets', 'script'] }
files: [
"qmljs.qrc",
......
......@@ -5,7 +5,7 @@ DynamicLibrary {
destination: "lib/qtcreator/qtcomponents/plugin"
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ['core', 'gui', 'declarative', 'script'] }
Depends { name: "Qt"; submodules: ['core', 'widgets', 'quick1', 'script'] }
files: [
"qdeclarativefolderlistmodel.cpp",
......
......@@ -18,7 +18,7 @@ QtcLibrary {
}
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ['gui', 'network', 'script'] }
Depends { name: "Qt"; submodules: ['widgets', 'network', 'script'] }
Depends { name: "Botan" }
Depends { name: "app_version_header" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "AnalyzerBase"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "CppTools" }
Depends { name: "RemoteLinux" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Bazaar"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "Find" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "BinEditor"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "Find" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Bookmarks"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "ClassView"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "CppTools" }
Depends { name: "CPlusPlus" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "CMakeProjectManager"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "CppTools" }
......
......@@ -4,7 +4,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Core"
Depends { name: "qt"; submodules: ['core', 'gui', 'xml', 'network', 'script', 'sql', 'help'] }
Depends { name: "qt"; submodules: ['core', 'widgets', 'xml', 'network', 'script', 'sql', 'help'] }
Depends { name: "Utils" }
Depends { name: "ExtensionSystem" }
Depends { name: "Aggregation" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "CodePaster"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "TextEditor" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "CppEditor"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "CppTools" }
Depends { name: "CPlusPlus" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "CppTools"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "Find" }
Depends { name: "TextEditor" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "CVS"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "Find" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Debugger"
Depends { name: "qt"; submodules: ['gui', 'network', 'script'] }
Depends { name: "qt"; submodules: ['widgets', 'network', 'script'] }
Depends { name: "Core" }
Depends { name: "CppTools" }
Depends { name: "Find" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Designer"
Depends { name: "qt"; submodules: ['gui', 'xml', 'designer', 'designercomponents'] }
Depends { name: "qt"; submodules: ['widgets', 'xml', 'designer', 'designercomponents'] }
Depends { name: "Core" }
Depends { name: "CPlusPlus" }
Depends { name: "CppTools" }
......
......@@ -9,7 +9,7 @@ QtcPlugin {
Depends { name: "TextEditor" }
Depends { name: "Find" }
Depends { name: "cpp" }
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
cpp.includePaths: [
"..",
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Find"
Depends { name: "qt"; submodules: ['gui', 'xml', 'network', 'script'] }
Depends { name: "qt"; submodules: ['widgets', 'xml', 'network', 'script'] }
Depends { name: "Core" }
Depends { name: "cpp" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "GenericProjectManager"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "CPlusPlus" }
Depends { name: "CppTools" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Git"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "Find" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "GLSLEditor"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
......
......@@ -7,7 +7,7 @@ QtcPlugin {
Depends { name: "Core" }
Depends { name: "cpp" }
Depends { name: "qt"; submodules: ['gui', 'xml', 'network', 'script'] }
Depends { name: "qt"; submodules: ['widgets', 'xml', 'network', 'script'] }
cpp.includePaths: [
"..",
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Help"
Depends { name: "qt"; submodules: ['gui', 'help', 'webkit'] }
Depends { name: "qt"; submodules: ['widgets', 'help', 'webkit'] }
Depends { name: "Core" }
Depends { name: "Find" }
Depends { name: "Locator" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "ImageViewer"
Depends { name: "qt"; submodules: ['gui', 'svg'] }
Depends { name: "qt"; submodules: ['widgets', 'svg'] }
Depends { name: "Core" }
Depends { name: "cpp" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Locator"
Depends { name: "qt"; submodules: ['gui', 'xml', 'network', 'script'] }
Depends { name: "qt"; submodules: ['widgets', 'xml', 'network', 'script'] }
Depends { name: "Core" }
Depends { name: "cpp" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Macros"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "Locator" }
Depends { name: "Find" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Mercurial"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "Find" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Perforce"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "Find" }
......
......@@ -4,7 +4,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "ProjectExplorer"
Depends { name: "qt"; submodules: ['gui', 'xml', 'network', 'script', 'declarative'] }
Depends { name: "qt"; submodules: ['widgets', 'xml', 'network', 'script', 'quick1'] }
Depends { name: "Core" }
Depends { name: "Locator" }
Depends { name: "Find" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "QmlDesigner"
Depends { name: "qt"; submodules: ['gui', 'declarative'] }
Depends { name: "qt"; submodules: ['widgets', 'quick1'] }
Depends { name: "Core" }
Depends { name: "QmlJS" }
Depends { name: "QmlEditorWidgets" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "QmlJSEditor"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "QmlJSInspector"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "QmlProjectManager" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "QmlJSTools"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "LanguageUtils" }
Depends { name: "CppTools" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "QmlProfiler"
Depends { name: "qt"; submodules: ['gui', 'network', 'script', 'declarative'] }
Depends { name: "qt"; submodules: ['widgets', 'network', 'script', 'quick1'] }
Depends { name: "Core" }
Depends { name: "AnalyzerBase" }
Depends { name: "QmlProjectManager" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "QmlProjectManager"
Depends { name: "qt"; submodules: ['gui', 'declarative'] }
Depends { name: "qt"; submodules: ['widgets', 'quick1'] }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Qt4ProjectManager"
Depends { name: "qt"; submodules: ['gui', 'network'] }
Depends { name: "qt"; submodules: ['widgets', 'network'] }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "QtSupport" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "QtSupport"
Depends { name: "qt"; submodules: ['gui', 'declarative'] }
Depends { name: "qt"; submodules: ['widgets', 'quick1'] }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "RemoteLinux"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "Debugger" }
Depends { name: "ProjectExplorer" }
......
......@@ -7,7 +7,7 @@ QtcPlugin {
Depends { name: "Core" }
Depends { name: "cpp" }
Depends { name: "qt"; submodules: ['gui', 'xml'] }
Depends { name: "qt"; submodules: ['widgets', 'xml'] }
cpp.includePaths: [
"..",
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Subversion"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "Find" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "TaskList"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
Depends { name: "Find" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "TextEditor"
Depends { name: "qt"; submodules: ['gui', 'xml', 'network', 'script'] }
Depends { name: "qt"; submodules: ['widgets', 'xml', 'network', 'script'] }
Depends { name: "Find" }
Depends { name: "Locator" }
Depends { name: "Core" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Todo"
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "Core" }
Depends { name: "TextEditor" }
Depends { name: "ProjectExplorer" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Valgrind"
Depends { name: "qt"; submodules: ['gui', 'network'] }
Depends { name: "qt"; submodules: ['widgets', 'network'] }
Depends { name: "Core" }
Depends { name: "AnalyzerBase" }
Depends { name: "ProjectExplorer" }
......
......@@ -10,7 +10,7 @@ QtcPlugin {
Depends { name: "ProjectExplorer" }
Depends { name: "Find" }
Depends { name: "cpp" }
Depends { name: "qt"; submodules: ['gui'] }
Depends { name: "qt"; submodules: ['widgets'] }
Depends { name: "CppTools" }
Depends { name: "CPlusPlus" }
......
......@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "Welcome"
Depends { name: "qt"; submodules: ['gui', 'network', 'declarative'] }
Depends { name: "qt"; submodules: ['widgets', 'network', 'quick1'] }
Depends { name: "Core" }
Depends { name: "ProjectExplorer" }
......
......@@ -20,5 +20,5 @@ Application {
}
Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["gui"] }
Depends { name: "Qt"; submodules: ["widgets"] }
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment