AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

examples: compile w/o opengl

Browse Source 
Fixes remnants of an automated QtGui -> QtWidgets port.

Change-Id: I31f63bdd6ae71aee8e70b20e24def30e0eafb725
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Marc Mutz 2012-02-23 07:26:29 +01:00 committed by Qt by Nokia
parent 71fe29711f
commit 88016d30a0
8 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/animation/sub-attaq/mainwindow.cpp
View File

@ -45,13 +45,13 @@
//Qt //Qt
#include <QGraphicsView> #include <QGraphicsView>
#include <QApplication>
#include <QMenu>
#include <QMenuBar>
#include <QLayout>
#ifdef QT_NO_OPENGL #ifndef QT_NO_OPENGL
#include <QtGui/QMenuBar> # include <QtOpenGL/QtOpenGL>
#include <QtGui/QLayout>
#include <QtGui/QApplication>
#else
#include <QtOpenGL/QtOpenGL>
#endif #endif
MainWindow::MainWindow() : QMainWindow(0) MainWindow::MainWindow() : QMainWindow(0)

3
examples/animation/sub-attaq/sub-attaq.pro
View File

@ -1,4 +1,5 @@
contains(QT_CONFIG, opengl):QT += opengl widgets QT += widgets
contains(QT_CONFIG, opengl):QT += opengl
HEADERS += boat.h \ HEADERS += boat.h \
bomb.h \ bomb.h \
mainwindow.h \ mainwindow.h \

3
examples/graphicsview/padnavigator/padnavigator.pro
View File

@ -16,7 +16,8 @@ RESOURCES += \
FORMS += \ FORMS += \
form.ui form.ui
contains(QT_CONFIG, opengl):QT += opengl widgets QT += widgets
contains(QT_CONFIG, opengl):QT += opengl
# install # install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/padnavigator target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/padnavigator

3
examples/painting/affine/affine.pro
View File

@ -3,8 +3,9 @@ HEADERS += xform.h
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) { contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
DEFINES += QT_OPENGL_SUPPORT DEFINES += QT_OPENGL_SUPPORT
QT += opengl widgets QT += opengl
} }
QT += widgets
SHARED_FOLDER = ../shared SHARED_FOLDER = ../shared

3
examples/painting/composition/composition.pro
View File

@ -8,8 +8,9 @@ include($$SHARED_FOLDER/shared.pri)
RESOURCES += composition.qrc RESOURCES += composition.qrc
contains(QT_CONFIG, opengl) { contains(QT_CONFIG, opengl) {
DEFINES += QT_OPENGL_SUPPORT DEFINES += QT_OPENGL_SUPPORT
QT += opengl widgets QT += opengl
} }
QT += widgets
# install # install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/composition target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/composition

3
examples/painting/deform/deform.pro
View File

@ -9,8 +9,9 @@ RESOURCES += deform.qrc
contains(QT_CONFIG, opengl) { contains(QT_CONFIG, opengl) {
DEFINES += QT_OPENGL_SUPPORT DEFINES += QT_OPENGL_SUPPORT
QT += opengl widgets QT += opengl
} }
QT += widgets
# install # install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/deform target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/deform

3
examples/painting/gradients/gradients.pro
View File

@ -8,8 +8,9 @@ include($$SHARED_FOLDER/shared.pri)
RESOURCES += gradients.qrc RESOURCES += gradients.qrc
contains(QT_CONFIG, opengl) { contains(QT_CONFIG, opengl) {
DEFINES += QT_OPENGL_SUPPORT DEFINES += QT_OPENGL_SUPPORT
QT += opengl widgets QT += opengl
} }
QT += widgets
# install # install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/gradients target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/gradients

3
examples/painting/pathstroke/pathstroke.pro
View File

@ -9,8 +9,9 @@ RESOURCES += pathstroke.qrc
contains(QT_CONFIG, opengl) { contains(QT_CONFIG, opengl) {
DEFINES += QT_OPENGL_SUPPORT DEFINES += QT_OPENGL_SUPPORT
QT += opengl widgets QT += opengl
} }
QT += widgets
# install # install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/pathstroke target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/pathstroke