summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>2011-03-17 15:28:20 +0100
committerThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>2011-03-17 15:43:10 +0100
commitba92d4c9227215f5ac033c63bb3ff078dab669eb (patch)
tree87539610eb7d4641dcdbd9e5e36e19c82587da29 /src
parent8defa8a7ac4424f32c783689b1eff23c50945a6e (diff)
downloadqt-creator-ba92d4c9227215f5ac033c63bb3ff078dab669eb.tar.gz
QmlJSDebugger: Removed the double-click feature from the color box
It was supposed to show a color dialog, but in practice it never worked due to using show() rather than exec(). Removed it completely since it was judged confusing and not very useful, since it is already possible to copy the color by using the context menu. Task-number: QTCREATORBUG-3878 Reviewed-by: Kai Koehne
Diffstat (limited to 'src')
-rw-r--r--src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp7
-rw-r--r--src/plugins/qmljsinspector/qmljstoolbarcolorbox.h1
2 files changed, 0 insertions, 8 deletions
diff --git a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp
index 6c152185e4..f83aa71f4d 100644
--- a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp
+++ b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp
@@ -124,17 +124,10 @@ void ToolBarColorBox::contextMenuEvent(QContextMenuEvent *ev)
contextMenu.exec(ev->globalPos());
}
-void ToolBarColorBox::mouseDoubleClickEvent(QMouseEvent *)
-{
- QColorDialog dialog(m_color);
- dialog.show();
-}
-
void ToolBarColorBox::copyColorToClipboard()
{
QClipboard *clipboard = QApplication::clipboard();
clipboard->setText(m_color.name());
}
-
} // namespace QmlJSInspector
diff --git a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h
index 16842fe45a..d53e28b524 100644
--- a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h
+++ b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h
@@ -53,7 +53,6 @@ public:
protected:
void contextMenuEvent(QContextMenuEvent *ev);
- void mouseDoubleClickEvent(QMouseEvent *);
void mousePressEvent(QMouseEvent *ev);
void mouseMoveEvent(QMouseEvent *ev);
private slots: