diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:42:53 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:48:01 +0100 |
commit | c9acfe0bc8dbaec1065614fa2039ebe7e05b4bda (patch) | |
tree | 6ced392965bf01be840da14e7f1606b0b5b2293d /examples/activeqt/opengl/glbox.h | |
parent | f263d206341472e23e0e1ad536faa1b0a22286c0 (diff) | |
parent | cacf666f95df9790cebf5d5cdb0609cee257fab3 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: Ie457478a64a28434afb3361dfc6f9478dd9c58bd
Diffstat (limited to 'examples/activeqt/opengl/glbox.h')
-rw-r--r-- | examples/activeqt/opengl/glbox.h | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/examples/activeqt/opengl/glbox.h b/examples/activeqt/opengl/glbox.h index 5c09912..00be3b9 100644 --- a/examples/activeqt/opengl/glbox.h +++ b/examples/activeqt/opengl/glbox.h @@ -6,7 +6,17 @@ ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: ** ** "Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are @@ -63,32 +73,28 @@ class GLBox : public QGLWidget, //! [0] //! [1] public: - - GLBox( QWidget* parent, const char* name = 0 ); - ~GLBox(); - + explicit GLBox(QWidget *parent, const char *name = nullptr); + virtual ~GLBox(); QAxAggregated *createAggregate(); public slots: - - void setXRotation( int degrees ); + void setXRotation(int degrees); //! [1] - void setYRotation( int degrees ); - void setZRotation( int degrees ); + void setYRotation(int degrees); + void setZRotation(int degrees); protected: - void initializeGL(); void paintGL(); - void resizeGL( int w, int h ); - + void resizeGL(int w, int h); virtual GLuint makeObject(); private: - - GLuint object; - GLfloat xRot, yRot, zRot, scale; - + GLuint m_object; + GLfloat m_xRot; + GLfloat m_yRot; + GLfloat m_zRot; + GLfloat m_scale; }; #endif // GLBOX_H |