diff options
author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-02-12 15:32:08 +0100 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-02-12 19:45:45 +0000 |
commit | b6ff963362955f63ca35daa0268d8fde93229997 (patch) | |
tree | 764b3b8d6e9e3407ea6f7e5b6af1b005f9308ded /src/quick/scenegraph/util/qsgdefaultpainternode.cpp | |
parent | 707e6f528fc79db236d282e7ea41eb952c825433 (diff) |
Revert "Build (and fail) Quick with -no-opengl"
This reverts commit 707e6f528fc79db236d282e7ea41eb952c825433.
We will not pursue this route for the time being.
Change-Id: Idd1fce362440f6bf1b58901a289843fdfb39a5b7
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/quick/scenegraph/util/qsgdefaultpainternode.cpp')
-rw-r--r-- | src/quick/scenegraph/util/qsgdefaultpainternode.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp index 925f3b5b9f..2deb993a6e 100644 --- a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp +++ b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp @@ -42,18 +42,13 @@ #include <QtQuick/private/qquickpainteditem_p.h> #include <QtQuick/private/qsgcontext_p.h> - +#include <private/qopenglextensions_p.h> #include <qopenglframebufferobject.h> #include <qopenglfunctions.h> #include <qopenglpaintdevice.h> - #include <qmath.h> #include <qpainter.h> -#ifndef QT_NO_OPENGL -#include <private/qopenglextensions_p.h> -#endif - QT_BEGIN_NAMESPACE #define QT_MINIMUM_DYNAMIC_FBO_SIZE 64U |