diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-01 17:51:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-01 17:51:13 +0200 |
| commit | fe2d40b2dcc7905db8aa0bebfaa569f645bd56d1 (patch) | |
| tree | 0d1db3123c9155d465dde8686b16316354c4d5c2 /src/quick/scenegraph/util | |
| parent | fb7d79e3303b6338995acc0b21bfb8a1b4e5b27a (diff) | |
| parent | 1dce83ba31e0e480b8eae43c1fc59c6cd5bb4d5c (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I2f106b4e5f73b8310bb57f81f1e325fa20db4538
Diffstat (limited to 'src/quick/scenegraph/util')
| -rw-r--r-- | src/quick/scenegraph/util/qsgengine.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/scenegraph/util/qsgengine.h b/src/quick/scenegraph/util/qsgengine.h index e9e01dc710..e48b7784ae 100644 --- a/src/quick/scenegraph/util/qsgengine.h +++ b/src/quick/scenegraph/util/qsgengine.h @@ -66,6 +66,7 @@ public: TextureIsOpaque = 0x0010 }; Q_DECLARE_FLAGS(CreateTextureOptions, CreateTextureOption) + Q_FLAG(CreateTextureOptions) explicit QSGEngine(QObject *parent = nullptr); ~QSGEngine() override; |