diff options
author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-06 09:12:42 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-06 09:13:13 +0200 |
commit | 0e90e0d2c385d8928d188314ed16d70050b362eb (patch) | |
tree | 26a55cc9382b9dd0c047aedd529cac248088d492 /src/quickwidgets | |
parent | 68af8842f5f580dab140f397cfd5683ebdc368cf (diff) | |
parent | 60da655dff4ffcc94d32a05bb5fa32240b0eaa0b (diff) |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Id98d3514e602a3c8c159a27be7b2fd24d7d290ae
Diffstat (limited to 'src/quickwidgets')
-rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 4 | ||||
-rw-r--r-- | src/quickwidgets/qquickwidget.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index c4e6e4ed98..0a10ec5e9c 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -990,7 +990,9 @@ QSize QQuickWidget::initialSize() const } /*! - Returns the view's root \l {QQuickItem} {item}. + Returns the view's root \l {QQuickItem} {item}. Can be null + when setContents/setSource has not been called, if they were called with + broken QtQuick code or while the QtQuick contents are being created. */ QQuickItem *QQuickWidget::rootObject() const { diff --git a/src/quickwidgets/qquickwidget.h b/src/quickwidgets/qquickwidget.h index 688cafd475..0732c506bb 100644 --- a/src/quickwidgets/qquickwidget.h +++ b/src/quickwidgets/qquickwidget.h @@ -64,9 +64,9 @@ class Q_QUICKWIDGETS_EXPORT QQuickWidget : public QWidget Q_PROPERTY(QUrl source READ source WRITE setSource DESIGNABLE true) public: - explicit QQuickWidget(QWidget *parent = 0); + explicit QQuickWidget(QWidget *parent = Q_NULLPTR); QQuickWidget(QQmlEngine* engine, QWidget *parent); - QQuickWidget(const QUrl &source, QWidget *parent = 0); + explicit QQuickWidget(const QUrl &source, QWidget *parent = Q_NULLPTR); virtual ~QQuickWidget(); QUrl source() const; |