diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-05-28 18:28:00 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-05-28 18:28:00 +0200 |
| commit | 8d894aee02745a8f64c59feb0e427fb6c92135bb (patch) | |
| tree | 551c16d03a398635eeb18bb10a55e0ac079b4c17 /src/plugins/classview | |
| parent | 60378b43bf64412c42628a1bf2342a30ecb3e7b1 (diff) | |
| parent | 24e81241a5a09c3522b2d6768112de4f1448bc53 (diff) | |
| download | qt-creator-8d894aee02745a8f64c59feb0e427fb6c92135bb.tar.gz | |
Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
src/plugins/analyzerbase/analyzerbase.qbs
src/plugins/qmljseditor/qmljseditor.qbs
src/plugins/qt4projectmanager/qt4projectmanager.qbs
Change-Id: If9db8894ed27401a9aa9b385a6117be4c38edd11
Diffstat (limited to 'src/plugins/classview')
| -rw-r--r-- | src/plugins/classview/classview.qbs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/classview/classview.qbs b/src/plugins/classview/classview.qbs index 338cec83eb..be6ab5b42f 100644 --- a/src/plugins/classview/classview.qbs +++ b/src/plugins/classview/classview.qbs @@ -12,7 +12,6 @@ QtcPlugin { Depends { name: "ProjectExplorer" } Depends { name: "TextEditor" } - Depends { name: "cpp" } files: [ "classview.qrc", |