diff --git a/qbs/pluginspec/pluginspec.qbs b/qbs/pluginspec/pluginspec.qbs
index f5873825064..0e616df3383 100644
--- a/qbs/pluginspec/pluginspec.qbs
+++ b/qbs/pluginspec/pluginspec.qbs
@@ -2,7 +2,7 @@ import qbs.base 1.0
 import qbs.fileinfo 1.0 as FileInfo
 
 Module {
-    Depends { id: qtcore; name: "qt.core" }
+    Depends { id: qtcore; name: "Qt.core" }
 
     additionalProductFileTags: qtcore.versionMajor < 5 ? ["pluginSpec"] : ["pluginJSON"]
     property int ide_version_major: project.ide_version_major
@@ -49,7 +49,7 @@ Module {
                 var inf = new TextFile(input.fileName);
                 var all = inf.readAll();
                 // replace quoted quotes
-                all = all.replace(/\\\"/g, "\"");
+                all = all.replace(/\\\"/g, '"');
                 // replace config vars
                 vars['QTCREATOR_VERSION'] = qtcreator_version;
                 vars['IDE_VERSION_MAJOR'] = ide_version_major;
@@ -83,8 +83,11 @@ Module {
             var xslFile = project.path + "/src/pluginjsonmetadata.xsl";
             var xmlPatternsPath = product.modules["qt/core"].binPath + "/xmlpatterns";
             var args = [
-                "-no-format", "-output", output.fileName,
-                xslFile, input.fileName
+                "-no-format",
+                "-output",
+                output.fileName,
+                xslFile,
+                input.fileName
             ];
             var cmd = new Command(xmlPatternsPath, args);
             cmd.description = "generating " + FileInfo.fileName(output.fileName);
diff --git a/qtcreator.qbp b/qtcreator.qbp
index 25cf53c4fed..36e742ae5e2 100644
--- a/qtcreator.qbp
+++ b/qtcreator.qbp
@@ -106,7 +106,7 @@ Project {
                     var file = new TextFile(input.fileName);
                     var content = file.readAll();
                     // replace quoted quotes
-                    content = content.replace(/\\\"/g, "\"");
+                    content = content.replace(/\\\"/g, '"');
                     // replace Windows line endings
                     if (onWindows)
                         content = content.replace(/\r\n/g, "\n");
diff --git a/src/libs/3rdparty/botan/botan.qbs b/src/libs/3rdparty/botan/botan.qbs
index 1cb68930dce..74f8c420a86 100644
--- a/src/libs/3rdparty/botan/botan.qbs
+++ b/src/libs/3rdparty/botan/botan.qbs
@@ -5,14 +5,16 @@ QtcLibrary {
     name: "Botan"
 
     Depends { name: "cpp" }
-    Depends { name: "qt"; submodules: 'core' }
+    Depends { name: "Qt.core" }
 
-    cpp.includePaths: ["build", "src"]
+    cpp.includePaths: [
+        "build",
+        "src"
+    ]
     cpp.dynamicLibraries: {
-        if (qbs.targetOS == 'linux' || qbs.targetOS == 'freebsd') {
-            return ['rt']
-        }
-        else if (qbs.targetOS == 'windows') {
+        if (qbs.targetOS == "linux" || qbs.targetOS == "freebsd") {
+            return ["rt"]
+        } else if (qbs.targetOS == "windows") {
             return [
                 "advapi32",
                 "user32"
@@ -22,17 +24,17 @@ QtcLibrary {
 
     cpp.defines: {
         var result = []
-        if (qbs.toolchain == 'msvc2005' || qbs.toolchain == 'msvc2008' || qbs.toolchain == 'msvc2010')
-            result.push('BOTAN_DLL=__declspec(dllexport)')
+        if (qbs.toolchain == "msvc2005" || qbs.toolchain == "msvc2008" || qbs.toolchain == "msvc2010")
+            result.push("BOTAN_DLL=__declspec(dllexport)")
         return result
     }
 
     Properties {
-        condition: qbs.toolchain === 'mingw'
+        condition: qbs.toolchain == "mingw"
         cpp.cxxFlags: [
-            '-fpermissive',
-            '-finline-functions',
-            '-Wno-long-long'
+            "-fpermissive",
+            "-finline-functions",
+            "-Wno-long-long"
         ]
     }
 
@@ -500,7 +502,7 @@ QtcLibrary {
     }
 
     Group {
-        condition: qbs.targetOS == "linux" || qbs.targetOS == 'mac'
+        condition: qbs.targetOS == "linux" || qbs.targetOS == "mac"
         files: [
             "src/alloc/alloc_mmap/mmap_mem.cpp",
             "src/cert/cvc/asn1_eac_str.cpp",
@@ -545,8 +547,8 @@ QtcLibrary {
     ProductModule {
         Depends { name: "cpp" }
         cpp.linkerFlags: {
-            if (qbs.toolchain === 'mingw') {
-                return ['--enable-auto-import']
+            if (qbs.toolchain == "mingw") {
+                return ["--enable-auto-import"]
             }
         }
     }
diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs
index 81cb4c1b0e9..a8e02d738ac 100644
--- a/src/libs/QtcLibrary.qbs
+++ b/src/libs/QtcLibrary.qbs
@@ -2,7 +2,7 @@ import qbs.base 1.0
 
 DynamicLibrary {
     destination: {
-        if (qbs.targetOS === "windows")
+        if (qbs.targetOS == "windows")
             return "bin"
         else
             return "lib/qtcreator"
diff --git a/src/libs/glsl/glsl.qbs b/src/libs/glsl/glsl.qbs
index e0a57520d5e..506b709c252 100644
--- a/src/libs/glsl/glsl.qbs
+++ b/src/libs/glsl/glsl.qbs
@@ -17,13 +17,34 @@ QtcLibrary {
     Depends { name: "Qt.gui" }
 
     files: [
-        "glsl.h", "glsllexer.h", "glslparser.h", "glslparsertable_p.h", "glslast.h",
-        "glslastvisitor.h", "glslengine.h", "glslmemorypool.h", "glslastdump.h",
-        "glslsemantic.h", "glsltype.h", "glsltypes.h", "glslsymbol.h", "glslsymbols.h",
-        "glslkeywords.cpp", "glslparser.cpp", "glslparsertable.cpp",
-        "glsllexer.cpp", "glslast.cpp",
-        "glslastvisitor.cpp", "glslengine.cpp", "glslmemorypool.cpp", "glslastdump.cpp",
-        "glslsemantic.cpp", "glsltype.cpp", "glsltypes.cpp", "glslsymbol.cpp", "glslsymbols.cpp",
+        "glsl.h",
+        "glsllexer.h",
+        "glslparser.h",
+        "glslparsertable_p.h",
+        "glslast.h",
+        "glslastvisitor.h",
+        "glslengine.h",
+        "glslmemorypool.h",
+        "glslastdump.h",
+        "glslsemantic.h",
+        "glsltype.h",
+        "glsltypes.h",
+        "glslsymbol.h",
+        "glslsymbols.h",
+        "glslkeywords.cpp",
+        "glslparser.cpp",
+        "glslparsertable.cpp",
+        "glsllexer.cpp",
+        "glslast.cpp",
+        "glslastvisitor.cpp",
+        "glslengine.cpp",
+        "glslmemorypool.cpp",
+        "glslastdump.cpp",
+        "glslsemantic.cpp",
+        "glsltype.cpp",
+        "glsltypes.cpp",
+        "glslsymbol.cpp",
+        "glslsymbols.cpp",
         "glsl.g"
     ]
 
diff --git a/src/libs/qmldebug/qmldebug.qbs b/src/libs/qmldebug/qmldebug.qbs
index b64a2b32d79..d3ee4bfa5ef 100644
--- a/src/libs/qmldebug/qmldebug.qbs
+++ b/src/libs/qmldebug/qmldebug.qbs
@@ -13,8 +13,7 @@ QtcLibrary {
     ]
 
     Depends { name: "cpp" }
-    Depends { name: "Qt.gui" }
-    Depends { name: "Qt.network" }
+    Depends { name: "Qt"; submodules: ["gui", "network"] }
     Depends { name: "symbianutils" }
 
     files: [
@@ -50,9 +49,7 @@ QtcLibrary {
     ProductModule {
         Depends { name: "cpp" }
         Depends { name: "symbianutils" }
-        cpp.includePaths: [
-            "."
-        ]
+        cpp.includePaths: ["."]
     }
 }
 
diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs
index 67eed55cca1..68e2e5666be 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: ['widgets', '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 5fa2f68af87..1ab8d83e5cd 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', 'widgets', 'quick1', 'script'] }
+    Depends { name: "Qt"; submodules: ["core", "widgets", "quick1", "script"] }
 
     files: [
         "qdeclarativefolderlistmodel.cpp",
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs
index 38bdea1b408..386f922ecee 100644
--- a/src/libs/ssh/ssh.qbs
+++ b/src/libs/ssh/ssh.qbs
@@ -5,14 +5,16 @@ QtcLibrary {
     name: "QtcSsh"
 
     cpp.defines: ["QSSH_LIBRARY"]
-    cpp.includePaths: [ ".", "..",
+    cpp.includePaths: [
+        ".",
+        "..",
         "../..",
         "../3rdparty/botan/build",
         buildDirectory
     ]
 
     Depends { name: "cpp" }
-    Depends { name: "Qt"; submodules: ['widgets', 'network' ] }
+    Depends { name: "Qt"; submodules: ["widgets", "network" ] }
     Depends { name: "Botan" }
 
     files: [
@@ -50,6 +52,6 @@ QtcLibrary {
     ProductModule {
         Depends { name: "cpp" }
         Depends { name: "Qt"; submodules: ["widgets", "network"] }
-        cpp.includePaths: ".."
+        cpp.includePaths: [".."]
     }
 }
diff --git a/src/libs/symbianutils/symbianutils.qbs b/src/libs/symbianutils/symbianutils.qbs
index 9138a66b423..be98849bd81 100644
--- a/src/libs/symbianutils/symbianutils.qbs
+++ b/src/libs/symbianutils/symbianutils.qbs
@@ -20,7 +20,7 @@ QtcLibrary {
     cpp.optimization: "fast"
 
     Depends { name: "cpp" }
-    Depends { name: "Qt"; submodules: ["network"]}
+    Depends { name: "Qt.network" }
     Depends { name: "Utils" }
 
     Group {
diff --git a/src/libs/utils/process_ctrlc_stub.qbs b/src/libs/utils/process_ctrlc_stub.qbs
index 83f0e3ee7d2..5d641710156 100644
--- a/src/libs/utils/process_ctrlc_stub.qbs
+++ b/src/libs/utils/process_ctrlc_stub.qbs
@@ -4,11 +4,14 @@ import "../../tools/QtcTool.qbs" as QtcTool
 QtcTool {
     name: "qtcreator_ctrlc_stub"
     consoleApplication: true
-    condition: qbs.targetOS === "windows"
+    condition: qbs.targetOS == "windows"
 
     Depends { name: "cpp" }
 
     files: [ "process_ctrlc_stub.cpp" ]
 
-    cpp.dynamicLibraries: [ "user32.lib", "shell32.lib" ]
+    cpp.dynamicLibraries: [
+        "user32.lib",
+        "shell32.lib"
+    ]
 }
diff --git a/src/libs/utils/process_stub.qbs b/src/libs/utils/process_stub.qbs
index 4b63167d452..e101be7378c 100644
--- a/src/libs/utils/process_stub.qbs
+++ b/src/libs/utils/process_stub.qbs
@@ -8,7 +8,7 @@ QtcTool {
     Depends { name: "cpp" }
 
     files: {
-        if (qbs.targetOS === "windows") {
+        if (qbs.targetOS == "windows") {
             return [ "process_stub_win.c" ]
         } else {
             return [ "process_stub_unix.c" ]
@@ -16,7 +16,7 @@ QtcTool {
     }
 
     cpp.dynamicLibraries: {
-        if (qbs.targetOS === "windows") {
+        if (qbs.targetOS == "windows") {
             return [ "shell32.lib" ]
         }
     }
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index eec5d9ee116..7f977debcb6 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -5,22 +5,28 @@ QtcLibrary {
     name: "Utils"
 
     cpp.defines: ["QTCREATOR_UTILS_LIB"]
-    cpp.includePaths: [ ".", "..",
+    cpp.includePaths: [
+        ".",
+        "..",
         "../..",
         buildDirectory
     ]
 
     Properties {
         condition: qbs.targetOS == "windows"
-        cpp.dynamicLibraries: ["user32", "iphlpapi", "ws2_32"]
+        cpp.dynamicLibraries: [
+            "user32",
+            "iphlpapi",
+            "ws2_32"
+        ]
     }
     Properties {
-        condition: qbs.targetOS === "linux"
+        condition: qbs.targetOS == "linux"
         cpp.dynamicLibraries: ["X11"]
     }
 
     Depends { name: "cpp" }
-    Depends { name: "Qt"; submodules: ['widgets', 'network', 'script', 'concurrent'] }
+    Depends { name: "Qt"; submodules: ["widgets", "network", "script", "concurrent"] }
     Depends { name: "app_version_header" }
 
     files: [
diff --git a/src/libs/zeroconf/zeroconf.qbs b/src/libs/zeroconf/zeroconf.qbs
index 08b72b0cb4c..a3e3d931a54 100644
--- a/src/libs/zeroconf/zeroconf.qbs
+++ b/src/libs/zeroconf/zeroconf.qbs
@@ -25,9 +25,12 @@ QtcLibrary {
     }
 
     files: [
-        "servicebrowser.cpp", "servicebrowser.h", "servicebrowser_p.h",
+        "servicebrowser.cpp",
+        "servicebrowser.h",
+        "servicebrowser_p.h",
         "embeddedLib.cpp",
-        "mdnsderived.cpp", "mdnsderived.h",
+        "mdnsderived.cpp",
+        "mdnsderived.h",
         "avahiLib.cpp",
         "dnsSdLib.cpp",
         "dns_sd_types.h",
@@ -37,6 +40,6 @@ QtcLibrary {
 
     ProductModule {
         Depends { name: "cpp" }
-        cpp.includePaths: "."
+        cpp.includePaths: ["."]
     }
 }
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index aa67cdcba57..408cae42825 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: ['widgets'] }
+    Depends { name: "Qt.widgets" }
     Depends { name: "Core" }
     Depends { name: "CppTools" }
     Depends { name: "RemoteLinux" }
@@ -13,7 +13,10 @@ QtcPlugin {
     Depends { name: "TextEditor" }
 
     Depends { name: "cpp" }
-    cpp.defines: ["ANALYZER_LIBRARY", "QT_NO_CAST_FROM_ASCII"]
+    cpp.defines: [
+        "ANALYZER_LIBRARY",
+        "QT_NO_CAST_FROM_ASCII"
+    ]
     cpp.includePaths: [
         "..",
         "../../libs",
@@ -55,9 +58,7 @@ QtcPlugin {
 
     ProductModule {
         Depends { name: "cpp" }
-        cpp.includePaths: [
-            "."
-        ]
+        cpp.includePaths: ["."]
 
         Depends { name: "CPlusPlus" }
     }
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index 49494395036..f4b43ad7197 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -10,7 +10,7 @@ QtcPlugin {
     Depends { name: "Qt4ProjectManager" }
     Depends { name: "Debugger" }
     Depends { name: "QtSupport" }
-    Depends { name: "qt"; submodules: ['widgets', 'xml', 'network'] }
+    Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
 
     property bool enable: false
     property var pluginspecreplacements: ({"ANDROID_EXPERIMENTAL_STR": (enable ? "false": "true")})
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
index ae2eb61d0bd..c4925be4a16 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs
@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
 QtcPlugin {
     name: "AutotoolsProjectManager"
 
-    Depends { name: "qt"; submodules: ['widgets'] }
+    Depends { name: "Qt.widgets" }
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "QtSupport" }
diff --git a/src/plugins/bazaar/bazaar.qbs b/src/plugins/bazaar/bazaar.qbs
index a3450e8ac54..4271a0d0eba 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: ['widgets'] }
+    Depends { name: "Qt.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 f957a4b54d8..b2fd675be86 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: ['widgets'] }
+    Depends { name: "Qt.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 90f04c71790..0fa44b71944 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: ['widgets'] }
+    Depends { name: "Qt.widgets" }
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
@@ -31,6 +31,3 @@ QtcPlugin {
     ]
 }
 
-
-
-
diff --git a/src/plugins/classview/classview.qbs b/src/plugins/classview/classview.qbs
index 4eb9bf1c4a0..a7ad4a23c23 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: ['widgets'] }
+    Depends { name: "Qt.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 7af081a2ffb..e0e8b6c0e76 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: ['widgets'] }
+    Depends { name: "Qt.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 52e4a228601..b580c4c54d9 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -5,10 +5,9 @@ QtcPlugin {
     name: "Core"
 
     Depends {
-        name: "qt"
+        name: "Qt"
         submodules: [
-            'core', 'widgets', 'xml', 'network',
-            'script', 'sql', 'help', 'printsupport'
+            "core", "widgets", "xml", "network", "script", "sql", "help", "printsupport"
         ]
     }
     Depends { name: "Utils" }
@@ -30,7 +29,7 @@ QtcPlugin {
     ]
 
     cpp.dynamicLibraries: {
-        if (qbs.targetOS == 'windows') return [
+        if (qbs.targetOS == "windows") return [
             "ole32"
         ]
     }
diff --git a/src/plugins/cpaster/cpaster.qbs b/src/plugins/cpaster/cpaster.qbs
index 230d02a127e..30208fe4773 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: ['widgets', 'network'] }
+    Depends { name: "Qt"; submodules: ["widgets", "network"] }
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
 
diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs
index 62d495ed371..8b9295c940a 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: ['widgets'] }
+    Depends { name: "Qt.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 2cede275951..709f1edecb4 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: ['widgets'] }
+    Depends { name: "Qt.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 f400b79b59c..f45ca0a576d 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: ['widgets'] }
+    Depends { name: "Qt.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 dc7b9ce43c2..ca68ebc7b6a 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: ['widgets', 'network', 'script'] }
+    Depends { name: "Qt"; submodules: ["widgets", "network", "script"] }
     Depends { name: "Core" }
     Depends { name: "CppTools" }
     Depends { name: "QmlJSTools" }
diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs
index 278a3886bf5..19769a0ad72 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: ['widgets', 'xml', 'printsupport', 'designer', 'designercomponents'] }
+    Depends { name: "Qt"; submodules: ["widgets", "xml", "printsupport", "designer", "designercomponents"] }
     Depends { name: "Core" }
     Depends { name: "CPlusPlus" }
     Depends { name: "CppTools" }
@@ -89,6 +89,3 @@ QtcPlugin {
     ]
 }
 
-
-
-
diff --git a/src/plugins/fakevim/fakevim.qbs b/src/plugins/fakevim/fakevim.qbs
index a86e4d7d405..600bd96ff0a 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: ['widgets'] }
+    Depends { name: "Qt.widgets" }
 
     cpp.includePaths: [
         "..",
diff --git a/src/plugins/find/find.qbs b/src/plugins/find/find.qbs
index 9b3858be34e..560bb28fda7 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: ['widgets', '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 a498e45f413..e4070e88e69 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: ['widgets'] }
+    Depends { name: "Qt.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 3b05df1a784..64ce4ff9052 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: ['widgets', 'network'] }
+    Depends { name: "Qt"; submodules: ["widgets", "network"] }
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "Find" }
diff --git a/src/plugins/glsleditor/glsleditor.qbs b/src/plugins/glsleditor/glsleditor.qbs
index 875515baa5f..3df8879e6f3 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: ['widgets'] }
+    Depends { name: "Qt.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 2a8c5aa9ff3..d71e157d85e 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: ['widgets', 'xml', 'network', 'script'] }
+    Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
 
     cpp.includePaths: [
         "..",
diff --git a/src/plugins/imageviewer/imageviewer.qbs b/src/plugins/imageviewer/imageviewer.qbs
index 4ae228e6b91..a40c0686f6f 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: ['widgets', 'svg'] }
+    Depends { name: "Qt"; submodules: ["widgets", "svg"] }
     Depends { name: "Core" }
 
     Depends { name: "cpp" }
@@ -35,6 +35,3 @@ QtcPlugin {
     ]
 }
 
-
-
-
diff --git a/src/plugins/locator/locator.qbs b/src/plugins/locator/locator.qbs
index aa4f2131ef7..651fece80ac 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: ['widgets', '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 ad49139fc50..1712dc56613 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: ['widgets'] }
+    Depends { name: "Qt.widgets" }
     Depends { name: "Core" }
     Depends { name: "Locator" }
     Depends { name: "Find" }
@@ -54,6 +54,3 @@ QtcPlugin {
     ]
 }
 
-
-
-
diff --git a/src/plugins/mercurial/mercurial.qbs b/src/plugins/mercurial/mercurial.qbs
index a69791cf3c4..3875ddd979c 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: ['widgets'] }
+    Depends { name: "Qt.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 e2ed72fed65..9c4c3d881b8 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: ['widgets'] }
+    Depends { name: "Qt.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 619921af8c1..a59814d7744 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: ['widgets', 'xml', 'network', 'script', 'quick1'] }
+    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 e77f8dbca52..42161cb6f1a 100644
--- a/src/plugins/qmldesigner/qmldesigner.qbs
+++ b/src/plugins/qmldesigner/qmldesigner.qbs
@@ -5,9 +5,9 @@ import "../QtcPlugin.qbs" as QtcPlugin
 QtcPlugin {
     name: "QmlDesigner"
 
-    condition: qtcore.versionMajor === 4
-    Depends { id: qtcore; name: "qt.core" }
-    Depends { name: "qt"; submodules: ['widgets', 'quick1'] }
+    condition: qtcore.versionMajor == 4
+    Depends { id: qtcore; name: "Qt.core" }
+    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 05b29268389..b78578ca995 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: ['widgets', 'script'] }
+    Depends { name: "Qt"; submodules: ["widgets", "script"] }
     Depends { name: "Core" }
     Depends { name: "TextEditor" }
     Depends { name: "ProjectExplorer" }
@@ -26,7 +26,7 @@ QtcPlugin {
     ]
 
     files: [
-         "qmljseditor.qrc",
+        "qmljseditor.qrc",
         "quicktoolbarsettingspage.ui",
         "QmlJSEditor.mimetypes.xml",
         "jsfilewizard.cpp",
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index 4c635ff1969..2d5d58c64f4 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: ['widgets'] }
+    Depends { name: "Qt.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 002d4a68622..6e2f9f2954f 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: ['widgets', 'network', 'script', 'quick1'] }
+    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 ffc8a798cb3..52b421c1237 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: ['widgets', 'quick1'] }
+    Depends { name: "Qt"; submodules: ["widgets", "quick1"] }
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
@@ -58,6 +58,3 @@ QtcPlugin {
     ]
 }
 
-
-
-
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
index 4e54c5135e3..30882526952 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: ['widgets', '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 04ffb0989da..835d9987b72 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: ['widgets', 'quick1'] }
+    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 0d0ff695177..bad03535f8a 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: ['widgets'] }
+    Depends { name: "Qt.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 e2378c3b002..630f21ac31c 100644
--- a/src/plugins/resourceeditor/resourceeditor.qbs
+++ b/src/plugins/resourceeditor/resourceeditor.qbs
@@ -8,7 +8,7 @@ QtcPlugin {
     Depends { name: "Core" }
     Depends { name: "Find" }
     Depends { name: "cpp" }
-    Depends { name: "qt"; submodules: ['widgets', 'xml'] }
+    Depends { name: "Qt"; submodules: ["widgets", "xml"] }
 
     cpp.includePaths: [
         "..",
diff --git a/src/plugins/subversion/subversion.qbs b/src/plugins/subversion/subversion.qbs
index 34c892e7274..bed2a9aea38 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: ['widgets'] }
+    Depends { name: "Qt.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 e2f2658ef37..8dc99abeae8 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: ['widgets'] }
+    Depends { name: "Qt.widgets" }
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "Find" }
@@ -35,6 +35,3 @@ QtcPlugin {
     ]
 }
 
-
-
-
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index 82363991b52..fc8d3957796 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: ['widgets', 'xml', 'network', 'script', 'printsupport'] }
+    Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script", "printsupport"] }
     Depends { name: "cpp" }
     Depends { name: "Core" }
     Depends { name: "Find" }
diff --git a/src/plugins/todo/todo.qbs b/src/plugins/todo/todo.qbs
index 47e28f01c69..8629356c0e2 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: ['widgets'] }
+    Depends { name: "Qt.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 d7237fb9b54..fbe239f0dfc 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: ['widgets', '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 ce191bea9da..3b2833acf8f 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: ['widgets'] }
+    Depends { name: "Qt.widgets" }
     Depends { name: "CppTools" }
     Depends { name: "CPlusPlus" }
 
diff --git a/src/plugins/welcome/welcome.qbs b/src/plugins/welcome/welcome.qbs
index 985d8f51fa3..bb975867df0 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: ['widgets', 'network', 'quick1'] }
+    Depends { name: "Qt"; submodules: ["widgets", "network", "quick1"] }
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
 
diff --git a/src/tools/mdnssd/mdnssd.qbs b/src/tools/mdnssd/mdnssd.qbs
index 0eb21955b1b..28f4b9c8894 100644
--- a/src/tools/mdnssd/mdnssd.qbs
+++ b/src/tools/mdnssd/mdnssd.qbs
@@ -5,18 +5,30 @@ import "../QtcTool.qbs" as QtcTool
 QtcTool {
     name: "mdnssd"
 
-    cpp.defines: [ "PID_FILE=\"/tmp/mdnsd.pid\"", "MDNS_UDS_SERVERPATH=\"/tmp/mdnsd\"",
-        "MDNS_DEBUGMSGS=0", "HAVE_IPV6" ]
-    cpp.includePaths: [ ".",  buildDirectory ]
+    cpp.defines: [
+        'PID_FILE="/tmp/mdnsd.pid"',
+        'MDNS_UDS_SERVERPATH="/tmp/mdnsd"',
+        "MDNS_DEBUGMSGS=0",
+        "HAVE_IPV6"
+    ]
+    cpp.includePaths: [
+        ".",
+        buildDirectory
+    ]
 
     Depends { name: "cpp" }
 
     files: [
-        "uds_daemon.c", "uds_daemon.h",
-        "uDNS.c", "uDNS.h",
-        "mDNSDebug.c", "mDNSDebug.h",
-        "GenLinkedList.c", "GenLinkedList.h",
-        "dnssd_ipc.c", "dnssd_ipc.h",
+        "uds_daemon.c",
+        "uds_daemon.h",
+        "uDNS.c",
+        "uDNS.h",
+        "mDNSDebug.c",
+        "mDNSDebug.h",
+        "GenLinkedList.c",
+        "GenLinkedList.h",
+        "dnssd_ipc.c",
+        "dnssd_ipc.h",
         "DNSDigest.c",
         "DNSCommon.c",
         "mDNSUNP.h",
@@ -24,29 +36,34 @@ QtcTool {
         "DNSCommon.h",
         "DebugServices.h",
         "dns_sd.h",
-        "mDNS.c",
+        "mDNS.c"
     ]
 
     Group {
-        condition: qbs.targetOS === "linux"
+        condition: qbs.targetOS == "linux"
         files: [
-            "mDNSPosix.c",  "mDNSPosix.h",
-            "PlatformCommon.c", "PlatformCommon.h",
+            "mDNSPosix.c",
+            "mDNSPosix.h",
+            "PlatformCommon.c",
+            "PlatformCommon.h",
             "PosixDaemon.c",
             "mDNSUNP.c"
         ]
     }
 
     Properties {
-        condition: qbs.targetOS === "linux"
+        condition: qbs.targetOS == "linux"
         cpp.defines: outer.concat([
-            "_GNU_SOURCE", "NOT_HAVE_SA_LEN",
-            "USES_NETLINK", "HAVE_LINUX", "TARGET_OS_LINUX"
+            "_GNU_SOURCE",
+            "NOT_HAVE_SA_LEN",
+            "USES_NETLINK",
+            "HAVE_LINUX",
+            "TARGET_OS_LINUX"
         ])
     }
 
     Properties {
-        condition: qbs.targetOS === "macx"
+        condition: qbs.targetOS == "macx"
         cpp.defines: outer.concat([
             "__MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_10_4",
             "__APPLE_USE_RFC_2292"
@@ -54,13 +71,18 @@ QtcTool {
     }
 
     Group {
-        condition: qbs.targetOS === "windows"
+        condition: qbs.targetOS == "windows"
         files: [
-            "Firewall.h", "Firewall.cpp",
-            "mDNSWin32.h", "mDNSWin32.c",
-            "Poll.h", "Poll.c",
-            "Secret.h", "Secret.c",
-            "Service.h", "Service.c",
+            "Firewall.h",
+            "Firewall.cpp",
+            "mDNSWin32.h",
+            "mDNSWin32.c",
+            "Poll.h",
+            "Poll.c",
+            "Secret.h",
+            "Secret.c",
+            "Service.h",
+            "Service.c",
             "DebugServices.c",
             "LegacyNATTraversal.c",
             "resource.h",
@@ -73,24 +95,47 @@ QtcTool {
     }
 
     Properties {
-        condition: qbs.targetOS === "windows"
+        condition: qbs.targetOS == "windows"
         cpp.includePaths: outer.concat([buildDirectory + "/" + name])
         cpp.defines: outer.concat([
             "WIN32",
-            "_WIN32_WINNT=0x0501", "NDEBUG", "MDNS_DEBUGMSGS=0", "TARGET_OS_WIN32",
-            "WIN32_LEAN_AND_MEAN", "USE_TCP_LOOPBACK", "PLATFORM_NO_STRSEP",
-            "PLATFORM_NO_EPIPE", "PLATFORM_NO_RLIMIT", "UNICODE", "_UNICODE",
-            "_CRT_SECURE_NO_DEPRECATE", "_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1",
+            "_WIN32_WINNT=0x0501",
+            "NDEBUG",
+            "MDNS_DEBUGMSGS=0",
+            "TARGET_OS_WIN32",
+            "WIN32_LEAN_AND_MEAN",
+            "USE_TCP_LOOPBACK",
+            "PLATFORM_NO_STRSEP",
+            "PLATFORM_NO_EPIPE",
+            "PLATFORM_NO_RLIMIT",
+            "UNICODE",
+            "_UNICODE",
+            "_CRT_SECURE_NO_DEPRECATE",
+            "_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1",
             "_LEGACY_NAT_TRAVERSAL_"
         ])
-        cpp.dynamicLibraries: [ "ws2_32.lib", "advapi32.lib", "ole32.lib", "oleaut32.lib",
-            "iphlpapi.lib", "netapi32.lib", "user32.lib", "powrprof.lib", "shell32.lib" ]
+        cpp.dynamicLibraries: [
+            "ws2_32.lib",
+            "advapi32.lib",
+            "ole32.lib",
+            "oleaut32.lib",
+            "iphlpapi.lib",
+            "netapi32.lib",
+            "user32.lib",
+            "powrprof.lib",
+            "shell32.lib"
+        ]
     }
 
     Properties {
-        condition: qbs.toolchain === 'mingw' || qbs.toolchain === 'gcc'
-        cpp.cFlags: [ "-Wno-unused-but-set-variable", "-Wno-strict-aliasing" ]
-        cpp.cxxFlags: [ "-Wno-unused-but-set-variable" ]
+        condition: qbs.toolchain == 'mingw' || qbs.toolchain == 'gcc'
+        cpp.cFlags: [
+            "-Wno-unused-but-set-variable",
+            "-Wno-strict-aliasing"
+        ]
+        cpp.cxxFlags: [
+            "-Wno-unused-but-set-variable"
+        ]
     }
 
     FileTagger {
diff --git a/src/tools/qtcdebugger/qtcdebugger.qbs b/src/tools/qtcdebugger/qtcdebugger.qbs
index a51a5bca39d..bc416fb95be 100644
--- a/src/tools/qtcdebugger/qtcdebugger.qbs
+++ b/src/tools/qtcdebugger/qtcdebugger.qbs
@@ -3,13 +3,19 @@ import "../QtcTool.qbs" as QtcTool
 
 QtcTool {
     name: "qtcdebugger"
-    condition: qbs.targetOS === "windows"
+    condition: qbs.targetOS == "windows"
 
-    cpp.includePaths: [ buildDirectory, "../../shared/registryaccess" ]
-    cpp.dynamicLibraries: [ "psapi", "advapi32" ]
+    cpp.includePaths: [
+        buildDirectory,
+        "../../shared/registryaccess"
+    ]
+    cpp.dynamicLibraries: [
+        "psapi",
+        "advapi32"
+    ]
 
     Depends { name: "cpp" }
-    Depends { name: "qt"; submodules: ['widgets'] }
+    Depends { name: "Qt.widgets" }
     Depends { name: "app_version_header" }
 
     files: [
diff --git a/src/tools/qtpromaker/qtpromaker.qbs b/src/tools/qtpromaker/qtpromaker.qbs
index 5e31094a439..c6b761f58c5 100644
--- a/src/tools/qtpromaker/qtpromaker.qbs
+++ b/src/tools/qtpromaker/qtpromaker.qbs
@@ -5,7 +5,7 @@ QtcTool {
     name: "qtpromaker"
 
     Depends { name: "cpp" }
-    Depends { name: "qt"; submodules: ['core'] }
+    Depends { name: "Qt.core" }
 
     files: [ "main.cpp" ]
 }