diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-01-31 11:22:08 +1000 |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2012-01-31 06:33:34 +0100 |
commit | dbf35e498db723ae9850686e462ec4f45bc7b67c (patch) | |
tree | cf1f98717e131f26e5a6d63f6693935b2fbdb76f /src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp | |
parent | 12a5ddf456ba8549645a8cb28a8b4ed6197a14da (diff) |
Modify QtQuick1 to build in Qt5
Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp')
-rw-r--r-- | src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp index 9fe40fbf..b9e77f6e 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/colorpickertool.cpp @@ -41,17 +41,18 @@ #include "colorpickertool.h" -#include "../qdeclarativeviewinspector.h" +#include "qdeclarativeviewinspector.h" #include <QtGui/QMouseEvent> #include <QtGui/QKeyEvent> #include <QtCore/QRectF> #include <QtGui/QRgb> #include <QtGui/QImage> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtGui/QPalette> namespace QmlJSDebugger { +namespace QtQuick1 { ColorPickerTool::ColorPickerTool(QDeclarativeViewInspector *view) : AbstractLiveEditTool(view) @@ -75,9 +76,7 @@ void ColorPickerTool::mouseMoveEvent(QMouseEvent *event) void ColorPickerTool::clear() { -#ifndef QT_NO_CURSOR view()->setCursor(Qt::CrossCursor); -#endif } void ColorPickerTool::pickColor(const QPoint &pos) @@ -97,4 +96,5 @@ void ColorPickerTool::pickColor(const QPoint &pos) emit selectedColorChanged(m_selectedColor); } +} // namespace QtQuick1 } // namespace QmlJSDebugger |