diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 11:30:00 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 11:30:01 +0200 |
| commit | d314819fc02139e05e16c56657898c704f7fb48f (patch) | |
| tree | a61ba968233634948401c8339f9613844de1c2b5 /src/corelib/statemachine/qstatemachine.h | |
| parent | 9f888d2fde9c5413e5519e0914e9b13638760985 (diff) | |
| parent | e0e9e196a72ffe5457034894eaaadc90ed0d34ef (diff) | |
| download | qtbase-d314819fc02139e05e16c56657898c704f7fb48f.tar.gz | |
Merge dev into 5.8
Change-Id: I41ee7b50534b01cf042bed8bb8824ba2e5026a29
Diffstat (limited to 'src/corelib/statemachine/qstatemachine.h')
| -rw-r--r-- | src/corelib/statemachine/qstatemachine.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h index 843844e172..031d9ceee2 100644 --- a/src/corelib/statemachine/qstatemachine.h +++ b/src/corelib/statemachine/qstatemachine.h @@ -141,7 +141,7 @@ public: QSet<QAbstractState*> configuration() const; -#ifndef QT_NO_STATEMACHINE_EVENTFILTER +#if QT_CONFIG(qeventtransition) bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; #endif |