diff options
author | Lars Knoll <lars.knoll@qt.io> | 2016-08-30 12:23:53 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2016-10-11 06:05:09 +0000 |
commit | 8d330f55ba26600b93dda9fdcfacb571cfd1e94b (patch) | |
tree | 7bd9a2facc8b72ded18b55f7351cd40395bb33cd /src/widgets/statemachine/statemachine.pri | |
parent | 267dd9133d76d466c0f940e7286dc9ba03bac18e (diff) |
Fix build with statemachine feature disabled
The sources of the state machine are excluded completely at the build
system level instead of littering them with #ifs.
All remaining usages of QT_NO_STATEMACHINE are converted to
QT_CONFIG(statemachine) or a QT_REQUIRE_CONFIG(statemachine).
Also make the qeventtransition feature dependent on statemachine.
Change-Id: Ib05c7ca263a02042523fff8f794fa87342df1069
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/widgets/statemachine/statemachine.pri')
-rw-r--r-- | src/widgets/statemachine/statemachine.pri | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/widgets/statemachine/statemachine.pri b/src/widgets/statemachine/statemachine.pri index 2eb1e05be6..7b6407bde5 100644 --- a/src/widgets/statemachine/statemachine.pri +++ b/src/widgets/statemachine/statemachine.pri @@ -1,5 +1,8 @@ -SOURCES += $$PWD/qguistatemachine.cpp -!contains(DEFINES, QT_NO_STATEMACHINE_EVENTFILTER) { + +qtConfig(statemachine): \ + SOURCES += $$PWD/qguistatemachine.cpp + +qtConfig(qeventtransition) { HEADERS += \ $$PWD/qkeyeventtransition.h \ $$PWD/qmouseeventtransition.h \ |