diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-07-02 03:40:27 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-07-02 03:40:27 (GMT) |
| commit | 3256aad1195e28509a89f217bcad8435f46fe1e5 (patch) | |
| tree | 01e2b9d1b0db8e93679966e49db7c96fec0d8c21 /tools/qml | |
| parent | 953142469cd49fd2f5180a60dcaa7d2029457401 (diff) | |
| parent | 2497d922f06404f6fd1c65c6c685fbce173303ae (diff) | |
| download | Qt-3256aad1195e28509a89f217bcad8435f46fe1e5.zip Qt-3256aad1195e28509a89f217bcad8435f46fe1e5.tar.gz Qt-3256aad1195e28509a89f217bcad8435f46fe1e5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tools/qml')
| -rw-r--r-- | tools/qml/qmlruntime.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp index 3d7d298..03ca798 100644 --- a/tools/qml/qmlruntime.cpp +++ b/tools/qml/qmlruntime.cpp @@ -1384,6 +1384,8 @@ void QDeclarativeViewer::setUseGL(bool useGL) canvas->setViewport(glWidget); } +#else + Q_UNUSED(useGL) #endif } |