summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextobject.h
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-02-14 15:49:08 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2018-02-14 15:49:08 +0000
commit7bc1d6effaae8f5aa1bef92cb1094ec3b3f4fb95 (patch)
treecde8deeea717fc25d64640d96cf13a4fd44d9db1 /src/gui/text/qtextobject.h
parent2aeb2bcef48d7bca2186c262dde433737956a539 (diff)
parent305dd1b61f657474d751cc3b24f58249ec21b61b (diff)
Merge "Merge remote-tracking branch 'origin/5.9' into 5.11" into refs/staging/5.11
Diffstat (limited to 'src/gui/text/qtextobject.h')
-rw-r--r--src/gui/text/qtextobject.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h
index 7e4efa28f8..067f8473ea 100644
--- a/src/gui/text/qtextobject.h
+++ b/src/gui/text/qtextobject.h
@@ -154,9 +154,9 @@ public:
iterator(const iterator &o) Q_DECL_NOTHROW; // = default
iterator &operator=(const iterator &o) Q_DECL_NOTHROW; // = default
iterator(iterator &&other) Q_DECL_NOTHROW // = default
- { memcpy(this, &other, sizeof(iterator)); }
+ { memcpy(static_cast<void *>(this), static_cast<void *>(&other), sizeof(iterator)); }
iterator &operator=(iterator &&other) Q_DECL_NOTHROW // = default
- { memcpy(this, &other, sizeof(iterator)); return *this; }
+ { memcpy(static_cast<void *>(this), static_cast<void *>(&other), sizeof(iterator)); return *this; }
#endif
QTextFrame *parentFrame() const { return f; }