From 5d362a4d760401ce08a7864f107ff8c36b8f8529 Mon Sep 17 00:00:00 2001
From: Nikita Baryshnikov <nib952051@gmail.com>
Date: Fri, 21 Jul 2017 16:57:08 +0300
Subject: [PATCH] QmlDesigner fix parentheses warning

/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp:145:
warning: suggest parentheses around '&&' within '||' [-Wparentheses]
                 || selectedItemCursorInMovableArea(event->scenePos())
                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                 && !event->modifiers().testFlag(Qt::ControlModifier)
                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                 && !event->modifiers().testFlag(Qt::ShiftModifier)) {
                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Change-Id: Iea6018d885b9bad13363a39e2aee0e6e229f93c4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../qmldesigner/components/formeditor/selectiontool.cpp       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp
index 3aa1c2c1fd7..9a5f55cd195 100644
--- a/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.cpp
@@ -140,9 +140,9 @@ void SelectionTool::hoverMoveEvent(const QList<QGraphicsItem*> &itemList,
         }
 
         if ((topSelectedItemIsMovable(itemList) && !view()->hasSingleSelectedModelNode())
-                || selectedItemCursorInMovableArea(event->scenePos())
+                || (selectedItemCursorInMovableArea(event->scenePos())
                 && !event->modifiers().testFlag(Qt::ControlModifier)
-                && !event->modifiers().testFlag(Qt::ShiftModifier)) {
+                && !event->modifiers().testFlag(Qt::ShiftModifier))) {
             view()->changeToMoveTool();
             return;
         }