merge prereq
commit3610fcc04db732b2137004f321ea608bd9b4dbd2
authorMichael Zanetti <michael.zanetti@canonical.com>
dateMon 16 Jan 2017, 15:09 (10 years ago)
parentd6d0af37db65ce
plugins/Cursor/MousePointer.cpp−1
@@ -199,4 +199,3 @@ void MousePointer::setConfiningItem(QQuickItem *item)
199199 Q_EMIT confiningItemChanged();
200200 }
201201}
202−
plugins/Cursor/MousePointer.h−1
@@ -93,4 +93,3 @@ private:
9393};
9494
9595#endif // MOUSEPOINTER_H
96−
tests/mocks/Cursor/Cursor.qml−1
@@ -79,4 +79,3 @@ Canvas {
7979 }
8080 }
8181}
82−