diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-04-13 20:56:01 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-04-13 20:56:01 +0200 |
| commit | 1fb1c6c4f8769250dffa375e3941738eb1fcc885 (patch) | |
| tree | 4f4c4afae97b54a793a0589f8ca53b7c919de728 /src/quick/items/qquickshadereffect_p.h | |
| parent | d0ce320646b7f852a24f6e0a9e9621ddcedef554 (diff) | |
| parent | 9c1c471e54bb12e8740b76d1c048f2f916a6ab59 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: Ie2894830470a69827d4ace3d8af9bee971e3fbd4
Diffstat (limited to 'src/quick/items/qquickshadereffect_p.h')
| -rw-r--r-- | src/quick/items/qquickshadereffect_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h index d269dc5e50..30bd018098 100644 --- a/src/quick/items/qquickshadereffect_p.h +++ b/src/quick/items/qquickshadereffect_p.h @@ -117,7 +117,9 @@ public: bool isComponentComplete() const; QString parseLog(); +#if QT_CONFIG(opengl) bool isOpenGLShaderEffect() const; +#endif Q_SIGNALS: void fragmentShaderChanged(); |