diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-07-01 08:48:15 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-07-01 08:48:15 (GMT) |
| commit | b50051646f0f01f1f7f4d46267f902c2596487db (patch) | |
| tree | ddb5edd34fca3e3cef8bc68bfa7ba6c7395dc990 | |
| parent | 07e755128c3bf4073820ecfc0ea11959b20bbd5a (diff) | |
| parent | 7bb2eb806a6d8bcead12c199ae8614af250f6a6c (diff) | |
| download | Qt-b50051646f0f01f1f7f4d46267f902c2596487db.zip Qt-b50051646f0f01f1f7f4d46267f902c2596487db.tar.gz Qt-b50051646f0f01f1f7f4d46267f902c2596487db.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -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 94fcc82..debc902 100644 --- a/tools/qml/qmlruntime.cpp +++ b/tools/qml/qmlruntime.cpp @@ -1364,6 +1364,8 @@ void QDeclarativeViewer::setUseGL(bool useGL) canvas->setViewport(glWidget); } +#else + Q_UNUSED(useGL) #endif } |