Ignore:
Timestamp:
Aug 2, 2010, 5:05:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

vendor: Merged in qt-everywhere-opensource-src-4.6.3 from Nokia.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/vendor/nokia/qt/current/demos/composition/composition.h

    r649 r767  
    110110    void paint(QPainter *);
    111111
    112     void mousePressEvent(QMouseEvent *);
    113     void mouseMoveEvent(QMouseEvent *);
    114     void mouseReleaseEvent(QMouseEvent *);
    115 
    116112    void setCirclePos(const QPointF &pos);
    117113
    … …  
    121117    int circleColor() const { return m_circle_hue; }
    122118    int circleAlpha() const { return m_circle_alpha; }
     119
     120
     121
     122
     123
     124
    123125
    124126public slots:
    … …  
    151153    void setCircleAlpha(int alpha) { m_circle_alpha = alpha; update(); }
    152154    void setCircleColor(int hue) { m_circle_hue = hue; update(); }
    153     void setAnimationEnabled(bool enabled) { m_animation_enabled = enabled; update(); }
     155    void setAnimationEnabled(bool enabled)
    154156
    155157private:
    … …  
    178180    ObjectType m_current_object;
    179181    bool m_animation_enabled;
     182
    180183
    181184#ifdef QT_OPENGL_SUPPORT
Note: See TracChangeset for help on using the changeset viewer.