diff options
| author | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-08-07 17:24:11 +0300 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-08-07 19:17:57 +0200 |
| commit | a7edcb7c8d710367ab7a9deddf22fbc6ab8f59a3 (patch) | |
| tree | dbabc9c473f5d0a0f644730a6b6f03ef4ceb2be6 /examples | |
| parent | d107e2ba88e44590f77c608073eee6429f3d3a8c (diff) | |
Fix namespaced build
Change-Id: Id73f8ddffe00359f38c634fc88b1f81ac5638653
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qwindow-compositor/qwindowcompositor.cpp | 4 | ||||
| -rw-r--r-- | examples/qwindow-compositor/qwindowcompositor.h | 4 | ||||
| -rw-r--r-- | examples/qwindow-compositor/textureblitter.cpp | 4 | ||||
| -rw-r--r-- | examples/qwindow-compositor/textureblitter.h | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/examples/qwindow-compositor/qwindowcompositor.cpp b/examples/qwindow-compositor/qwindowcompositor.cpp index 2cb1b3624..712beafa5 100644 --- a/examples/qwindow-compositor/qwindowcompositor.cpp +++ b/examples/qwindow-compositor/qwindowcompositor.cpp @@ -55,6 +55,8 @@ #include <QtCompositor/qwaylandbufferref.h> #include <QtCompositor/qwaylandsurfaceview.h> +QT_BEGIN_NAMESPACE + static GLuint textureFromImage(const QImage &image) { GLuint texture = 0; @@ -464,3 +466,5 @@ bool QWindowCompositor::eventFilter(QObject *obj, QEvent *event) } return false; } + +QT_END_NAMESPACE diff --git a/examples/qwindow-compositor/qwindowcompositor.h b/examples/qwindow-compositor/qwindowcompositor.h index a366b8951..f075c151d 100644 --- a/examples/qwindow-compositor/qwindowcompositor.h +++ b/examples/qwindow-compositor/qwindowcompositor.h @@ -50,6 +50,8 @@ #include <QObject> #include <QTimer> +QT_BEGIN_NAMESPACE + class QWaylandSurfaceView; class QWindowCompositor : public QObject, public QWaylandCompositor @@ -109,4 +111,6 @@ private: Qt::KeyboardModifiers m_modifiers; }; +QT_END_NAMESPACE + #endif // QWINDOWCOMPOSITOR_H diff --git a/examples/qwindow-compositor/textureblitter.cpp b/examples/qwindow-compositor/textureblitter.cpp index fc002040c..d7d569e64 100644 --- a/examples/qwindow-compositor/textureblitter.cpp +++ b/examples/qwindow-compositor/textureblitter.cpp @@ -44,6 +44,8 @@ #include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLFunctions> +QT_BEGIN_NAMESPACE + TextureBlitter::TextureBlitter() : m_shaderProgram(new QOpenGLShaderProgram) { @@ -160,3 +162,5 @@ void TextureBlitter::drawTexture(int textureId, const QRectF &targetRect, const currentContext->functions()->glDisableVertexAttribArray(m_vertexCoordEntry); currentContext->functions()->glDisableVertexAttribArray(m_textureCoordEntry); } + +QT_END_NAMESPACE diff --git a/examples/qwindow-compositor/textureblitter.h b/examples/qwindow-compositor/textureblitter.h index 8d4e2803c..7426c6f29 100644 --- a/examples/qwindow-compositor/textureblitter.h +++ b/examples/qwindow-compositor/textureblitter.h @@ -43,6 +43,8 @@ #include <QtGui/QMatrix4x4> +QT_BEGIN_NAMESPACE + class QOpenGLShaderProgram; class TextureBlitter { @@ -64,4 +66,6 @@ private: int m_textureCoordEntry; }; +QT_END_NAMESPACE + #endif // TEXTUREBLITTER_H |