Merge remote-tracking branch 'origin/2.6'

This commit is contained in:
Eike Ziller
2012-10-29 15:13:06 +01:00
21 changed files with 109 additions and 67 deletions

View File

@@ -553,7 +553,7 @@ void WatchTreeView::dropEvent(QDropEvent *ev)
QString data = ev->mimeData()->text();
foreach (const QChar c, data)
exp.append(c.isPrint() ? c : QChar(QLatin1Char(' ')));
watchExpression(exp);
currentEngine()->watchHandler()->watchVariable(exp);
//ev->acceptProposedAction();
ev->setDropAction(Qt::CopyAction);
ev->accept();