diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-13 19:45:20 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-03-13 19:45:20 +0000 |
| commit | 77e71dac1607232160006579420df8b603118462 (patch) | |
| tree | 8fe71cc79127465f63944eb0dd48a00478546f57 /tests/auto/widgets/util/qundogroup | |
| parent | 70e772079f4943822cc469ef83fb9c43afc36514 (diff) | |
| parent | d51c3ecf8ef6e28557c66745f50a223cc5b1ce54 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9
Diffstat (limited to 'tests/auto/widgets/util/qundogroup')
| -rw-r--r-- | tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp index 7641ea6b68..62c3469447 100644 --- a/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp +++ b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp @@ -606,7 +606,7 @@ void tst_QUndoGroup::addStackAndDie() void tst_QUndoGroup::commandTextFormat() { -#ifdef QT_NO_PROCESS +#if !QT_CONFIG(process) QSKIP("No QProcess available"); #else QString binDir = QLibraryInfo::location(QLibraryInfo::BinariesPath); |