diff options
Diffstat (limited to 'src/widgets/widgets/qtoolbar.cpp')
| -rw-r--r-- | src/widgets/widgets/qtoolbar.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp index 243fb6d555..7b6a2a329f 100644 --- a/src/widgets/widgets/qtoolbar.cpp +++ b/src/widgets/widgets/qtoolbar.cpp @@ -92,7 +92,6 @@ void QToolBarPrivate::init() q->setBackgroundRole(QPalette::Button); q->setAttribute(Qt::WA_Hover); q->setAttribute(Qt::WA_X11NetWmWindowTypeToolBar); - q->setProperty("_q_platform_MacUseNSWindow", QVariant(true)); QStyle *style = q->style(); int e = style->pixelMetric(QStyle::PM_ToolBarIconSize, 0, q); @@ -804,7 +803,7 @@ QAction *QToolBar::addAction(const QIcon &icon, const QString &text, return action; } -/*!\fn QAction *QToolBar::addAction(const QString &text, const QObject *receiver, PointerToMemberFunction method) +/*!\fn template<typename PointerToMemberFunction> QAction *QToolBar::addAction(const QString &text, const QObject *receiver, PointerToMemberFunction method) \since 5.6 @@ -816,7 +815,7 @@ QAction *QToolBar::addAction(const QIcon &icon, const QString &text, \a method of the \a receiver. */ -/*!\fn QAction *QToolBar::addAction(const QString &text, Functor functor) +/*!\fn template<typename Functor> QAction *QToolBar::addAction(const QString &text, Functor functor) \since 5.6 @@ -828,7 +827,7 @@ QAction *QToolBar::addAction(const QIcon &icon, const QString &text, \a functor. */ -/*!\fn QAction *QToolBar::addAction(const QString &text, const QObject *context, Functor functor) +/*!\fn template<typename Functor> QAction *QToolBar::addAction(const QString &text, const QObject *context, Functor functor) \since 5.6 @@ -842,7 +841,7 @@ QAction *QToolBar::addAction(const QIcon &icon, const QString &text, If \a context is destroyed, the functor will not be called. */ -/*!\fn QAction *QToolBar::addAction(const QIcon &icon, const QString &text, const QObject *receiver, PointerToMemberFunction method) +/*!\fn template<typename PointerToMemberFunction> QAction *QToolBar::addAction(const QIcon &icon, const QString &text, const QObject *receiver, PointerToMemberFunction method) \since 5.6 @@ -854,7 +853,7 @@ QAction *QToolBar::addAction(const QIcon &icon, const QString &text, \a method of the \a receiver. */ -/*!\fn QAction *QToolBar::addAction(const QIcon &icon, const QString &text, Functor functor) +/*!\fn template<typename Functor> QAction *QToolBar::addAction(const QIcon &icon, const QString &text, Functor functor) \since 5.6 @@ -866,7 +865,7 @@ QAction *QToolBar::addAction(const QIcon &icon, const QString &text, \a functor. */ -/*!\fn QAction *QToolBar::addAction(const QIcon &icon, const QString &text, const QObject *context, Functor functor) +/*!\fn template<typename Functor> QAction *QToolBar::addAction(const QIcon &icon, const QString &text, const QObject *context, Functor functor) \since 5.6 |