diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-31 13:20:29 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-31 14:29:39 +0200 |
| commit | 013a1ae4e7e5df36e03ccf71f02ad6644473a3e8 (patch) | |
| tree | 8d89f8e5c9f549874bc8394b21f9681310b90deb /src/quick/scenegraph/util | |
| parent | ad4960b40461c8b83599fe71540086182adecb10 (diff) | |
Fix build with Qt 6
The #warning directive is non-standard and doesn't compile with non-GCC.
Meanwhile, a setter was added for this property and it appears to be
used from public QQuickPaintedItem API.
Change-Id: Id4150f6a8045d1e9e9245ebc3213f5e9b9f4bb59
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/quick/scenegraph/util')
| -rw-r--r-- | src/quick/scenegraph/util/qsgdefaultpainternode_p.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/quick/scenegraph/util/qsgdefaultpainternode_p.h b/src/quick/scenegraph/util/qsgdefaultpainternode_p.h index a86f7397be..dc103648ff 100644 --- a/src/quick/scenegraph/util/qsgdefaultpainternode_p.h +++ b/src/quick/scenegraph/util/qsgdefaultpainternode_p.h @@ -159,9 +159,6 @@ private: QSize m_textureSize; QRect m_dirtyRect; QColor m_fillColor; -#if QT_VERSION >= 0x060000 -#warning "Remove m_contentsScale and assume 1 everywhere" -#endif qreal m_contentsScale; bool m_dirtyContents : 1; |