diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-23 12:35:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-23 12:35:17 (GMT) |
| commit | e1af4576320a5d29aac9016ccc54432fbf13b9be (patch) | |
| tree | fa24c691d7001dd7cbc37decde182fe08964b683 /tests/auto/qgl | |
| parent | 26d5ca5f3b33e7b0f38426034c99bc17557e5414 (diff) | |
| parent | 1ac559f5ea335de5d78bef8d991133b95081a1b7 (diff) | |
| download | Qt-e1af4576320a5d29aac9016ccc54432fbf13b9be.zip Qt-e1af4576320a5d29aac9016ccc54432fbf13b9be.tar.gz Qt-e1af4576320a5d29aac9016ccc54432fbf13b9be.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
Revert variable overwritten by copying from Qt5
New style sheet for offline (QCH) documentation
New style sheet for offline (QCH) documentation
Symbian: Fix exporting and importing of some functions for autotests
Symbian: Fix SRCDIR usage in qlayout autotest.
Symbian: Fix qcssparser autotest
Symbian: Fix qscriptextensionplugin autotest
qnetworkproxy_mac.cpp was not compiled in on Mac for the network module
Diffstat (limited to 'tests/auto/qgl')
| -rw-r--r-- | tests/auto/qgl/tst_qgl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/qgl/tst_qgl.cpp index 9c51e02..27c8ced 100644 --- a/tests/auto/qgl/tst_qgl.cpp +++ b/tests/auto/qgl/tst_qgl.cpp @@ -648,7 +648,7 @@ void tst_QGL::getSetCheck() #ifdef QT_BUILD_INTERNAL QT_BEGIN_NAMESPACE -extern QGLFormat::OpenGLVersionFlags qOpenGLVersionFlagsFromString(const QString &versionString); +extern Q_AUTOTEST_EXPORT QGLFormat::OpenGLVersionFlags qOpenGLVersionFlagsFromString(const QString &versionString); QT_END_NAMESPACE #endif |