diff options
| author | Samuel Rødal <samuel.rodal@digia.com> | 2013-02-19 13:22:53 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-20 10:35:23 +0100 |
| commit | c85f6d9f5a844e28047216280182651bfc047754 (patch) | |
| tree | 2fc129c65c402eb1a2a4a4a290a4fe92b2073e98 | |
| parent | e47c2744e6cefa42fc70320e07d534742934f737 (diff) | |
| download | qtbase-c85f6d9f5a844e28047216280182651bfc047754.tar.gz | |
Fixed qtbase examples build when configured with -no-opengl
Change-Id: Idafdc3264f760d6400ce04bb9da36289b1f96438
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| -rw-r--r-- | examples/gui/gui.pro | 4 | ||||
| -rw-r--r-- | examples/widgets/graphicsview/chip/view.cpp | 2 | ||||
| -rw-r--r-- | examples/widgets/graphicsview/padnavigator/padnavigator.cpp | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/examples/gui/gui.pro b/examples/gui/gui.pro index 1a4067e893..8758a1ba95 100644 --- a/examples/gui/gui.pro +++ b/examples/gui/gui.pro @@ -3,4 +3,6 @@ CONFIG += no_docs_target SUBDIRS += analogclock SUBDIRS += rasterwindow -SUBDIRS += openglwindow +contains(QT_CONFIG, opengl(es1|es2)?) { + SUBDIRS += openglwindow +} diff --git a/examples/widgets/graphicsview/chip/view.cpp b/examples/widgets/graphicsview/chip/view.cpp index aa3082d5e8..4b5b608163 100644 --- a/examples/widgets/graphicsview/chip/view.cpp +++ b/examples/widgets/graphicsview/chip/view.cpp @@ -47,6 +47,8 @@ #endif #ifndef QT_NO_OPENGL #include <QtOpenGL> +#else +#include <QtWidgets> #endif #include <qmath.h> diff --git a/examples/widgets/graphicsview/padnavigator/padnavigator.cpp b/examples/widgets/graphicsview/padnavigator/padnavigator.cpp index e92f156ad6..82671578fb 100644 --- a/examples/widgets/graphicsview/padnavigator/padnavigator.cpp +++ b/examples/widgets/graphicsview/padnavigator/padnavigator.cpp @@ -44,6 +44,8 @@ #ifndef QT_NO_OPENGL #include <QtOpenGL> +#else +#include <QtWidgets> #endif //! [0] |