diff options
author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2012-05-28 09:40:39 +0900 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-29 17:27:32 +0200 |
commit | 0014ec0a65ec2ce6ef29938e552dae7aca90024d (patch) | |
tree | ea93e7c2daeefd025be5505f3689a1a079bdea33 /src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp | |
parent | 47be29c99be9558284f6d81074b6b0c38213ed71 (diff) |
Fix compilation for QT_NO_ACTION, QT_NO_CONTEXTMENU and QT_NO_MENU
Change-Id: I8684a7045100e7020648e54779286ff0d6683ade
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp')
-rw-r--r-- | src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp b/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp index 77521a3d..e882b6d7 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp @@ -61,21 +61,23 @@ ZoomTool::ZoomTool(QDeclarativeViewInspector *view) : m_smoothZoomMultiplier(0.05f), m_currentScale(1.0f) { +#ifndef QT_NO_ACTION m_zoomTo100Action = new QAction(tr("Zoom to &100%"), this); m_zoomInAction = new QAction(tr("Zoom In"), this); m_zoomOutAction = new QAction(tr("Zoom Out"), this); m_zoomInAction->setShortcut(QKeySequence(Qt::Key_Plus)); m_zoomOutAction->setShortcut(QKeySequence(Qt::Key_Minus)); - +#endif LiveLayerItem *layerItem = QDeclarativeViewInspectorPrivate::get(view)->manipulatorLayer; QGraphicsObject *layerObject = reinterpret_cast<QGraphicsObject *>(layerItem); m_rubberbandManipulator = new LiveRubberBandSelectionManipulator(layerObject, view); - +#ifndef QT_NO_ACTION connect(m_zoomTo100Action, SIGNAL(triggered()), SLOT(zoomTo100())); connect(m_zoomInAction, SIGNAL(triggered()), SLOT(zoomIn())); connect(m_zoomOutAction, SIGNAL(triggered()), SLOT(zoomOut())); +#endif } ZoomTool::~ZoomTool() @@ -90,12 +92,14 @@ void ZoomTool::mousePressEvent(QMouseEvent *event) QPointF scenePos = view()->mapToScene(event->pos()); if (event->buttons() & Qt::RightButton) { +#ifndef QT_NO_MENU QMenu contextMenu; contextMenu.addAction(m_zoomTo100Action); contextMenu.addSeparator(); contextMenu.addAction(m_zoomInAction); contextMenu.addAction(m_zoomOutAction); contextMenu.exec(event->globalPos()); +#endif } else if (event->buttons() & Qt::LeftButton) { m_dragBeginPos = scenePos; m_dragStarted = false; |