Merge remote-tracking branch 'origin/2.6'

Conflicts: qtcreator.qbp src/libs/QtcLibrary.qbs src/plugins/QtcPlugin.qbs src/tools/QtcTool.qbs Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
2012-09-19 18:02:46 +02:00
parent c0321ac305 44177392ec
commit b947861c59
104 changed files with 2560 additions and 2030 deletions
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -9,10 +9,10 @@ QtcLibrary {
        "..",
        "parser"
    ]
-    cpp.defines: [
+    cpp.defines: base.concat([
        "QMLJS_BUILD_DIR",
        "QT_CREATOR"
-    ]
+    ])
    cpp.optimization: "fast"

    Depends { name: "Utils" }