diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-24 17:45:21 +0200 |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-24 17:45:21 +0200 |
| commit | 8e6569663ecbf7389b3df5d86f4ce2d1102b16c0 (patch) | |
| tree | 290fe9c4af570126949093affc25c7a9fb84e8ed /src/plugins/plugins.pro | |
| parent | 1cbc4116d3c6fa1320ee4523e45a5f0df004cd3a (diff) | |
| parent | e5076cc5e50be46b2f2a2307660e5e8603b780ad (diff) | |
| download | qt-creator-8e6569663ecbf7389b3df5d86f4ce2d1102b16c0.tar.gz | |
Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline into 2.0
Diffstat (limited to 'src/plugins/plugins.pro')
| -rw-r--r-- | src/plugins/plugins.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index f59ddb97a4..f958d426e0 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -190,6 +190,7 @@ plugin_qmlprojectmanager.depends = plugin_texteditor plugin_qmlprojectmanager.depends += plugin_projectexplorer plugin_qmlprojectmanager.depends += plugin_qmljseditor plugin_qmlprojectmanager.depends += plugin_debugger +plugin_qmlprojectmanager.depends += plugin_qt4projectmanager plugin_qmldesigner.subdir = qmldesigner plugin_qmldesigner.depends = plugin_coreplugin |