From 88016d30a0bfb46910b6d45c8de9df93adc3af82 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Thu, 23 Feb 2012 07:26:29 +0100
Subject: examples: compile w/o opengl

Fixes remnants of an automated QtGui -> QtWidgets port.

Change-Id: I31f63bdd6ae71aee8e70b20e24def30e0eafb725
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 examples/animation/sub-attaq/mainwindow.cpp | 12 ++++++------
 examples/animation/sub-attaq/sub-attaq.pro  |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'examples/animation/sub-attaq')

diff --git a/examples/animation/sub-attaq/mainwindow.cpp b/examples/animation/sub-attaq/mainwindow.cpp
index fd41cee6dc..70f0303177 100644
--- a/examples/animation/sub-attaq/mainwindow.cpp
+++ b/examples/animation/sub-attaq/mainwindow.cpp
@@ -45,13 +45,13 @@
 
 //Qt
 #include <QGraphicsView>
+#include <QApplication>
+#include <QMenu>
+#include <QMenuBar>
+#include <QLayout>
 
-#ifdef QT_NO_OPENGL
-    #include <QtGui/QMenuBar>
-    #include <QtGui/QLayout>
-    #include <QtGui/QApplication>
-#else
-    #include <QtOpenGL/QtOpenGL>
+#ifndef QT_NO_OPENGL
+# include <QtOpenGL/QtOpenGL>
 #endif
 
 MainWindow::MainWindow() : QMainWindow(0)
diff --git a/examples/animation/sub-attaq/sub-attaq.pro b/examples/animation/sub-attaq/sub-attaq.pro
index e994694b54..6d9b3195ac 100644
--- a/examples/animation/sub-attaq/sub-attaq.pro
+++ b/examples/animation/sub-attaq/sub-attaq.pro
@@ -1,4 +1,5 @@
-contains(QT_CONFIG, opengl):QT += opengl widgets
+QT += widgets
+contains(QT_CONFIG, opengl):QT += opengl
 HEADERS += boat.h \
     bomb.h \
     mainwindow.h \
-- 
cgit v1.2.3