diff --git a/examples/canvas3d/examples.pri b/examples/canvas3d/examples.pri index 0d61739e505f40bb9f56c5974ca600668bdd06a4..aac7f1f2ea8cc5a43ee4c0ed0ea34d7a25b6246b 100644 --- a/examples/canvas3d/examples.pri +++ b/examples/canvas3d/examples.pri @@ -6,5 +6,6 @@ TEMPLATE = app QT += qml quick + target.path = $$[QT_INSTALL_EXAMPLES]/canvas3d/$$TARGET INSTALLS += target diff --git a/examples/canvas3d/framebuffer/main.cpp b/examples/canvas3d/framebuffer/main.cpp index 20e988e446b2a584a98e5f6e5037dc72bfbe7ec4..cfa871afe5d39b59c5f6e6c773752f030c22a0c1 100644 --- a/examples/canvas3d/framebuffer/main.cpp +++ b/examples/canvas3d/framebuffer/main.cpp @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) QString extraImportPath(QStringLiteral("%1/../../../%2")); #endif viewer.engine()->addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(), - QString::fromLatin1("qml"))); + QString::fromLatin1("qml"))); viewer.setSource(QUrl("qrc:/qml/framebuffer/main.qml")); diff --git a/examples/canvas3d/interaction/main.cpp b/examples/canvas3d/interaction/main.cpp index 1a267bc840b8f1c468c2f859acac217b11f4b675..bc7d0484b9c74b410e2e6327f6df984b539eba67 100644 --- a/examples/canvas3d/interaction/main.cpp +++ b/examples/canvas3d/interaction/main.cpp @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) QString extraImportPath(QStringLiteral("%1/../../../%2")); #endif viewer.engine()->addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(), - QString::fromLatin1("qml"))); + QString::fromLatin1("qml"))); viewer.setSource(QUrl("qrc:/qml/interaction/main.qml")); diff --git a/examples/canvas3d/plasmaeffects/main.cpp b/examples/canvas3d/plasmaeffects/main.cpp index 1051a8c575cf734ceaf65f79f0cd939da9943c6e..ffc445d5b43f067c97be5f50a90db85999a9732b 100644 --- a/examples/canvas3d/plasmaeffects/main.cpp +++ b/examples/canvas3d/plasmaeffects/main.cpp @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) QString extraImportPath(QStringLiteral("%1/../../../%2")); #endif viewer.engine()->addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(), - QString::fromLatin1("qml"))); + QString::fromLatin1("qml"))); viewer.setSource(QUrl("qrc:/qml/plasmaeffects/main.qml")); diff --git a/examples/canvas3d/textureandlight/main.cpp b/examples/canvas3d/textureandlight/main.cpp index 400cb936da65ddb2761f033384466286d1823be1..5d26dddf8e3f5cfcb323a79a46fa2cba9d05b1bd 100644 --- a/examples/canvas3d/textureandlight/main.cpp +++ b/examples/canvas3d/textureandlight/main.cpp @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) QString extraImportPath(QStringLiteral("%1/../../../%2")); #endif viewer.engine()->addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(), - QString::fromLatin1("qml"))); + QString::fromLatin1("qml"))); viewer.setSource(QUrl("qrc:/qml/textureandlight/main.qml")); diff --git a/examples/canvas3d/texturedcube/main.cpp b/examples/canvas3d/texturedcube/main.cpp index f34fe5b529d816e6f2591284af6891fa215fe2d7..908be6c1e01ba82854b3baff0dba58cd1d496754 100644 --- a/examples/canvas3d/texturedcube/main.cpp +++ b/examples/canvas3d/texturedcube/main.cpp @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) QString extraImportPath(QStringLiteral("%1/../../../%2")); #endif viewer.engine()->addImportPath(extraImportPath.arg(QGuiApplication::applicationDirPath(), - QString::fromLatin1("qml"))); + QString::fromLatin1("qml"))); viewer.setSource(QUrl("qrc:/qml/texturedcube/main.qml")); diff --git a/examples/canvas3d/texturedcube/qml/texturedcube/texturedcube.js b/examples/canvas3d/texturedcube/qml/texturedcube/texturedcube.js index fe80ff0171a3777b5f517cae1260878ad48ab444..630b02889fe3907675745366cff295082bd43a6a 100644 --- a/examples/canvas3d/texturedcube/qml/texturedcube/texturedcube.js +++ b/examples/canvas3d/texturedcube/qml/texturedcube/texturedcube.js @@ -249,7 +249,7 @@ function initShaders() { log(" initShaders ENTER {") var vertexShader = getShader(gl, - "attribute highp vec3 aVertexPosition; \ + "attribute highp vec3 aVertexPosition; \ attribute mediump vec4 aVertexColor; \ attribute highp vec2 aTextureCoord; \ \ @@ -267,7 +267,7 @@ function initShaders() vTextureCoord = aTextureCoord; \ }", gl.VERTEX_SHADER); var fragmentShader = getShader(gl, - "varying mediump vec4 vColor; \ + "varying mediump vec4 vColor; \ varying highp vec2 vTextureCoord; \ varying highp vec4 vPos; \ \ diff --git a/src/context3d.cpp b/src/context3d.cpp index 9a1144222348a2127cef3111d6afba65cde48a94..9fbedea7f562e168a0129df580624779023fb2fe 100644 --- a/src/context3d.cpp +++ b/src/context3d.cpp @@ -4821,25 +4821,25 @@ QVariant CanvasContext::getVertexAttrib(uint index, glEnums pname) return QVariant::fromValue(m_idToCanvasBufferMap[value]); } - break; + break; case VERTEX_ATTRIB_ARRAY_ENABLED: { GLint value = 0; glGetVertexAttribiv(index, GLenum(pname), &value); return QVariant::fromValue( bool(value)); } - break; + break; case VERTEX_ATTRIB_ARRAY_SIZE: { GLint value = 0; glGetVertexAttribiv(index, GLenum(pname), &value); return QVariant::fromValue(value); } - break; + break; case VERTEX_ATTRIB_ARRAY_STRIDE: { GLint value = 0; glGetVertexAttribiv(index, GLenum(pname), &value); return QVariant::fromValue(value); } - break; + break; case VERTEX_ATTRIB_ARRAY_TYPE: { GLint value = 0; glGetVertexAttribiv(index, GLenum(pname), &value); @@ -4861,7 +4861,7 @@ QVariant CanvasContext::getVertexAttrib(uint index, glEnums pname) floatList.push_back(values[2]); floatList.push_back(values[3]); return QVariant::fromValue(floatList); - } + } default: if (m_logAllErrors) qDebug() << "Context3D::" << __FUNCTION__ << ":INVALID_ENUM index must be smaller than "