diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-04 10:34:08 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-05 10:46:12 +0200 |
| commit | 8f3b218099d9f1d9aa4ae58474430f864a8758ef (patch) | |
| tree | f48d70803a3b9e5fe3c4f879d8b90a5919f8fde4 /src/declarative/items/qsgview.h | |
| parent | a61337b33ae1a3ee2df1570da30880e8fe9237e9 (diff) | |
Make QSGCanvas a QWindow instead of a QGLWidget
Change-Id: I71a04f61acff893a35c00204ed11bdf852830485
Reviewed-on: http://codereview.qt.nokia.com/2675
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/declarative/items/qsgview.h')
| -rw-r--r-- | src/declarative/items/qsgview.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/declarative/items/qsgview.h b/src/declarative/items/qsgview.h index 9b5ace13f3..62b52c865b 100644 --- a/src/declarative/items/qsgview.h +++ b/src/declarative/items/qsgview.h @@ -66,10 +66,8 @@ class Q_DECLARATIVE_EXPORT QSGView : public QSGCanvas Q_PROPERTY(QUrl source READ source WRITE setSource DESIGNABLE true) Q_ENUMS(ResizeMode Status) public: - explicit QSGView(QWidget *parent = 0, Qt::WindowFlags f = 0); - explicit QSGView(const QGLFormat &format, QWidget *parent = 0, Qt::WindowFlags f = 0); - QSGView(const QUrl &source, QWidget *parent = 0, Qt::WindowFlags f = 0); - QSGView(const QUrl &source, const QGLFormat &format, QWidget *parent = 0, Qt::WindowFlags f = 0); + explicit QSGView(QWindow *parent = 0, Qt::WindowFlags f = 0); + QSGView(const QUrl &source, QWindow *parent = 0, Qt::WindowFlags f = 0); virtual ~QSGView(); QUrl source() const; @@ -102,7 +100,6 @@ private Q_SLOTS: protected: virtual void resizeEvent(QResizeEvent *); - virtual void paintEvent(QPaintEvent *event); virtual void timerEvent(QTimerEvent*); virtual void keyPressEvent(QKeyEvent *); |