diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-10-21 13:48:00 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-10-25 04:01:06 +0000 |
commit | 5a160606aefa5b07909faba55af53d1c95368486 (patch) | |
tree | 533c64b3a2964610c2cc4d13c908189147b43f57 | |
parent | 973105d9fb3372910255825e7395fb1156e24c02 (diff) | |
download | qtxmlpatterns-5a160606aefa5b07909faba55af53d1c95368486.tar.gz |
Add feature xml-schema
Fix build warnings about missing qfeatures.
Change-Id: I577b78fcf2037877f15d87006e279e61e4d86945
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r-- | configure.json | 5 | ||||
-rw-r--r-- | examples/xmlpatterns/xmlpatterns.pro | 4 | ||||
-rw-r--r-- | src/xmlpatterns/api/api.pri | 3 | ||||
-rw-r--r-- | src/xmlpatterns/configure.json | 24 | ||||
-rw-r--r-- | src/xmlpatterns/xmlpatterns.pro | 3 | ||||
-rw-r--r-- | tests/auto/auto.pro | 4 | ||||
-rw-r--r-- | tools/tools.pro | 4 |
7 files changed, 37 insertions, 10 deletions
diff --git a/configure.json b/configure.json new file mode 100644 index 0000000..b725f49 --- /dev/null +++ b/configure.json @@ -0,0 +1,5 @@ +{ + "subconfigs": [ + "src/xmlpatterns" + ] +} 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 = \ diff --git a/src/xmlpatterns/api/api.pri b/src/xmlpatterns/api/api.pri index 2192d82..fec6499 100644 --- a/src/xmlpatterns/api/api.pri +++ b/src/xmlpatterns/api/api.pri @@ -50,8 +50,7 @@ SOURCES += $$PWD/qvariableloader.cpp \ $$PWD/qcoloringmessagehandler.cpp \ $$PWD/qcoloroutput.cpp -load(qfeatures) -!contains(QT_DISABLED_FEATURES, xmlschema) { +qtConfig(xml-schema) { HEADERS += $$PWD/qxmlschema.h \ $$PWD/qxmlschema_p.h \ $$PWD/qxmlschemavalidator.h \ diff --git a/src/xmlpatterns/configure.json b/src/xmlpatterns/configure.json new file mode 100644 index 0000000..2724334 --- /dev/null +++ b/src/xmlpatterns/configure.json @@ -0,0 +1,24 @@ +{ + "module": "xmlpatterns", + "depends": [ + "core-private", + "network" + ], + + "features": { + "xml-schema": { + "label": "XML schema support", + "purpose": "Support for XML schema validation", + "output": [ "privateFeature" ] + } + }, + + "summary": [ + { + "section": "QtXmlPatterns", + "entries": [ + "xml-schema" + ] + } + ] +} diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro index 1b53673..5244bb1 100644 --- a/src/xmlpatterns/xmlpatterns.pro +++ b/src/xmlpatterns/xmlpatterns.pro @@ -19,8 +19,7 @@ include($$PWD/janitors/janitors.pri) include($$PWD/parser/parser.pri) include($$PWD/projection/projection.pri) -load(qfeatures) -!contains(QT_DISABLED_FEATURES, xmlschema) { +qtConfig(xml-schema) { include($$PWD/schema/schema.pri) } include($$PWD/type/type.pri) diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index df80f80..aba49b6 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 \ diff --git a/tools/tools.pro b/tools/tools.pro index 92bbaca..df3f095 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,9 +1,9 @@ TEMPLATE = subdirs +QT_FOR_CONFIG += xmlpatterns-private -load(qfeatures) !android|android_app { SUBDIRS += xmlpatterns - !contains(QT_DISABLED_FEATURES, xmlschema) { + qtConfig(xml-schema) { SUBDIRS += xmlpatternsvalidator } } |