Merge remote-tracking branch 'origin/2.7' into 2.8

Conflicts: src/plugins/android/androiddebugsupport.cpp src/plugins/qtsupport/qtsupport.qbs Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1
2013-05-27 17:17:40 +02:00
parent 116db445bf 4ae9f3778f
commit 45f8e241ba
22 changed files with 27 additions and 24 deletions
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -78,7 +78,7 @@ QtcPlugin {
        files: ["qmljstools_test.cpp"]
    }

-    ProductModule {
+    Export {
        Depends { name: "CppTools" }
        Depends { name: "QmlDebug" }
    }