diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-30 19:17:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-30 19:17:19 (GMT) |
| commit | d6174e48b4835d6fdaf10d9b742b866f03cbdcef (patch) | |
| tree | bef5ee41101714dc38852500276d60ebb1696841 /src/declarative/qml/qdeclarativeengine.cpp | |
| parent | bb1a6cd1e9d6d00e8d70f665ca223261e9eda06e (diff) | |
| parent | a93a09e3a59563421a3deb76a5b0509c4b1d1cea (diff) | |
| download | Qt-d6174e48b4835d6fdaf10d9b742b866f03cbdcef.zip Qt-d6174e48b4835d6fdaf10d9b742b866f03cbdcef.tar.gz Qt-d6174e48b4835d6fdaf10d9b742b866f03cbdcef.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix resource leak in QEgl::getCompatibleVisualld()
Fixed OpenGL state getting out of sync.
Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3a
Declarative: Fix compiler warnings (Linux/g++)
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index add1ab7..7ac3a68 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -2231,9 +2231,8 @@ bool QDeclarative_isFileCaseCorrect(const QString &fileName) return false; } #else - Q_UNUSED(fileName); + Q_UNUSED(fileName) #endif - return true; } |