diff options
author | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:30:10 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:31:48 +0200 |
commit | 106d3b9bf93325ea93c678270290b2c3dda9b764 (patch) | |
tree | 26c56932d60964c83e81d9c33d6f37ebc36d6c56 /src/widgets/kernel/qaction.cpp | |
parent | 79f679da9483c12979500dd48bc096d33af9ca6f (diff) | |
parent | 8bebded9ab02b8eec67c44bfddf802d6bf9cda3c (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoamenu.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/widgets/styles/qstylehelper_p.h
Change-Id: I54247c98dd79d2b3826fc062b8b11048c9c7d9bb
Diffstat (limited to 'src/widgets/kernel/qaction.cpp')
-rw-r--r-- | src/widgets/kernel/qaction.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/widgets/kernel/qaction.cpp b/src/widgets/kernel/qaction.cpp index 57b1f31188..a7116b1462 100644 --- a/src/widgets/kernel/qaction.cpp +++ b/src/widgets/kernel/qaction.cpp @@ -114,7 +114,7 @@ void QActionPrivate::sendDataChanged() QWidget *w = widgets.at(i); QApplication::sendEvent(w, &e); } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) for (int i = 0; i < graphicsWidgets.size(); ++i) { QGraphicsWidget *w = graphicsWidgets.at(i); QApplication::sendEvent(w, &e); @@ -279,6 +279,8 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map) /*! Constructs an action with \a parent. If \a parent is an action group the action will be automatically inserted into the group. + + \note The \a parent argument is optional since Qt 5.7. */ QAction::QAction(QObject* parent) : QAction(*new QActionPrivate, parent) @@ -360,7 +362,7 @@ QList<QWidget *> QAction::associatedWidgets() const return d->widgets; } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) /*! \since 4.5 Returns a list of widgets this action has been added to. @@ -565,7 +567,7 @@ QAction::~QAction() QWidget *w = d->widgets.at(i); w->removeAction(this); } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) for (int i = d->graphicsWidgets.size()-1; i >= 0; --i) { QGraphicsWidget *w = d->graphicsWidgets.at(i); w->removeAction(this); |