Merge remote-tracking branch 'origin/2.8'

2013-05-27 17:21:01 +02:00
parent 1c34b266fb 5b648d8b6e
commit d08ad0038d
217 changed files with 653 additions and 1148 deletions
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -168,7 +168,7 @@ QtcLibrary {
        "images/var_prot.png",
    ]

-    ProductModule {
+    Export {
        Depends { name: "cpp" }
        cpp.includePaths: [
            "../3rdparty"