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

Conflicts:
	src/plugins/android/androiddebugsupport.cpp
	src/plugins/qtsupport/qtsupport.qbs

Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1

1 files changed, 1 insertions, 1 deletions

diff --git a/qtcreator.qbs b/qtcreator.qbs
index 96216f1479..e773619b38 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -160,7 +160,7 @@ Project {
             }
         }
 
-        ProductModule {
+        Export {
             Depends { name: "cpp" }
             cpp.includePaths: product.buildDirectory
         }