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 /examples/xmlpatterns/xmlpatterns.pro | |
parent | fabf557bb8390a94ff4b5d8688a91ffe4abd17ec (diff) | |
parent | 82c5cc6532ac5d0323ecda94b6767e1fdaef2639 (diff) | |
download | qtxmlpatterns-afa273865b7f2697c6e28fb1511486d2f9ce6bfe.tar.gz |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I1e57330ccf8e964fa41637849b4958dea64360fd
Diffstat (limited to 'examples/xmlpatterns/xmlpatterns.pro')
-rw-r--r-- | examples/xmlpatterns/xmlpatterns.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/xmlpatterns/xmlpatterns.pro b/examples/xmlpatterns/xmlpatterns.pro index bfc3a3e..b7c65d8 100644 --- a/examples/xmlpatterns/xmlpatterns.pro +++ b/examples/xmlpatterns/xmlpatterns.pro @@ -1,10 +1,10 @@ TEMPLATE = subdirs +QT_FOR_CONFIG += xmlpatterns-private SUBDIRS += xquery qtHaveModule(widgets) { SUBDIRS += recipes - load(qfeatures) - !contains(QT_DISABLED_FEATURES, xmlschema): SUBDIRS += filetree schema + qtConfig(xml-schema): SUBDIRS += filetree schema } EXAMPLE_FILES = \ |