diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:32:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 19:32:35 +0100 |
| commit | 5b5b33e4eb871d31e6a74bde06a02be9239cc165 (patch) | |
| tree | 1943f623daa37594682f1e47b46c264b44515211 | |
| parent | 311be633d25f1f43c404cb5a2f2f2c3896c040bc (diff) | |
| parent | fd3e39535f98d7d26e83b7094236982401bf1d69 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Id5a322f8f448b5a654456e7a99ed1e02f1c434b0
| -rw-r--r-- | src/macextras/macextras.pro | 10 | ||||
| -rw-r--r-- | src/macextras/qmactoolbar.mm | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/macextras/macextras.pro b/src/macextras/macextras.pro index acce83c..42e6142 100644 --- a/src/macextras/macextras.pro +++ b/src/macextras/macextras.pro @@ -1,7 +1,9 @@ -include($$PWD/macextras-lib.pri) +TARGET = QtMacExtras -load(qt_build_config) QT_PRIVATE += gui-private core-private -TARGET = QtMacExtras -load(qt_module) + +include($$PWD/macextras-lib.pri) + QMAKE_DOCS = $$PWD/doc/qtmacextras.qdocconf + +load(qt_module) diff --git a/src/macextras/qmactoolbar.mm b/src/macextras/qmactoolbar.mm index d9f8a3c..c5156b2 100644 --- a/src/macextras/qmactoolbar.mm +++ b/src/macextras/qmactoolbar.mm @@ -115,8 +115,6 @@ QMacToolBar::QMacToolBar(const QString &identifier, QObject *parent) */ QMacToolBar::~QMacToolBar() { - Q_D(QMacToolBar); - [d->toolbar release]; } /*! |