diff options
author | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:55:29 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:55:29 +0100 |
commit | afa273865b7f2697c6e28fb1511486d2f9ce6bfe (patch) | |
tree | 0f33dd43a368f5c9bd4399eed67763b1e9e74032 /tests/auto/auto.pro | |
parent | fabf557bb8390a94ff4b5d8688a91ffe4abd17ec (diff) | |
parent | 82c5cc6532ac5d0323ecda94b6767e1fdaef2639 (diff) |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I1e57330ccf8e964fa41637849b4958dea64360fd
Diffstat (limited to 'tests/auto/auto.pro')
-rw-r--r-- | tests/auto/auto.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index df80f800..aba49b60 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,4 +1,5 @@ TEMPLATE=subdirs +QT_FOR_CONFIG += xmlpatterns-private SUBDIRS=\ checkxmlfiles \ cmake \ @@ -30,8 +31,7 @@ SUBDIRS=\ xmlpatternsxqts \ xmlpatternsxslts \ -load(qfeatures) -!contains(QT_DISABLED_FEATURES, xmlschema) { +qtConfig(xml-schema) { SUBDIRS += qxmlschema \ qxmlschemavalidator \ xmlpatternsschema \ |