diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/macextras/qmactoolbar.h | 4 | ||||
| -rw-r--r-- | src/macextras/qmactoolbaritem.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf index 52f1d69..7dccd20 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.10.1 +MODULE_VERSION = 5.11.0 diff --git a/src/macextras/qmactoolbar.h b/src/macextras/qmactoolbar.h index 668aeae..2706089 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 = Q_NULLPTR); - explicit QMacToolBar(const QString &identifier, QObject *parent = Q_NULLPTR); + explicit QMacToolBar(QObject *parent = nullptr); + explicit QMacToolBar(const QString &identifier, QObject *parent = nullptr); ~QMacToolBar(); QMacToolBarItem *addItem(const QIcon &icon, const QString &text); diff --git a/src/macextras/qmactoolbaritem.h b/src/macextras/qmactoolbaritem.h index 8f2140e..eb0bd71 100644 --- a/src/macextras/qmactoolbaritem.h +++ b/src/macextras/qmactoolbaritem.h @@ -68,7 +68,7 @@ public: FlexibleSpace }; - explicit QMacToolBarItem(QObject *parent = Q_NULLPTR); + explicit QMacToolBarItem(QObject *parent = nullptr); virtual ~QMacToolBarItem(); bool selectable() const; |