diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-02-23 07:26:29 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 22:39:40 +0100 |
| commit | 88016d30a0bfb46910b6d45c8de9df93adc3af82 (patch) | |
| tree | 171e36b5851e15191308e68002405b745e731bd2 /examples/animation/sub-attaq | |
| parent | 71fe29711fcb88adcc191f1350e13f7c2544c642 (diff) | |
examples: compile w/o opengl
Fixes remnants of an automated QtGui -> QtWidgets port.
Change-Id: I31f63bdd6ae71aee8e70b20e24def30e0eafb725
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'examples/animation/sub-attaq')
| -rw-r--r-- | examples/animation/sub-attaq/mainwindow.cpp | 12 | ||||
| -rw-r--r-- | examples/animation/sub-attaq/sub-attaq.pro | 3 |
2 files changed, 8 insertions, 7 deletions
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 \ |