From 921c30bb24f937842f0169371e553ea2cd871135 Mon Sep 17 00:00:00 2001
From: Pasi Keranen <pasi.keranen@digia.com>
Date: Fri, 7 Nov 2014 13:28:23 +0200
Subject: [PATCH] Whitespace corrections.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bunch of whitespace corrections, pushed now to test run the CI.
Change-Id: I575511d6ae7436bd3345b7d24d4b120b8eabf334
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
---
examples/canvas3d/examples.pri | 1 +
examples/canvas3d/framebuffer/main.cpp | 2 +-
examples/canvas3d/interaction/main.cpp | 2 +-
examples/canvas3d/plasmaeffects/main.cpp | 2 +-
examples/canvas3d/textureandlight/main.cpp | 2 +-
examples/canvas3d/texturedcube/main.cpp | 2 +-
.../texturedcube/qml/texturedcube/texturedcube.js | 4 ++--
src/context3d.cpp | 10 +++++-----
8 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/examples/canvas3d/examples.pri b/examples/canvas3d/examples.pri
index 0d61739..aac7f1f 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 20e988e..cfa871a 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 1a267bc..bc7d048 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 1051a8c..ffc445d 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 400cb93..5d26ddd 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 f34fe5b..908be6c 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 fe80ff0..630b028 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 9a11442..9fbedea 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 "
--
GitLab