diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-18 11:00:02 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-19 10:31:31 +0200 |
commit | 5ddcd47dbdab9710a547244d29fe038bde3d8c98 (patch) | |
tree | fb6176ee512708eabc01cbe43f557c4d306e8c82 /src/declarative/scenegraph | |
parent | 8f72ef77d1f37b46583deed532951c6b0e5937ae (diff) |
Declarative: Fix MSVC and g++ warnings
Potentially severe:
- Fix int/bool mismatches
- Use of uninitialized variable
- Do connectionMask shift operations in 64bit
- Enum type mismatch for QLineControl::EchoMode
Various:
- class/struct mismatches
- UnhandledEnumeration values
- Unused variables
- Constructor initialization order
Change-Id: Ieb52f8990445fe95f94070175a0f9beb66863240
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/scenegraph')
-rw-r--r-- | src/declarative/scenegraph/coreapi/qsgnodeupdater.cpp | 2 | ||||
-rw-r--r-- | src/declarative/scenegraph/util/qsgvertexcolormaterial.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/scenegraph/coreapi/qsgnodeupdater.cpp b/src/declarative/scenegraph/coreapi/qsgnodeupdater.cpp index 88d7e5a8bf..7bf03fd86b 100644 --- a/src/declarative/scenegraph/coreapi/qsgnodeupdater.cpp +++ b/src/declarative/scenegraph/coreapi/qsgnodeupdater.cpp @@ -192,6 +192,8 @@ void QSGNodeUpdater::leaveGeometryNode(QSGGeometryNode *g) { #ifdef QSG_UPDATER_DEBUG qDebug() << "leave geometry" << g; +#else + Q_UNUSED(g) #endif } diff --git a/src/declarative/scenegraph/util/qsgvertexcolormaterial.cpp b/src/declarative/scenegraph/util/qsgvertexcolormaterial.cpp index 5f6270367f..78cef55215 100644 --- a/src/declarative/scenegraph/util/qsgvertexcolormaterial.cpp +++ b/src/declarative/scenegraph/util/qsgvertexcolormaterial.cpp @@ -145,7 +145,7 @@ QSGVertexColorMaterial::QSGVertexColorMaterial() \internal */ -int QSGVertexColorMaterial::compare(const QSGMaterial *other) const +int QSGVertexColorMaterial::compare(const QSGMaterial * /* other */) const { return 0; } |