diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-30 10:04:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-30 10:04:57 (GMT) |
| commit | dc63643883ecda5d92d561e41e44254276a1ff2b (patch) | |
| tree | 192f9a9d37927b828ca41cf9cfbe2a1216adb5a0 | |
| parent | 865bcb8c33287d04ca914f9cbc33730753bccc6a (diff) | |
| parent | 79fc59bb9dc62a9c0ee05a057973c6b4408f616b (diff) | |
| download | Qt-dc63643883ecda5d92d561e41e44254276a1ff2b.zip Qt-dc63643883ecda5d92d561e41e44254276a1ff2b.tar.gz Qt-dc63643883ecda5d92d561e41e44254276a1ff2b.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
tst_qgl: enable back on mac
| -rw-r--r-- | tests/auto/qgl/tst_qgl.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp index 085ca54..5fe453b 100644 --- a/tests/auto/qgl/tst_qgl.cpp +++ b/tests/auto/qgl/tst_qgl.cpp @@ -72,9 +72,7 @@ public: tst_QGL(); virtual ~tst_QGL(); -#ifndef Q_WS_MAC //All tests are disabled on mac as they crash and prevent integration, see QTBUG-12138 private slots: -#endif void getSetCheck(); void openGLVersionCheck(); void graphicsViewClipping(); |