From c85f6d9f5a844e28047216280182651bfc047754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@digia.com>
Date: Tue, 19 Feb 2013 13:22:53 +0100
Subject: 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>
---
 examples/gui/gui.pro                                        | 4 +++-
 examples/widgets/graphicsview/chip/view.cpp                 | 2 ++
 examples/widgets/graphicsview/padnavigator/padnavigator.cpp | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

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]
-- 
cgit v1.2.3