diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-06 07:30:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-06 07:30:06 +0200 |
| commit | 60a2c3e453177389c0dfbca9211fa2918755124d (patch) | |
| tree | 0f329b8ae854fa1a17be31a4653bb4b76af46f86 /src/quick/scenegraph/util | |
| parent | bbc52bcbb6391c4925df26672eb1f26040c6f67c (diff) | |
| parent | fa74444ed06e4db21b0e9829a5832b886b39d372 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
tools/qmlscene/main.cpp
Change-Id: Idd6e05582ade4def1a3907f9622a8e132bec6bf7
Diffstat (limited to 'src/quick/scenegraph/util')
| -rw-r--r-- | src/quick/scenegraph/util/qsgtexturereader.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quick/scenegraph/util/qsgtexturereader.cpp b/src/quick/scenegraph/util/qsgtexturereader.cpp index 27ba119f63..5e12ca4035 100644 --- a/src/quick/scenegraph/util/qsgtexturereader.cpp +++ b/src/quick/scenegraph/util/qsgtexturereader.cpp @@ -38,9 +38,12 @@ ****************************************************************************/ #include "qsgtexturereader_p.h" -#include <private/qsgcompressedtexture_p.h> #include <private/qtexturefilereader_p.h> +#if QT_CONFIG(opengl) +#include <private/qsgcompressedtexture_p.h> +#endif + QT_BEGIN_NAMESPACE QSGTextureReader::QSGTextureReader(QIODevice *device, const QString &fileName) |