Merge remote-tracking branch 'origin/2.5'

2012-04-04 16:20:10 +02:00
parent 12624eb7f4 06aa0363b0
commit c814538d95
40 changed files with 218 additions and 65 deletions
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -1,8 +1,8 @@
 import qbs.base 1.0
+import "../QtcLibrary.qbs" as QtcLibrary

-DynamicLibrary {
+QtcLibrary {
    name: "CPlusPlus"
-    destination: "lib"

    cpp.includePaths: [
        ".",