diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-12-22 09:04:22 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-12-22 09:04:22 (GMT) |
| commit | ec19758c28efc6e1c712d44a6cb32ace38d3178d (patch) | |
| tree | b50b2058b7f3a566e31dbc6b86dc947273720bdd /tests/auto/qgl/tst_qgl.cpp | |
| parent | 2a20705f874ddad55282f22fabfe30927729ae50 (diff) | |
| parent | f61a32948da3cac4b83123267ae8c5d2fa0525f6 (diff) | |
| download | Qt-ec19758c28efc6e1c712d44a6cb32ace38d3178d.zip Qt-ec19758c28efc6e1c712d44a6cb32ace38d3178d.tar.gz Qt-ec19758c28efc6e1c712d44a6cb32ace38d3178d.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'tests/auto/qgl/tst_qgl.cpp')
| -rw-r--r-- | tests/auto/qgl/tst_qgl.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp index 5dc072d..532e550 100644 --- a/tests/auto/qgl/tst_qgl.cpp +++ b/tests/auto/qgl/tst_qgl.cpp @@ -75,6 +75,7 @@ private slots: void graphicsViewClipping(); void partialGLWidgetUpdates_data(); void partialGLWidgetUpdates(); + void glWidgetWithAlpha(); void glWidgetRendering(); void glFBOSimpleRendering(); void glFBORendering(); @@ -251,15 +252,10 @@ void tst_QGL::getSetCheck() // bool QGLFormat::sampleBuffers() // void QGLFormat::setSampleBuffers(bool) -#if !defined(QT_OPENGL_ES_2) QCOMPARE(false, obj1.sampleBuffers()); QVERIFY(!obj1.testOption(QGL::SampleBuffers)); QVERIFY(obj1.testOption(QGL::NoSampleBuffers)); -#else - QCOMPARE(true, obj1.sampleBuffers()); - QVERIFY(obj1.testOption(QGL::SampleBuffers)); - QVERIFY(!obj1.testOption(QGL::NoSampleBuffers)); -#endif + obj1.setSampleBuffers(false); QCOMPARE(false, obj1.sampleBuffers()); QVERIFY(obj1.testOption(QGL::NoSampleBuffers)); @@ -927,6 +923,17 @@ void tst_QGL::glPBufferRendering() QFUZZY_COMPARE_IMAGES(fb, reference); } +void tst_QGL::glWidgetWithAlpha() +{ + QGLWidget* w = new QGLWidget(QGLFormat(QGL::AlphaChannel)); + w->show(); +#ifdef Q_WS_X11 + qt_x11_wait_for_window_manager(w); +#endif + + delete w; +} + class GLWidget : public QGLWidget { public: |