diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-08-30 16:29:25 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-08-30 16:29:25 +0200 |
| commit | 277092aabc2158affd84a97792eaeecfbd371583 (patch) | |
| tree | d89c695b794d8e8c6f9dc86243236b29ec9ffbbf /tests | |
| parent | 358348530d69528ce36e6d767d51a47cd42ae1e5 (diff) | |
| parent | 5367331250368ada068c02c3027369e1d7a59ee7 (diff) | |
Merge 1.14 into master
Change-Id: Iad75f8b2beb8d26c1c2369cce15e4fb1af1106e5
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs b/tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs index 43151bc56..991e4ddcb 100644 --- a/tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs +++ b/tests/auto/blackbox/testdata-qt/qtscxml/qtscxml.qbs @@ -1,5 +1,6 @@ import qbs.Environment import qbs.FileInfo +import qbs.Utilities Project { QtApplication { @@ -7,7 +8,7 @@ Project { Depends { name: "Qt.scxml"; required: false } Properties { - condition: Qt.scxml.present + condition: Qt.scxml.present && Utilities.versionCompare(Qt.core.version, "5.13.0") != 0 cpp.defines: ["HAS_QTSCXML"] } |