diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2017-09-14 19:23:36 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2017-09-18 13:26:32 +0000 |
| commit | 44ae9cdb95b14813d339c7bbd00df608261c8b9d (patch) | |
| tree | 3e3c915a61bc93546718dd60b18854d01d120492 | |
| parent | bfab1db38167d31f0487f96d2d4b02d9243bc777 (diff) | |
Fix compilation with -no-opengl
Change-Id: I91aab9d78ff4dced55cb118ea8f88994bd1d2c20
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2dtexture.cpp | 5 | ||||
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgrenderer.cpp | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/quick/items/context2d/qquickcontext2dtexture.cpp b/src/quick/items/context2d/qquickcontext2dtexture.cpp index 6136feb4ea..a8bf14ba9f 100644 --- a/src/quick/items/context2d/qquickcontext2dtexture.cpp +++ b/src/quick/items/context2d/qquickcontext2dtexture.cpp @@ -54,11 +54,12 @@ #include <QtGui/QGuiApplication> QT_BEGIN_NAMESPACE -#if QT_CONFIG(opengl) -#define QT_MINIMUM_FBO_SIZE 64 Q_LOGGING_CATEGORY(lcCanvas, "qt.quick.canvas") +#if QT_CONFIG(opengl) +#define QT_MINIMUM_FBO_SIZE 64 + static inline int qt_next_power_of_two(int v) { v--; diff --git a/src/quick/scenegraph/coreapi/qsgrenderer.cpp b/src/quick/scenegraph/coreapi/qsgrenderer.cpp index 0458e2dead..67bd265801 100644 --- a/src/quick/scenegraph/coreapi/qsgrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgrenderer.cpp @@ -50,7 +50,9 @@ QT_BEGIN_NAMESPACE +#if QT_CONFIG(opengl) static const bool qsg_sanity_check = qEnvironmentVariableIntValue("QSG_SANITY_CHECK"); +#endif static QElapsedTimer frameTimer; static qint64 preprocessTime; |