diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2012-07-05 16:14:58 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-06 05:05:47 +0200 |
commit | ea9c14f3e1a42080be03d95b825a7ba8ed303bbc (patch) | |
tree | b28dbf465e2576581935f1ba40b35a56ab33172e /src | |
parent | 7815dbd7baac8635a9297b7bc465b8593338f433 (diff) |
Remove Qt::WindowFlags from QQuickView constructor
It's no longer in the constructor of QWindow. Those who wish to set it
can use the setWindowFlags function.
Change-Id: I8df57ed1ced8128723d790caaaaaaaaaaaaa787d
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/quick/items/qquickview.cpp | 24 | ||||
-rw-r--r-- | src/quick/items/qquickview.h | 6 |
2 files changed, 12 insertions, 18 deletions
diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp index 091fd76efc..0322caf941 100644 --- a/src/quick/items/qquickview.cpp +++ b/src/quick/items/qquickview.cpp @@ -166,47 +166,41 @@ void QQuickViewPrivate::itemGeometryChanged(QQuickItem *resizeItem, const QRectF */ /*! - Constructs a QQuickView with the given \a parent and window flags \a f. - The default value of \a parent is 0, default window flags \a f is Qt::Window. + Constructs a QQuickView with the given \a parent. + The default value of \a parent is 0. - \sa Qt::WindowFlags */ -QQuickView::QQuickView(QWindow *parent, Qt::WindowFlags f) +QQuickView::QQuickView(QWindow *parent) : QQuickCanvas(*(new QQuickViewPrivate), parent) { - setWindowFlags(f); d_func()->init(); } /*! - Constructs a QQuickView with the given QML \a source, \a parent and a window flags \a f. - The default value of \a parent is 0, default window flags \a f is Qt::Window. + Constructs a QQuickView with the given QML \a source and \a parent. + The default value of \a parent is 0. - \sa Qt::WindowFlags */ -QQuickView::QQuickView(const QUrl &source, QWindow *parent, Qt::WindowFlags f) +QQuickView::QQuickView(const QUrl &source, QWindow *parent) : QQuickCanvas(*(new QQuickViewPrivate), parent) { - setWindowFlags(f); d_func()->init(); setSource(source); } /*! - Constructs a QQuickView with the given QML \a engine, \a parent and a window flags \a f. - The default value of \a parent is 0, default window flags \a f is Qt::Window. + Constructs a QQuickView with the given QML \a engine and \a parent. Note: In this case, the QQuickView does not own the given \a engine object; it is the caller's responsibility to destroy the engine. If the \a engine is deleted before the view \a status() will return \a QQuickView::Error. - \sa Status, status(), errors(), Qt::WindowFlags + \sa Status, status(), errors() */ -QQuickView::QQuickView(QQmlEngine* engine, QWindow *parent, Qt::WindowFlags f) +QQuickView::QQuickView(QQmlEngine* engine, QWindow *parent) : QQuickCanvas(*(new QQuickViewPrivate), parent) { Q_ASSERT(engine); - setWindowFlags(f); d_func()->init(engine); } diff --git a/src/quick/items/qquickview.h b/src/quick/items/qquickview.h index 6ef3531080..89647ba907 100644 --- a/src/quick/items/qquickview.h +++ b/src/quick/items/qquickview.h @@ -64,9 +64,9 @@ class Q_QUICK_EXPORT QQuickView : public QQuickCanvas Q_PROPERTY(QUrl source READ source WRITE setSource DESIGNABLE true) Q_ENUMS(ResizeMode Status) public: - explicit QQuickView(QWindow *parent = 0, Qt::WindowFlags f = Qt::Window); - QQuickView(QQmlEngine* engine, QWindow *parent, Qt::WindowFlags f = Qt::Window); - QQuickView(const QUrl &source, QWindow *parent = 0, Qt::WindowFlags f = Qt::Window); + explicit QQuickView(QWindow *parent = 0); + QQuickView(QQmlEngine* engine, QWindow *parent); + QQuickView(const QUrl &source, QWindow *parent = 0); virtual ~QQuickView(); QUrl source() const; |