Merge remote-tracking branch 'origin/2.7' into 2.8

Conflicts: src/plugins/analyzerbase/analyzerbase.qbs src/plugins/qmljseditor/qmljseditor.qbs src/plugins/qt4projectmanager/qt4projectmanager.qbs Change-Id: If9db8894ed27401a9aa9b385a6117be4c38edd11
2013-05-28 18:28:00 +02:00
parent 60378b43bf 24e81241a5
commit 8d894aee02
43 changed files with 4350 additions and 1597 deletions
--- a/share/qtcreator/translations/qtcreator_uk.ts
+++ b/share/qtcreator/translations/qtcreator_uk.ts
--- a/src/libs/aggregation/aggregation.qbs
+++ b/src/libs/aggregation/aggregation.qbs
@@ -4,7 +4,6 @@ import "../QtcLibrary.qbs" as QtcLibrary
 QtcLibrary {
    name: "Aggregation"

-    Depends { name: "cpp" }
    Depends { name: "Qt.core" }
    cpp.defines: base.concat("AGGREGATION_LIBRARY")

--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -11,7 +11,6 @@ QtcLibrary {
    ])
    cpp.optimization: "fast"

-    Depends { name: "cpp" }
    Depends { name: "Qt.widgets" }

    Group {
@@ -169,7 +168,6 @@ QtcLibrary {
    ]

    Export {
-        Depends { name: "cpp" }
        cpp.includePaths: [
            "../3rdparty"
        ]
--- a/src/libs/extensionsystem/extensionsystem.qbs
+++ b/src/libs/extensionsystem/extensionsystem.qbs
@@ -9,7 +9,6 @@ QtcLibrary {
        "IDE_TEST_DIR=\".\""
    ])

-    Depends { name: "cpp" }
    Depends { name: "Qt"; submodules: ["core", "widgets"] }
    Depends { name: "Aggregation" }

--- a/src/libs/glsl/glsl.qbs
+++ b/src/libs/glsl/glsl.qbs
@@ -8,7 +8,6 @@ QtcLibrary {
        "GLSL_BUILD_LIB"
    ])

-    Depends { name: "cpp" }
    Depends { name: "Qt.gui" }

    files: [
--- a/src/libs/languageutils/languageutils.qbs
+++ b/src/libs/languageutils/languageutils.qbs
@@ -10,7 +10,6 @@ QtcLibrary {
    ])
    cpp.optimization: "fast"

