diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:28:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:28:24 +0200 |
| commit | b5440b50f23982e7459a66b46ad41f176f67e308 (patch) | |
| tree | d4e4e50e5a5ae84df442c1e4d2345539943692aa /src/activeqt/container/qaxselect.h | |
| parent | 7477c86107ac0f5d344b380b38118c3a90f994a7 (diff) | |
| parent | a4b8485cd38a9c33cdcf1b97633fa65b7230643b (diff) | |
| download | qtactiveqt-b5440b50f23982e7459a66b46ad41f176f67e308.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Conflicts:
src/activeqt/container/qaxwidget.h
Change-Id: Ic6e7267fc71e3ace14e75b392ad3f7cac0df41a1
Diffstat (limited to 'src/activeqt/container/qaxselect.h')
| -rw-r--r-- | src/activeqt/container/qaxselect.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/container/qaxselect.h b/src/activeqt/container/qaxselect.h index 0b21c02..160b436 100644 --- a/src/activeqt/container/qaxselect.h +++ b/src/activeqt/container/qaxselect.h @@ -51,7 +51,7 @@ class QAxSelect : public QDialog { Q_OBJECT public: - QAxSelect(QWidget *parent = 0, Qt::WindowFlags flags = 0); + explicit QAxSelect(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags()); ~QAxSelect(); QString clsid() const; |