1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable some more qtbase examples for dynamic gl builds

Browse Source 
Examples using OpenGL 1.x cannot be migrated. Therefore, similarly to ES
builds, we just disable them.

Change-Id: I76e888d2ecfb2582ae35853d9dcdd0cb686fddc6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
This commit is contained in:
Laszlo Agocs 2014-06-26 14:32:47 +02:00
parent a12ba31616
commit 53c6c90c44
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/widgets/graphicsview/graphicsview.pro
View File

@ -15,6 +15,6 @@ SUBDIRS = \
contains(DEFINES, QT_NO_CURSOR)|contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= dragdroprobot contains(DEFINES, QT_NO_CURSOR)|contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= dragdroprobot
qtHaveModule(opengl):!contains(QT_CONFIG, opengles.) { qtHaveModule(opengl):!contains(QT_CONFIG, opengles.):!contains(QT_CONFIG,dynamicgl) {
SUBDIRS += boxes SUBDIRS += boxes
} }

12
examples/widgets/painting/composition/composition.cpp
View File

@ -127,7 +127,7 @@ CompositionWidget::CompositionWidget(QWidget *parent)
QPushButton *showSourceButton = new QPushButton(mainGroup); QPushButton *showSourceButton = new QPushButton(mainGroup);
showSourceButton->setText(tr("Show Source")); showSourceButton->setText(tr("Show Source"));
#if defined(QT_OPENGL_SUPPORT) && !defined(QT_OPENGL_ES) #if defined(USE_OPENGL) && !defined(QT_OPENGL_ES)
QPushButton *enableOpenGLButton = new QPushButton(mainGroup); QPushButton *enableOpenGLButton = new QPushButton(mainGroup);
enableOpenGLButton->setText(tr("Use OpenGL")); enableOpenGLButton->setText(tr("Use OpenGL"));
enableOpenGLButton->setCheckable(true); enableOpenGLButton->setCheckable(true);
@ -157,7 +157,7 @@ CompositionWidget::CompositionWidget(QWidget *parent)
mainGroupLayout->addWidget(animateButton); mainGroupLayout->addWidget(animateButton);
mainGroupLayout->addWidget(whatsThisButton); mainGroupLayout->addWidget(whatsThisButton);
mainGroupLayout->addWidget(showSourceButton); mainGroupLayout->addWidget(showSourceButton);
#if defined(QT_OPENGL_SUPPORT) && !defined(QT_OPENGL_ES) #if defined(USE_OPENGL) && !defined(QT_OPENGL_ES)
mainGroupLayout->addWidget(enableOpenGLButton); mainGroupLayout->addWidget(enableOpenGLButton);
#endif #endif
@ -201,7 +201,7 @@ CompositionWidget::CompositionWidget(QWidget *parent)
connect(whatsThisButton, SIGNAL(clicked(bool)), view, SLOT(setDescriptionEnabled(bool))); connect(whatsThisButton, SIGNAL(clicked(bool)), view, SLOT(setDescriptionEnabled(bool)));
connect(view, SIGNAL(descriptionEnabledChanged(bool)), whatsThisButton, SLOT(setChecked(bool))); connect(view, SIGNAL(descriptionEnabledChanged(bool)), whatsThisButton, SLOT(setChecked(bool)));
connect(showSourceButton, SIGNAL(clicked()), view, SLOT(showSource())); connect(showSourceButton, SIGNAL(clicked()), view, SLOT(showSource()));
#if defined(QT_OPENGL_SUPPORT) && !defined(QT_OPENGL_ES) #if defined(USE_OPENGL) && !defined(QT_OPENGL_ES)
connect(enableOpenGLButton, SIGNAL(clicked(bool)), view, SLOT(enableOpenGL(bool))); connect(enableOpenGLButton, SIGNAL(clicked(bool)), view, SLOT(enableOpenGL(bool)));
#endif #endif
connect(animateButton, SIGNAL(toggled(bool)), view, SLOT(setAnimationEnabled(bool))); connect(animateButton, SIGNAL(toggled(bool)), view, SLOT(setAnimationEnabled(bool)));
@ -249,7 +249,7 @@ CompositionRenderer::CompositionRenderer(QWidget *parent)
m_circle_pos = QPoint(200, 100); m_circle_pos = QPoint(200, 100);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
#ifdef QT_OPENGL_SUPPORT #ifdef USE_OPENGL
m_pbuffer = 0; m_pbuffer = 0;
m_pbuffer_size = 1024; m_pbuffer_size = 1024;
#endif #endif
@ -341,7 +341,7 @@ void CompositionRenderer::drawSource(QPainter &p)
void CompositionRenderer::paint(QPainter *painter) void CompositionRenderer::paint(QPainter *painter)
{ {
#if defined(QT_OPENGL_SUPPORT) && !defined(QT_OPENGL_ES) #if defined(USE_OPENGL) && !defined(QT_OPENGL_ES)
if (usesOpenGL()) { if (usesOpenGL()) {
int new_pbuf_size = m_pbuffer_size; int new_pbuf_size = m_pbuffer_size;
@ -511,7 +511,7 @@ void CompositionRenderer::setCirclePos(const QPointF &pos)
const QRect oldRect = rectangle_around(m_circle_pos).toAlignedRect(); const QRect oldRect = rectangle_around(m_circle_pos).toAlignedRect();
m_circle_pos = pos; m_circle_pos = pos;
const QRect newRect = rectangle_around(m_circle_pos).toAlignedRect(); const QRect newRect = rectangle_around(m_circle_pos).toAlignedRect();
#if defined(QT_OPENGL_SUPPORT) && !defined(QT_OPENGL_ES) #if defined(USE_OPENGL) && !defined(QT_OPENGL_ES)
if (usesOpenGL()) { if (usesOpenGL()) {
update(); update();
return; return;

6
examples/widgets/painting/composition/composition.pro
View File

@ -6,9 +6,9 @@ SHARED_FOLDER = ../shared
include($$SHARED_FOLDER/shared.pri) include($$SHARED_FOLDER/shared.pri)
RESOURCES += composition.qrc RESOURCES += composition.qrc
qtHaveModule(opengl) { qtHaveModule(opengl): !contains(QT_CONFIG,dynamicgl) {
DEFINES += QT_OPENGL_SUPPORT DEFINES += USE_OPENGL
QT += opengl QT += opengl
} }
QT += widgets QT += widgets