-    Depends { name: "cpp" }
    Depends { name: "Qt.core" }

    files: [
--- a/src/libs/qmldebug/qmldebug.qbs
+++ b/src/libs/qmldebug/qmldebug.qbs
@@ -6,7 +6,6 @@ QtcLibrary {

    cpp.defines: base.concat("QMLDEBUG_LIB")

-    Depends { name: "cpp" }
    Depends { name: "Qt"; submodules: ["gui", "network"] }

    files: [
--- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs
@@ -11,7 +11,6 @@ QtcLibrary {
    ])
    cpp.optimization: "fast"

-    Depends { name: "cpp" }
    Depends { name: "Qt"; submodules: ["widgets", "declarative", "script"] }
    Depends { name: "QmlJS" }
    Depends { name: "Utils" }
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -12,7 +12,6 @@ QtcLibrary {

    Depends { name: "Utils" }
    Depends { name: "LanguageUtils" }
-    Depends { name: "cpp" }
    Depends { name: "Qt"; submodules: ["widgets", "script"] }

    files: [
@@ -107,7 +106,6 @@ QtcLibrary {
    ]

    Export {
-        Depends { name: "cpp" }
        Depends { name: "LanguageUtils" }
    }
 }
--- a/src/libs/ssh/ssh.qbs
+++ b/src/libs/ssh/ssh.qbs
@@ -8,7 +8,6 @@ QtcLibrary {
    cpp.includePaths: botanIncludes
    cpp.dynamicLibraries: botanLibs

-    Depends { name: "cpp" }
    Depends { name: "Qt"; submodules: ["widgets", "network" ] }

    files: [
--- a/src/libs/utils/process_ctrlc_stub.qbs
+++ b/src/libs/utils/process_ctrlc_stub.qbs
@@ -6,7 +6,6 @@ QtcTool {
    consoleApplication: true
    condition: qbs.targetOS == "windows"

-    Depends { name: "cpp" }

    files: [ "process_ctrlc_stub.cpp" ]

--- a/src/libs/utils/process_stub.qbs
+++ b/src/libs/utils/process_stub.qbs
@@ -5,7 +5,6 @@ QtcTool {
    name: "qtcreator_process_stub"
    consoleApplication: true

-    Depends { name: "cpp" }

    files: {
        if (qbs.targetOS == "windows") {
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -19,7 +19,6 @@ QtcLibrary {
        cpp.dynamicLibraries: ["X11"]
    }

-    Depends { name: "cpp" }
    Depends { name: "Qt"; submodules: ["widgets", "network", "script", "concurrent"] }
    Depends { name: "app_version_header" }

@@ -212,10 +211,7 @@ QtcLibrary {
    }

    Export {
-        // ### [ remove, once qbs supports merging of Export items in derived products
-        Depends { name: "cpp" }
        cpp.includePaths: [ ".." ]
-        // ### ]
        Depends { name: "Qt"; submodules: ["concurrent", "widgets" ] }
    }
 }
--- a/src/libs/zeroconf/zeroconf.qbs
+++ b/src/libs/zeroconf/zeroconf.qbs
@@ -4,7 +4,6 @@ import "../QtcLibrary.qbs" as QtcLibrary
 QtcLibrary {
    name: "zeroconf"

-    Depends { name: "cpp" }
    Depends { name: "Qt.network" }
    cpp.includePaths: base.concat(".")

--- a/src/plugins/bazaar/bazaar.qbs
+++ b/src/plugins/bazaar/bazaar.qbs
@@ -12,7 +12,6 @@ QtcPlugin {
    Depends { name: "VcsBase" }
    Depends { name: "Locator" }

-    Depends { name: "cpp" }

    files: [
        "annotationhighlighter.cpp",
--- a/src/plugins/classview/classview.qbs
+++ b/src/plugins/classview/classview.qbs
@@ -12,7 +12,6 @@ QtcPlugin {
    Depends { name: "ProjectExplorer" }
    Depends { name: "TextEditor" }

-    Depends { name: "cpp" }

    files: [
        "classview.qrc",
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -255,7 +255,6 @@ QtcPlugin {
    }

    Export {
-        Depends { name: "cpp" }
        Depends { name: "Aggregation" }
        Depends { name: "Utils" }
    }
--- a/src/plugins/cpaster/cpaster.qbs
+++ b/src/plugins/cpaster/cpaster.qbs
@@ -9,7 +9,6 @@ QtcPlugin {
    Depends { name: "Core" }
    Depends { name: "TextEditor" }

-    Depends { name: "cpp" }
    cpp.includePaths: base.concat("../../shared/cpaster")

    files: [
--- a/src/plugins/cpaster/frontend/frontend.qbs
+++ b/src/plugins/cpaster/frontend/frontend.qbs
@@ -4,7 +4,6 @@ import "../../../tools/QtcTool.qbs" as QtcTool
 QtcTool {
    name: "cpaster"

-    Depends { name: "cpp" }
    Depends {
        name: "Qt"
        submodules: ["gui", "network"]
--- a/src/plugins/cppeditor/cppeditor.qbs
+++ b/src/plugins/cppeditor/cppeditor.qbs
@@ -13,7 +13,6 @@ QtcPlugin {
    Depends { name: "CPlusPlus" }
    Depends { name: "TextEditor" }
    Depends { name: "ProjectExplorer" }
-    Depends { name: "cpp" }

    cpp.includePaths: base.concat("../../libs/3rdparty")

--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -17,7 +17,6 @@ QtcPlugin {
    Depends { name: "QmlDebug" }
    Depends { name: "QtcSsh" }

-    Depends { name: "cpp" }
    cpp.includePaths: base.concat([
        "shared",
        "lldblib",
--- a/src/plugins/debugger/ptracepreload.qbs
+++ b/src/plugins/debugger/ptracepreload.qbs
@@ -10,7 +10,6 @@ QtcLibrary {
        "c"
    ]

-    Depends { name: "cpp" }

    files: [
        "ptracepreload.c",
--- a/src/plugins/designer/designer.qbs
+++ b/src/plugins/designer/designer.qbs
@@ -12,7 +12,6 @@ QtcPlugin {
    Depends { name: "TextEditor" }
    Depends { name: "ProjectExplorer" }

-    Depends { name: "cpp" }
    cpp.defines: base.concat(["CPP_ENABLED"])
    cpp.includePaths: base.concat([
        "../../libs/3rdparty",
--- a/src/plugins/diffeditor/diffeditor.qbs
+++ b/src/plugins/diffeditor/diffeditor.qbs
@@ -10,7 +10,6 @@ QtcPlugin {
    Depends { name: "TextEditor" }
    Depends { name: "Find" }

-    Depends { name: "cpp" }

    files: [
        "diffeditor_global.h",
--- a/src/plugins/find/find.qbs
+++ b/src/plugins/find/find.qbs
@@ -7,7 +7,6 @@ QtcPlugin {

    Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
    Depends { name: "Core" }
-    Depends { name: "cpp" }

    cpp.includePaths: base.concat([
        "generichighlighter",
--- a/src/plugins/help/help.qbs
+++ b/src/plugins/help/help.qbs
@@ -20,7 +20,6 @@ QtcPlugin {
    Depends { name: "Locator" }
    Depends { name: "app_version_header" }

-    Depends { name: "cpp" }

    cpp.defines: {
        var list = base;
--- a/src/plugins/locator/locator.qbs
+++ b/src/plugins/locator/locator.qbs
@@ -7,7 +7,6 @@ QtcPlugin {

    Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
    Depends { name: "Core" }
-    Depends { name: "cpp" }

    cpp.includePaths: base.concat([
        "generichighlighter",
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -13,7 +13,6 @@ QtcPlugin {
    Depends { name: "TextEditor" }
    Depends { name: "QtcSsh" }

-    Depends { name: "cpp" }
    cpp.defines: base.concat("QTC_CPU=X86Architecture")
    cpp.includePaths: base.concat([
        "customwizard",
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
@@ -19,7 +19,6 @@ QtcPlugin {
    Depends { name: "QmlJS" }
    Depends { name: "QmlJSTools" }

-    Depends { name: "cpp" }

    cpp.includePaths: base.concat([
        qbs_source_dir + "/src",
--- a/src/plugins/qmldesigner/qmldesigner.qbs
+++ b/src/plugins/qmldesigner/qmldesigner.qbs
@@ -19,7 +19,6 @@ QtcPlugin {
    Depends { name: "LanguageUtils" }
    Depends { name: "QtSupport" }

-    Depends { name: "cpp" }
    cpp.defines: base.concat(["QWEAKPOINTER_ENABLE_ARROW"])
    cpp.includePaths: base.concat([
        "designercore",
--- a/src/plugins/qmljseditor/qmljseditor.qbs
+++ b/src/plugins/qmljseditor/qmljseditor.qbs
@@ -16,8 +16,6 @@ QtcPlugin {
    Depends { name: "QmlEditorWidgets" }
    Depends { name: "CPlusPlus" }

-    Depends { name: "cpp" }
-
    files: [
        "QmlJSEditor.mimetypes.xml",
        "jsfilewizard.cpp",
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -17,7 +17,6 @@ QtcPlugin {
    Depends { name: "QmlDebug" }
    Depends { name: "QtSupport" }

-    Depends { name: "cpp" }
    cpp.includePaths: base.concat("../../libs/3rdparty")

    files: [
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -20,7 +20,6 @@ QtcPlugin {
    Depends { name: "QmlJSTools" }
    Depends { name: "CPlusPlus" }

-    Depends { name: "cpp" }
    cpp.includePaths: base.concat("canvas")

    files: [
--- a/src/plugins/qt4projectmanager/qt4projectmanager.qbs
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
@@ -16,7 +16,6 @@ QtcPlugin {
    Depends { name: "TextEditor" }
    Depends { name: "QmlJSTools" }

-    Depends { name: "cpp" }
    cpp.includePaths: base.concat([
        "customwidgetwizard",
        "../../shared",
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -11,7 +11,6 @@ QtcPlugin {
    Depends { name: "TextEditor" }
    Depends { name: "QmlJS" }

-    Depends { name: "cpp" }
    cpp.includePaths: base.concat([
        "../../shared",
        "../../shared/proparser"
--- a/src/plugins/resourceeditor/resourceeditor.qbs
+++ b/src/plugins/resourceeditor/resourceeditor.qbs
@@ -7,7 +7,6 @@ QtcPlugin {

    Depends { name: "Core" }
    Depends { name: "Find" }
-    Depends { name: "cpp" }
    Depends { name: "Qt"; submodules: ["widgets", "xml"] }

    cpp.includePaths: base.concat("qrceditor")
--- a/src/plugins/updateinfo/updateinfo.qbs
+++ b/src/plugins/updateinfo/updateinfo.qbs
@@ -5,7 +5,6 @@ import "../QtcPlugin.qbs" as QtcPlugin
 QtcPlugin {
    name: "UpdateInfo"

-    Depends { name: "cpp" }
    Depends { name: "Core" }
    Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }

--- a/src/plugins/vcsbase/vcsbase.qbs
+++ b/src/plugins/vcsbase/vcsbase.qbs
@@ -9,7 +9,6 @@ QtcPlugin {
    Depends { name: "TextEditor" }
    Depends { name: "ProjectExplorer" }
    Depends { name: "Find" }
-    Depends { name: "cpp" }
    Depends { name: "Qt.widgets" }
    Depends { name: "CppTools" }
    Depends { name: "CPlusPlus" }
--- a/src/plugins/welcome/welcome.qbs
+++ b/src/plugins/welcome/welcome.qbs
@@ -9,7 +9,6 @@ QtcPlugin {
    Depends { name: "Core" }
    Depends { name: "ProjectExplorer" }

-    Depends { name: "cpp" }
    cpp.includePaths: base.concat("../../shared/scriptwrapper")

    files: [
--- a/src/tools/qtcdebugger/qtcdebugger.qbs
+++ b/src/tools/qtcdebugger/qtcdebugger.qbs
@@ -14,7 +14,6 @@ QtcTool {
        "advapi32"
    ]

-    Depends { name: "cpp" }
    Depends { name: "Qt.widgets" }
    Depends { name: "app_version_header" }

--- a/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs
+++ b/src/tools/qtcreatorcrashhandler/qtcreatorcrashhandler.qbs
@@ -10,7 +10,6 @@ QtcTool {
        "../../libs"
    ]

-    Depends { name: "cpp" }
    Depends { name: "Qt.widgets" }
    Depends { name: "app_version_header" }

--- a/src/tools/qtpromaker/qtpromaker.qbs
+++ b/src/tools/qtpromaker/qtpromaker.qbs
@@ -4,7 +4,6 @@ import "../QtcTool.qbs" as QtcTool
 QtcTool {
    name: "qtpromaker"

-    Depends { name: "cpp" }
    Depends { name: "Qt.core" }

    files: [ "main.cpp" ]
--- a/src/tools/sdktool/sdktool.qbs
+++ b/src/tools/sdktool/sdktool.qbs
@@ -4,7 +4,6 @@ import "../QtcTool.qbs" as QtcTool
 QtcTool {
    name: "sdktool"

-    Depends { name: "cpp" }
    Depends { name: "Qt.core" }
    Depends { name: "Utils" }
    Depends { name: "app_version_header" }