summaryrefslogtreecommitdiffstats
path: root/src/client/qwaylandwindow_p.h
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-06-07 12:07:44 +0200
committerLiang Qi <liang.qi@qt.io>2017-06-07 13:52:32 +0200
commite6c944939f88afe852d2d0a604fd9815c409f2eb (patch)
tree644736aa8a6235dd1db6e1cef18ee1aec28439da /src/client/qwaylandwindow_p.h
parentdbf418dce41fe08368d38a098a771348a5b3d0fd (diff)
parent4934b87156a889584a34e36c22abd9aee64cef7e (diff)
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts: .qmake.conf src/client/qwaylandwindow.cpp Change-Id: I3ae070ff20df4b858a4eef769438092c061e47ef
Diffstat (limited to 'src/client/qwaylandwindow_p.h')
-rw-r--r--src/client/qwaylandwindow_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
index dd6a368c..cc11b3c1 100644
--- a/src/client/qwaylandwindow_p.h
+++ b/src/client/qwaylandwindow_p.h
@@ -235,6 +235,7 @@ protected:
bool mSentInitialResize;
QPoint mOffset;
+ int mScale;
QIcon mWindowIcon;