diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:31:56 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:31:57 +0100 |
| commit | b8fd0ed3a47558b4ace480526cddffa51d6f0580 (patch) | |
| tree | 926095da42e111933bdb3a63c1a9e0a14fa4041f /src/quickwidgets | |
| parent | 669c554516736a6735b7286039c56cc0e8d56e05 (diff) | |
| parent | 443ba99b1ef825e198fe1999c34ee44547135797 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Icfa1d61fcc286c3418d4a625de11d2191336fa60
Diffstat (limited to 'src/quickwidgets')
| -rw-r--r-- | src/quickwidgets/qquickwidget.h | 4 |
1 files changed, 2 insertions, 2 deletions
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; |