Merge remote-tracking branch 'origin/2.8'

2013-05-28 18:30:11 +02:00
parent d08ad0038d cbfcf88f7e
commit 5b268822cf
118 changed files with 5040 additions and 2360 deletions
--- 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"
        ]