diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2014-09-29 13:37:46 +0200 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2014-09-29 13:38:11 +0200 |
| commit | 8ab25620d3df25c43011ae982f4614639578afb3 (patch) | |
| tree | e94d53c6b7d231ca18f0787a0c09bec07d163a67 /src/gui/painting/qtransform.h | |
| parent | dfe853bff90444edf92a993e391df853780c9e8d (diff) | |
| parent | 5222abfdf5f034bad12bbe12312a4149550495b7 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/network/socket/qnativesocketengine_unix.cpp
src/widgets/kernel/qwidget_qpa.cpp
Change-Id: I6f1aa320d5ca66cd92d601a95885aeaab0abb191
Diffstat (limited to 'src/gui/painting/qtransform.h')
| -rw-r--r-- | src/gui/painting/qtransform.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h index e32e29c5da..68c4548644 100644 --- a/src/gui/painting/qtransform.h +++ b/src/gui/painting/qtransform.h @@ -154,12 +154,18 @@ private: : affine(h11, h12, h21, h22, h31, h32, true) , m_13(h13), m_23(h23), m_33(h33) , m_type(TxNone) - , m_dirty(TxProject) {} + , m_dirty(TxProject) + , d(Q_NULLPTR) + { + } inline QTransform(bool) : affine(true) , m_13(0), m_23(0), m_33(1) , m_type(TxNone) - , m_dirty(TxNone) {} + , m_dirty(TxNone) + , d(Q_NULLPTR) + { + } inline TransformationType inline_type() const; QMatrix affine; qreal m_13; |