aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:23:18 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:23:18 +0200
commit509c7b7f7da2fd69444b7dba32f31db51ad40aa8 (patch)
treec83360872b072e97de60d453a6aff76293f5f42b
parent5b5b33e4eb871d31e6a74bde06a02be9239cc165 (diff)
parent15fb52a91240efa495d8a4cdca533bfc4615fbbd (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
-rw-r--r--src/macextras/qmactoolbar.h4
-rw-r--r--src/macextras/qmactoolbaritem.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/macextras/qmactoolbar.h b/src/macextras/qmactoolbar.h
index 5ef4395..668aeae 100644
--- a/src/macextras/qmactoolbar.h
+++ b/src/macextras/qmactoolbar.h
@@ -59,8 +59,8 @@ class Q_MACEXTRAS_EXPORT QMacToolBar : public QObject
{
Q_OBJECT
public:
- explicit QMacToolBar(QObject *parent = 0);
- QMacToolBar(const QString &identifier, QObject *parent = 0);
+ explicit QMacToolBar(QObject *parent = Q_NULLPTR);
+ explicit QMacToolBar(const QString &identifier, QObject *parent = Q_NULLPTR);
~QMacToolBar();
QMacToolBarItem *addItem(const QIcon &icon, const QString &text);
diff --git a/src/macextras/qmactoolbaritem.h b/src/macextras/qmactoolbaritem.h
index a3a101b..8f2140e 100644
--- a/src/macextras/qmactoolbaritem.h
+++ b/src/macextras/qmactoolbaritem.h
@@ -68,7 +68,7 @@ public:
FlexibleSpace
};
- QMacToolBarItem(QObject *parent = 0);
+ explicit QMacToolBarItem(QObject *parent = Q_NULLPTR);
virtual ~QMacToolBarItem();
bool selectable() const;