diff --git a/qtcreator.qbp b/qtcreator.qbp
index 8e91007aa0dbc99a98906265afa994092cc173de..269b6a2642f1ab3361ac46c3d593d662d380898c 100644
--- a/qtcreator.qbp
+++ b/qtcreator.qbp
@@ -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" }
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index 44aef810c2f2dd8f45d6024372e24b435cef92b8..828c41f52f0fe4f442279bd81e6e8ea8c68d0094 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -17,7 +17,7 @@ QtcLibrary {
cpp.optimization: "fast"
Depends { name: "cpp" }
- Depends { name: "Qt.gui" }
+ Depends { name: "Qt.widgets" }
Group {
prefix: "../3rdparty/cplusplus/"
diff --git a/src/libs/extensionsystem/extensionsystem.qbs b/src/libs/extensionsystem/extensionsystem.qbs
index 13125b665105d511bafa50931d3e03641b323c06..04dcb590617fca5d1230cc95599dbffc82fbae42 100644
--- a/src/libs/extensionsystem/extensionsystem.qbs
+++ b/src/libs/extensionsystem/extensionsystem.qbs
@@ -14,7 +14,7 @@ QtcLibrary {
]
Depends { name: "cpp" }
- Depends { name: "Qt"; submodules: ["core", "gui"] }
+ Depends { name: "Qt"; submodules: ["core", "widgets"] }
Depends { name: "Aggregation" }
files: [
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
index bf8b1dec83f448335eed813f189f689f451e3165..935f58a34116bc4de1d9b6e375b8769d8ed48858 100644
--- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
@@ -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: [
diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs
index 46d6865171e1a0abf58516d42c71eaf160953699..ffd63925add6f0a27cc60b1083d904cc56fe2057 100644
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -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",
diff --git a/src/libs/qtcomponents/styleitem/styleitem.qbs b/src/libs/qtcomponents/styleitem/styleitem.qbs
index dfbc7d2bc886754ef2e1ba6e6904ce10f7f3cf67..5fa2f68af87cc43b7f9cabb1f8ba893bf82f2f8c 100644
--- a/src/libs/qtcomponents/styleitem/styleitem.qbs
+++ b/src/libs/qtcomponents/styleitem/styleitem.qbs
@@ -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",
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 19083fb1b5712b0b4bc209665bcf280afaca5047..2de9560084926b5575b79da4ab32b7c533f631a2 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: ['gui', 'network', 'script'] }
+ Depends { name: "Qt"; submodules: ['widgets', 'network', 'script'] }
Depends { name: "Botan" }
Depends { name: "app_version_header" }
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index 7b8f2ff30fd980ca3ae660079b2b2765b2eede90..ce2a5bc0aaa0a5cf4e1d92e3070e1ecb4c11d795 100644
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/src/plugins/analyzerbase/analyzerbase.qbs
@@ -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" }
diff --git a/src/plugins/bazaar/bazaar.qbs b/src/plugins/bazaar/bazaar.qbs
index 797529fcb34160864f83115a77596ac22b205dbe..a3450e8ac5439d6832e6956c0366ab5ccf54fc95 100644
--- a/src/plugins/bazaar/bazaar.qbs
+++ b/src/plugins/bazaar/bazaar.qbs
@@ -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" }
diff --git a/src/plugins/bineditor/bineditor.qbs b/src/plugins/bineditor/bineditor.qbs
index 60f7cf4d2c65b73d7a4d96226102a6ebda3a1874..f957a4b54d89e78994e866af7d51e3c7f0fa9928 100644
--- a/src/plugins/bineditor/bineditor.qbs
+++ b/src/plugins/bineditor/bineditor.qbs
@@ -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" }
diff --git a/src/plugins/bookmarks/bookmarks.qbs b/src/plugins/bookmarks/bookmarks.qbs
index fa82cd1179ea9ddeaac488d5861d547a6be602e1..90f04c71790f3bcfb8b55e3860cf9616258f96df 100644
--- a/src/plugins/bookmarks/bookmarks.qbs
+++ b/src/plugins/bookmarks/bookmarks.qbs
@@ -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" }
diff --git a/src/plugins/classview/classview.qbs b/src/plugins/classview/classview.qbs
index bd403fc787138eb571d1e94fdf7caef67feeae2c..4eb9bf1c4a00e14d9669160542fa4a26e5134903 100644
--- a/src/plugins/classview/classview.qbs
+++ b/src/plugins/classview/classview.qbs
@@ -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" }
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
index 20e56ef700b19da5af0a078b9d9d7a2bd04c30df..63b856dfc36226130950cd8c767cb49c27d9a169 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs
@@ -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" }
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 6fa9516b7840df7ba34496882d9bb36df3c21fc8..918a0e6f15291a625218f8a5fd2b4d2a3b6536e7 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -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" }
diff --git a/src/plugins/cpaster/cpaster.qbs b/src/plugins/cpaster/cpaster.qbs
index e847f5c62b2fda84794feb247ca515e8314452d3..fb57136f045b57fc0156b300adef2c4bc7533941 100644
--- a/src/plugins/cpaster/cpaster.qbs
+++ b/src/plugins/cpaster/cpaster.qbs
@@ -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" }
diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs
index 0a0772c2068cceb7c6045f855c6e144f7fca939c..62d495ed371da8b3c4a45cc4110d8f980752df18 100644
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/src/plugins/cppeditor/cppeditor.qbs
@@ -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" }
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index ad132ef7560b62496d8a36bc578ab1daecbfc4f9..2cede275951dc952d88a3ca382e5fdfa3d88bb6f 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -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" }
diff --git a/src/plugins/cvs/cvs.qbs b/src/plugins/cvs/cvs.qbs
index 604768f5d79f0837a1a7dd20138450fdfa54a576..f400b79b59c688d1ea726c6726573aec2e37728b 100644
--- a/src/plugins/cvs/cvs.qbs
+++ b/src/plugins/cvs/cvs.qbs
@@ -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" }
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index 4cf39f71e460227091bd5f2ab5238bdf49be2350..0a4d90c00133abaab29a81fe7bc2d875af7ac5e5 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -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" }
diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs
index ab38ea46f719b12a32a4d3d08ea344b26c1b71cc..45bcb80af1dcf93948a7d3633adaa7d7d2373977 100644
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -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" }
diff --git a/src/plugins/fakevim/fakevim.qbs b/src/plugins/fakevim/fakevim.qbs
index dec820c754a55e64c2a29c018bf411ec2824853d..a86e4d7d405dfdf21874f0455fa3523da966877a 100644
--- a/src/plugins/fakevim/fakevim.qbs
+++ b/src/plugins/fakevim/fakevim.qbs
@@ -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: [
"..",
diff --git a/src/plugins/find/find.qbs b/src/plugins/find/find.qbs
index 3fec6f850e9b6ab3086e8ee7443c21847f7a97d4..9b3858be34e19fc019be1abd879e27379853f701 100644
--- a/src/plugins/find/find.qbs
+++ b/src/plugins/find/find.qbs
@@ -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" }
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.qbs b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
index 5f92346c3e5ccc194d62d9a0caf5ae4fa2ea57d6..853c7e0845d008ef7698d91cff98e0f57fb3d55e 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.qbs
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.qbs
@@ -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" }
diff --git a/src/plugins/git/git.qbs b/src/plugins/git/git.qbs
index 9c3f307c63d9abe7b02cb0ff03181e539af95ac4..f18a6482f41a5998a590e8970abf12ab23775ac9 100644
--- a/src/plugins/git/git.qbs
+++ b/src/plugins/git/git.qbs
@@ -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" }
diff --git a/src/plugins/glsleditor/glsleditor.qbs b/src/plugins/glsleditor/glsleditor.qbs
index ae591c039fd4b7f286955d5e15acfce8f6ecac63..875515baa5f32a3378ca8351f4e196947b0111ab 100644
--- a/src/plugins/glsleditor/glsleditor.qbs
+++ b/src/plugins/glsleditor/glsleditor.qbs
@@ -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" }
diff --git a/src/plugins/helloworld/helloworld.qbs b/src/plugins/helloworld/helloworld.qbs
index e02cf01552791948749a51a678be86310bd0db81..2a8c5aa9ff3ccc7d2bee6b579a7b457cc35d8732 100644
--- a/src/plugins/helloworld/helloworld.qbs
+++ b/src/plugins/helloworld/helloworld.qbs
@@ -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: [
"..",
diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs
index 62c09e1d5ff0e2546dbf70410405b84c8c5f4fe8..88e6243410463bb0573a789046c3b2bf9e79fc6e 100644
--- a/src/plugins/help/help.qbs
+++ b/src/plugins/help/help.qbs
@@ -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" }
diff --git a/src/plugins/imageviewer/imageviewer.qbs b/src/plugins/imageviewer/imageviewer.qbs
index 7d7ad717617fb8cca06394d8fe6de0c72fbd73bf..4ae228e6b91eaaf2a478bff4b9f4ad4a3fe1085a 100644
--- a/src/plugins/imageviewer/imageviewer.qbs
+++ b/src/plugins/imageviewer/imageviewer.qbs
@@ -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" }
diff --git a/src/plugins/locator/locator.qbs b/src/plugins/locator/locator.qbs
index 467ae5b981a9ef96d5aa40edd7a23f22247b38e9..aa4f2131ef7229dd9e038ac7b3f786e46f8eb2de 100644
--- a/src/plugins/locator/locator.qbs
+++ b/src/plugins/locator/locator.qbs
@@ -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" }
diff --git a/src/plugins/macros/macros.qbs b/src/plugins/macros/macros.qbs
index 329404c73ef7e79c3eb542f0dccea47013e8dc88..ad49139fc50051e641d8094e30c172f37d5d8710 100644
--- a/src/plugins/macros/macros.qbs
+++ b/src/plugins/macros/macros.qbs
@@ -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" }
diff --git a/src/plugins/mercurial/mercurial.qbs b/src/plugins/mercurial/mercurial.qbs
index cf0495af48b8a44f1762148ab9fcb571645c4030..a69791cf3c4a27bf39c8f00766564b6d6751f636 100644
--- a/src/plugins/mercurial/mercurial.qbs
+++ b/src/plugins/mercurial/mercurial.qbs
@@ -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" }
diff --git a/src/plugins/perforce/perforce.qbs b/src/plugins/perforce/perforce.qbs
index e1bc71e92983294acfe5b02c650799e8553b14f8..e2ed72fed6589494c5cc5c2e93af4a2db961dab3 100644
--- a/src/plugins/perforce/perforce.qbs
+++ b/src/plugins/perforce/perforce.qbs
@@ -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" }
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index f559c571aa9e4188b796e0892b13008b3c6694a7..1e5816e5afe3d58baebb557af0ac6d30bca9383c 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -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" }
diff --git a/src/plugins/qmldesigner/qmldesigner.qbs b/src/plugins/qmldesigner/qmldesigner.qbs
index 459415fc2dff9fb62d00e1b99a8e6fb64d8c01f0..c6dfb243baa3060eaa375d5ce6e67c24fb902c24 100644
--- a/src/plugins/qmldesigner/qmldesigner.qbs
+++ b/src/plugins/qmldesigner/qmldesigner.qbs
@@ -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" }
diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs
index 320aac6de8faebd3e04f743789732a6405bd5443..0000d918ecc7d9005fc253d19d89a79da1553a9a 100644
--- a/src/plugins/qmljseditor/qmljseditor.qbs
+++ b/src/plugins/qmljseditor/qmljseditor.qbs
@@ -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" }
diff --git a/src/plugins/qmljsinspector/qmljsinspector.qbs b/src/plugins/qmljsinspector/qmljsinspector.qbs
index c2eb41dee206cedc322f906710387fc22b9d3752..08e742744bfe48862db5970e97cee74e4f5b4ec5 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.qbs
+++ b/src/plugins/qmljsinspector/qmljsinspector.qbs
@@ -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" }
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index a62978f0e41b7e168f8cfeba7877e6ed52987c59..5e3dd89419a07214b17426a66dd0dfda7a04fcb3 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -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" }
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs
index f4af4e4366312d718eef27cde31b2a69210ecec9..90500db5f49533cdae8316c544a42d2b5942fa7f 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -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" }
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
index 5148970783b00296db583a56d8e5b71d4c2b059b..ffc8a798cb35bba2ce0f53f95098f581a2a89e1b 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
@@ -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" }
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
index 885028a48ff420543fdaecf7ffdb1be989089093..8b26dd0e30739100cd0b4aa0cc8884427264b442 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.qbs
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
@@ -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" }
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index 76af762801c67034b27110b5f6a03eb185e71f21..dea0980077ca898accc41bf4de779655829f288f 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -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" }
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index fe4d63af7c606b530d4b51adb581dcd17818d6db..e3ae54956ce6b0777fec50d255f229c6d42949c7 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -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" }
diff --git a/src/plugins/resourceeditor/resourceeditor.qbs b/src/plugins/resourceeditor/resourceeditor.qbs
index 555637da166ad3c0c3018e1cfa63aa6c9c4cfeed..e49e2c953a92c5dbb86a44cb1e91b9390c16e55e 100644
--- a/src/plugins/resourceeditor/resourceeditor.qbs
+++ b/src/plugins/resourceeditor/resourceeditor.qbs
@@ -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: [
"..",
diff --git a/src/plugins/subversion/subversion.qbs b/src/plugins/subversion/subversion.qbs
index a012249099b64103a54e42966b240db66e2b32f2..34c892e7274e90c1d40c125694d8bc6724d07850 100644
--- a/src/plugins/subversion/subversion.qbs
+++ b/src/plugins/subversion/subversion.qbs
@@ -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" }
diff --git a/src/plugins/tasklist/tasklist.qbs b/src/plugins/tasklist/tasklist.qbs
index caaf0a2cd68aad80786907da2bedda054d93eb1a..e2f2658ef37846b2573c43c641bfc6efca55d115 100644
--- a/src/plugins/tasklist/tasklist.qbs
+++ b/src/plugins/tasklist/tasklist.qbs
@@ -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" }
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index 752535cfbf5fc8bb479a43b92e2f931f6a958138..f7e7ac494170ab91397d98bad2860a1727c294b6 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -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" }
diff --git a/src/plugins/todo/todo.qbs b/src/plugins/todo/todo.qbs
index 88ecffed7e1dc78a4b51d89b7a7f0b4bc2412150..ba1173fc64e53cd519cb7327741334db17a4c674 100644
--- a/src/plugins/todo/todo.qbs
+++ b/src/plugins/todo/todo.qbs
@@ -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" }
diff --git a/src/plugins/valgrind/valgrind.qbs b/src/plugins/valgrind/valgrind.qbs
index bdfc90c73751a610f70c656009647c8266a504c6..d7237fb9b5405d29b4c29fd9e7f371efb1bcda00 100644
--- a/src/plugins/valgrind/valgrind.qbs
+++ b/src/plugins/valgrind/valgrind.qbs
@@ -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" }
diff --git a/src/plugins/vcsbase/vcsbase.qbs b/src/plugins/vcsbase/vcsbase.qbs
index f7e239c4ff417aab56d10f30630e03e37606e0b9..ce191bea9da21143e10ae85e2c48b10bb2a11f6a 100644
--- a/src/plugins/vcsbase/vcsbase.qbs
+++ b/src/plugins/vcsbase/vcsbase.qbs
@@ -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" }
diff --git a/src/plugins/welcome/welcome.qbs b/src/plugins/welcome/welcome.qbs
index 83b9d933e75c3d16079a5868a3b39b69d8fe61e7..985d8f51fa365ebfb5ee63573870b2f0e479b787 100644
--- a/src/plugins/welcome/welcome.qbs
+++ b/src/plugins/welcome/welcome.qbs
@@ -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" }
diff --git a/tests/manual/utils/tcpportsgatherer/tcpportsgatherer.qbp b/tests/manual/utils/tcpportsgatherer/tcpportsgatherer.qbp
index e909add0d79e6a9657488e2648162ab8353a5eba..4a491ff5eb0bad6c046eced1ec40896ff6e0eca2 100644
--- a/tests/manual/utils/tcpportsgatherer/tcpportsgatherer.qbp
+++ b/tests/manual/utils/tcpportsgatherer/tcpportsgatherer.qbp
@@ -20,5 +20,5 @@ Application {
}
Depends { name: "cpp" }
- Depends { name: "Qt"; submodules: ["gui"] }
+ Depends { name: "Qt"; submodules: ["widgets"] }
}