diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-04-06 14:41:19 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-08 07:15:38 +0200 |
| commit | f2cced7c9cc9f935960ac397e52b3f4fca7005a7 (patch) | |
| tree | a011981dee2c1303757224569716d658783b4b85 | |
| parent | 54684fddfa2ea8b0c29f0c4a2a3df1ace6ca779e (diff) | |
| download | qt3d-f2cced7c9cc9f935960ac397e52b3f4fca7005a7.tar.gz | |
Fix warnings in qt3d found by GCC 4.8
shaderprogram.cpp:465:5: warning: case value ‘38’ not in enumerated type ‘QVariant::Type’ [-Wswitch]
qglcolladafxeffectfactory.h:90:129: error: ‘QString::QString(const char*)’ is private
Change-Id: I1c5618bca011cbfa06731e9ae03e3ec45d9fb625
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | src/imports/threed/shaderprogram.cpp | 2 | ||||
| -rw-r--r-- | src/threed/effects/qglcolladafxeffectfactory.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/threed/shaderprogram.cpp b/src/imports/threed/shaderprogram.cpp index d25be35ce..947ba01eb 100644 --- a/src/imports/threed/shaderprogram.cpp +++ b/src/imports/threed/shaderprogram.cpp @@ -458,7 +458,7 @@ inline bool ShaderProgramEffect::setUniformForPropertyIndex(int propertyIndex, Q QVariant value = parent.data()->metaObject()->property(propertyIndex).read(parent.data()); - switch(value.type()) + switch(int(value.type())) { case QVariant::Double: // Convert double to float to pass to shader program diff --git a/src/threed/effects/qglcolladafxeffectfactory.h b/src/threed/effects/qglcolladafxeffectfactory.h index 5174cf6eb..443a9740a 100644 --- a/src/threed/effects/qglcolladafxeffectfactory.h +++ b/src/threed/effects/qglcolladafxeffectfactory.h @@ -87,7 +87,7 @@ protected: static QGLColladaFxEffect* processTechniqueElement( QXmlStreamReader& xml, ResultState* stateStack, QString &profileName ); static QGLColladaParam* processNewparamElement( QXmlStreamReader& xml, ResultState* stateStack ); static void processImageElement( QXmlStreamReader& xml, ResultState* stateStack ); - static QGLColladaSurfaceParam* processSurfaceElement( QXmlStreamReader& xml, ResultState* stateStack, QString passedInSid = ""); + static QGLColladaSurfaceParam* processSurfaceElement( QXmlStreamReader& xml, ResultState* stateStack, QString passedInSid = QString()); static void processSampler2DElement( QXmlStreamReader& xml, ResultState* stateStack, QString passedInSid ); static QGLTexture2D* processTextureElement( QXmlStreamReader& xml , ResultState* stateStack ); static QVariant processFloatList( QXmlStreamReader& xml ); |