diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-01 10:26:36 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-01 10:26:36 +0100 |
| commit | c043ebebaba80b32ddb69ed29aa3408549567a6d (patch) | |
| tree | fb23afdccd8fd566d973ff3b3f95f30e8b24845e /examples/scxml/sudoku/sudoku.pro | |
| parent | 38d0c7d930ce986e1406ce24894de4e4bced5387 (diff) | |
| parent | be2cb77f0c882444d4d1080953b4d1b961973c0a (diff) | |
Merge remote-tracking branch 'origin/5.10' into devv5.11.0-alpha1
Conflicts:
.qmake.conf
src/scxml/qscxmlcompiler.cpp
Change-Id: Ie338e2c6a09e2d885d5f57a80abd386065ac8bc8
Diffstat (limited to 'examples/scxml/sudoku/sudoku.pro')
| -rw-r--r-- | examples/scxml/sudoku/sudoku.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/scxml/sudoku/sudoku.pro b/examples/scxml/sudoku/sudoku.pro index 0853a5e..7eddc14 100644 --- a/examples/scxml/sudoku/sudoku.pro +++ b/examples/scxml/sudoku/sudoku.pro @@ -1,4 +1,5 @@ QT += widgets scxml +requires(qtConfig(combobox)) CONFIG += c++11 |