diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-19 16:13:09 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-19 16:13:09 +0200 |
| commit | 822233629d71375008b633b8678f9e31c9ee7dc0 (patch) | |
| tree | 0c59ba19deb261e7421f6bd797761d02a5bca237 /src/plugins/qmljseditor | |
| parent | c863662bb276e1649f01f77559b3f9ca10cf60b7 (diff) | |
| parent | ca516cf31d1a1d3b2d921c5e4ceed7c70a260f24 (diff) | |
| download | qt-creator-822233629d71375008b633b8678f9e31c9ee7dc0.tar.gz | |
Merge remote-tracking branch 'origin/2.5'
Conflicts:
qtcreator.pri
src/libs/utils/utils.qbs
src/plugins/projectexplorer/miniprojecttargetselector.cpp
src/plugins/qmljseditor/qmljseditor.qbs
src/plugins/qmljsinspector/qmljsinspector.qbs
Change-Id: Ib239d50c21cb06d3a8e821e03dc093552f40ffab
Diffstat (limited to 'src/plugins/qmljseditor')
| -rw-r--r-- | src/plugins/qmljseditor/qmljseditor.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs index 0000d918ec..da5e7bbeb6 100644 --- a/src/plugins/qmljseditor/qmljseditor.qbs +++ b/src/plugins/qmljseditor/qmljseditor.qbs @@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin QtcPlugin { name: "QmlJSEditor" - Depends { name: "qt"; submodules: ['widgets'] } + Depends { name: "qt"; submodules: ['widgets', 'script'] } Depends { name: "Core" } Depends { name: "TextEditor" } Depends { name: "ProjectExplorer" } |