diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:09:01 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:09:01 +0100 |
| commit | 8f012dd05873d33d0ce9dc7b076418cc3096106e (patch) | |
| tree | 0f3b9876cd403ddb9ad5e7dad8491576009580be /src/xmlpatterns/api | |
| parent | 6c7ecc08666b33596ebb997adf6eccaeda311d4c (diff) | |
| parent | b2f9aaa6b05769dd5b07dce86af3d3fc0938d42e (diff) | |
| download | qtxmlpatterns-8f012dd05873d33d0ce9dc7b076418cc3096106e.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: Id327fd1d5933b38c3fcc3f7e9edadb34aaf7a059
Diffstat (limited to 'src/xmlpatterns/api')
| -rw-r--r-- | src/xmlpatterns/api/qxmlschema.cpp | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/api/qxmlschemavalidator.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/xmlpatterns/api/qxmlschema.cpp b/src/xmlpatterns/api/qxmlschema.cpp index a050a80..62dc3d1 100644 --- a/src/xmlpatterns/api/qxmlschema.cpp +++ b/src/xmlpatterns/api/qxmlschema.cpp @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE This class is used to represent schemas that conform to the \l{XML Schema} 1.0 specification. - \sa QXmlSchemaValidator, {xmlpatterns/schema}{XML Schema Validation Example} + \sa QXmlSchemaValidator, {schema}{XML Schema Validation Example} */ /*! diff --git a/src/xmlpatterns/api/qxmlschemavalidator.cpp b/src/xmlpatterns/api/qxmlschemavalidator.cpp index da0ed3a..3783520 100644 --- a/src/xmlpatterns/api/qxmlschemavalidator.cpp +++ b/src/xmlpatterns/api/qxmlschemavalidator.cpp @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE This class implements schema validation according to the \l{XML Schema} 1.0 specification. - \sa QXmlSchema, {xmlpatterns/schema}{XML Schema Validation Example} + \sa QXmlSchema, {schema}{XML Schema Validation Example} */ /*! |