Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/examples/opengl/hellogl/glwidget.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the examples of the Qt Toolkit.
     
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
     
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
     
    4444
    4545#include <QGLWidget>
     46
     47
    4648
    4749//! [0]
     
    8183//! [3]
    8284private:
    83     GLuint makeObject();
    84     void quad(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2,
    85               GLdouble x3, GLdouble y3, GLdouble x4, GLdouble y4);
    86     void extrude(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
    87     void normalizeAngle(int *angle);
    88 
    89     GLuint object;
     85    QtLogo *logo;
    9086    int xRot;
    9187    int yRot;
    9288    int zRot;
    9389    QPoint lastPos;
    94     QColor trolltechGreen;
    95     QColor trolltechPurple;
     90    QColor Green;
     91    QColor Purple;
    9692};
    9793//! [3]
Note: See TracChangeset for help on using the changeset viewer.