diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-05 14:22:45 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-05 14:22:45 +0200 |
| commit | f2856875843efce9a00e90dad05bde358ab82197 (patch) | |
| tree | 93346c38504ce04f0bf02dfe4a21299feb1be8ed /src/corelib/statemachine | |
| parent | a7b04275082d065f392e7f18c54ea9b41507ae40 (diff) | |
| parent | a2970719c26c946fd6fea7d902aad6706a4ca6ea (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
examples/corelib/ipc/ipc.pro
src/plugins/platforms/xcb/qxcbbackingstore.cpp
tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp
Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf
Diffstat (limited to 'src/corelib/statemachine')
| -rw-r--r-- | src/corelib/statemachine/qsignaltransition.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/statemachine/qsignaltransition.cpp b/src/corelib/statemachine/qsignaltransition.cpp index 5dd88aef02..9972487eb5 100644 --- a/src/corelib/statemachine/qsignaltransition.cpp +++ b/src/corelib/statemachine/qsignaltransition.cpp @@ -153,12 +153,12 @@ QSignalTransition::QSignalTransition(const QObject *sender, const char *signal, /*! \fn QSignalTransition::QSignalTransition(const QObject *sender, - PointerToMemberFunction signal, QState *sourceState); + PointerToMemberFunction signal, QState *sourceState) \since 5.7 \overload Constructs a new signal transition associated with the given \a signal of - the given \a sender object and with the given \a sourceSate. + the given \a sender object and with the given \a sourceState. This constructor is enabled if compiler supports delegating constructor. \sa Q_COMPILER_DELEGATING_CONSTRUCTORS |