summaryrefslogtreecommitdiff
path: root/qtcreator.qbs
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2013-05-27 17:17:40 +0200
committerEike Ziller <eike.ziller@digia.com>2013-05-27 17:17:40 +0200
commit45f8e241ba24ba663a22d0c6a8c7b201f37e7c8f (patch)
tree13e18102fecaf3a797053a571a9a0f05dbf2f5a6 /qtcreator.qbs
parent116db445bf9f0175acdc7217ea603a3521bd635d (diff)
parent4ae9f3778f9e1f7847783ffd7a1b779dd71d093d (diff)
downloadqt-creator-45f8e241ba24ba663a22d0c6a8c7b201f37e7c8f.tar.gz
Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts: src/plugins/android/androiddebugsupport.cpp src/plugins/qtsupport/qtsupport.qbs Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1
Diffstat (limited to 'qtcreator.qbs')
-rw-r--r--qtcreator.qbs2
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
}