diff --git a/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.cpp b/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.cpp index d5ada6cee1b..55ee2a69c68 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.cpp @@ -53,7 +53,7 @@ ToolBarColorBox::ToolBarColorBox(QWidget *parent) : QLabel(parent) { m_copyHexColor = new QAction(QIcon(QLatin1String(":/qml/images/color-picker-hicontrast.png")), - tr("Copy"), this); + tr("Copy Color"), this); connect(m_copyHexColor, SIGNAL(triggered()), SLOT(copyColorToClipboard())); setScaledContents(false); } @@ -116,12 +116,6 @@ 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(); diff --git a/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.h b/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.h index cea0e6ea59f..c9ab6676196 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.h +++ b/share/qtcreator/qml/qmljsdebugger/editor/toolbarcolorbox.h @@ -52,7 +52,6 @@ public: protected: void contextMenuEvent(QContextMenuEvent *ev); - void mouseDoubleClickEvent(QMouseEvent *); void mousePressEvent(QMouseEvent *ev); void mouseMoveEvent(QMouseEvent *ev); private slots: diff --git a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp index 6c152185e4f..f83aa71f4d6 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 16842fe45af..d53e28b5240 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: