diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-29 14:13:08 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-29 14:39:07 +0200 |
| commit | cf9a304e6e3134421b8268bf8e75dc46b3d044c2 (patch) | |
| tree | 17a7587d9d42eedd8f1655048b6dc8da03383d76 /tests/auto | |
| parent | c1ccf6922637952f749cc2d67fbc07f9ab340b33 (diff) | |
Build on Windows/clean build on Linux.
Change-Id: I26552e85a8e8c63002db93b7d9b645981620f0af
Reviewed-on: http://codereview.qt.nokia.com/3738
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qgl/tst_qgl.cpp | 13 | ||||
| -rw-r--r-- | tests/auto/qglthreads/qglthreads.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qglthreads/tst_qglthreads.cpp | 1 |
3 files changed, 10 insertions, 6 deletions
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp index d66cc3bc25..e3a8500bda 100644 --- a/tests/auto/qgl/tst_qgl.cpp +++ b/tests/auto/qgl/tst_qgl.cpp @@ -1868,12 +1868,14 @@ public: int tst_QGLResource::deletions = 0; -Q_GLOBAL_STATIC(QGLContextGroupResource<tst_QGLResource>, qt_shared_test) - +#ifdef TODO +Q_GLOBAL_STATIC(QOpenGLContextGroupResource<tst_QGLResource>, qt_shared_test) +#endif //TODO #endif void tst_QGL::shareRegister() { +#ifdef TODO #ifdef QT_BUILD_INTERNAL // Create a context. QGLWidget *glw1 = new QGLWidget(); @@ -1883,15 +1885,15 @@ void tst_QGL::shareRegister() QVERIFY(!glw1->isSharing()); // Create a guard for the first context. - QGLSharedResourceGuard guard(glw1->context()); + QOpenGLSharedResourceGuard guard(glw1->context()->contextHandle()); QVERIFY(guard.id() == 0); guard.setId(3); QVERIFY(guard.id() == 3); // Request a tst_QGLResource object for the first context. - tst_QGLResource *res1 = qt_shared_test()->value(glw1->context()); + tst_QGLResource *res1 = qt_shared_test()->value(glw1->context()->contextHandle()); QVERIFY(res1); - QVERIFY(qt_shared_test()->value(glw1->context()) == res1); + QVERIFY(qt_shared_test()->value(glw1->context()->contextHandle()) == res1); // Create another context that shares with the first. QVERIFY(!glw1->isSharing()); @@ -1985,6 +1987,7 @@ void tst_QGL::shareRegister() QVERIFY(guard3.context() == 0); QVERIFY(guard3.id() == 0); #endif +#endif //TODO } // Tests QGLContext::bindTexture with default options diff --git a/tests/auto/qglthreads/qglthreads.pro b/tests/auto/qglthreads/qglthreads.pro index bd27ce8e68..d2fd31411f 100644 --- a/tests/auto/qglthreads/qglthreads.pro +++ b/tests/auto/qglthreads/qglthreads.pro @@ -1,6 +1,6 @@ load(qttest_p4) requires(contains(QT_CONFIG,opengl)) -QT += opengl +QT += opengl widgets win32:!wince*: DEFINES += QT_NO_EGL diff --git a/tests/auto/qglthreads/tst_qglthreads.cpp b/tests/auto/qglthreads/tst_qglthreads.cpp index 472379ab7a..ee05e406c8 100644 --- a/tests/auto/qglthreads/tst_qglthreads.cpp +++ b/tests/auto/qglthreads/tst_qglthreads.cpp @@ -42,6 +42,7 @@ #include <QtTest/QtTest> #include <QtCore/QtCore> #include <QtGui/QtGui> +#include <QtWidgets/QApplication> #include <QtOpenGL/QtOpenGL> #include "tst_qglthreads.h" |