diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-05-27 17:17:40 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-05-27 17:17:40 +0200 |
| commit | 45f8e241ba24ba663a22d0c6a8c7b201f37e7c8f (patch) | |
| tree | 13e18102fecaf3a797053a571a9a0f05dbf2f5a6 /src/plugins/qmljstools | |
| parent | 116db445bf9f0175acdc7217ea603a3521bd635d (diff) | |
| parent | 4ae9f3778f9e1f7847783ffd7a1b779dd71d093d (diff) | |
| download | qt-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 'src/plugins/qmljstools')
| -rw-r--r-- | src/plugins/qmljstools/qmljstools.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs index d787c842b1..3848531bd5 100644 --- 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" } } |