Merge remote-tracking branch 'origin/2.5'

2012-04-26 07:06:04 +02:00
parent d6d04d6786 4674d46197
commit 71d9f33bef
61 changed files with 21096 additions and 12140 deletions
--- a/src/plugins/git/git.qbs
+++ b/src/plugins/git/git.qbs
@@ -13,6 +13,7 @@ QtcPlugin {
    Depends { name: "Locator" }

    Depends { name: "cpp" }
+    cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"])
    cpp.includePaths: [
        ".",
        "gitorious",