Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #9184 from cjmayo/xmlpatterns
Remove unused Qt5XmlPatterns dependency
  • Loading branch information
m-kuhn committed Feb 17, 2019
2 parents 6b7ba0d + fb79826 commit b711ef0
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 62 deletions.
1 change: 0 additions & 1 deletion .docker/qgis3-build-deps-cosmic.dockerfile
Expand Up @@ -49,7 +49,6 @@ RUN apt-get update \
libqt5svg5-dev \
libqt5webkit5-dev \
libqt5xml5 \
libqt5xmlpatterns5-dev \
libqt5serialport5-dev \
libqwt-qt5-dev \
libspatialindex-dev \
Expand Down
1 change: 0 additions & 1 deletion .docker/qgis3-build-deps.dockerfile
Expand Up @@ -49,7 +49,6 @@ RUN apt-get update \
libqt5svg5-dev \
libqt5webkit5-dev \
libqt5xml5 \
libqt5xmlpatterns5-dev \
libqt5serialport5-dev \
libqwt-qt5-dev \
libspatialindex-dev \
Expand Down
14 changes: 7 additions & 7 deletions INSTALL

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion debian/control
Expand Up @@ -22,7 +22,7 @@ Build-Depends:
libsqlite3-dev,
libspatialindex-dev,
qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtpositioning5-dev,
libqt5svg5-dev, libqt5xmlpatterns5-dev, libqt5webkit5-dev, libqt5opengl5-dev, libqt5sql5-sqlite, libqt5scintilla2-dev,
libqt5svg5-dev, libqt5webkit5-dev, libqt5opengl5-dev, libqt5sql5-sqlite, libqt5scintilla2-dev,
libqwt-qt5-dev, libqca-qt5-2-dev, libqca-qt5-2-plugins,
python3-dev, python3-all-dev, python3-sip, python3-sip-dev,
pyqt5-dev-tools, pyqt5-dev, pyqt5.qsci-dev,
Expand Down
2 changes: 1 addition & 1 deletion debian/control.in
Expand Up @@ -25,7 +25,7 @@ Build-Depends:
libexiv2-dev,
qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtpositioning5-dev, qt5keychain-dev,
#!xenial# qtbase5-private-dev,
libqt5svg5-dev, libqt5xmlpatterns5-dev, libqt5webkit5-dev, libqt5opengl5-dev, libqt5sql5-sqlite, libqt5serialport5-dev, libqt5scintilla2-dev,
libqt5svg5-dev, libqt5webkit5-dev, libqt5opengl5-dev, libqt5sql5-sqlite, libqt5serialport5-dev, libqt5scintilla2-dev,
libqwt-qt5-dev, libqca-qt5-2-dev, libqca-qt5-2-plugins,
opencl-headers, ocl-icd-opencl-dev,
python3-dev, python3-all-dev, python3-sip, python3-sip-dev,
Expand Down
20 changes: 10 additions & 10 deletions doc/INSTALL.html

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions doc/linux.t2t

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion rpm/qgis.spec.template
Expand Up @@ -109,7 +109,6 @@ BuildRequires: qt5-qtlocation-devel
BuildRequires: qt5-qtsvg-devel
BuildRequires: qt5-qttools-static
BuildRequires: qt5-qtwebkit-devel
BuildRequires: qt5-qtxmlpatterns-devel
BuildRequires: qtkeychain-qt5-devel
BuildRequires: qt5-qtserialport-devel
BuildRequires: qt5-qt3d-devel
Expand Down
3 changes: 0 additions & 3 deletions src/providers/wms/CMakeLists.txt
@@ -1,6 +1,3 @@
FIND_PACKAGE(Qt5XmlPatterns REQUIRED)


SET (WMS_SRCS
qgswmscapabilities.cpp
qgswmsprovider.cpp
Expand Down
30 changes: 0 additions & 30 deletions src/providers/wms/qgswmsprovider.cpp
Expand Up @@ -2861,36 +2861,6 @@ QgsRasterIdentifyResult QgsWmsProvider::identify( const QgsPointXY &point, QgsRa

if ( xsdPart >= 0 ) // XSD available
{
#if 0
// Validate GML by schema
// Loading schema takes ages! It needs to load all XSD referenced in the schema,
// for example:
// http://schemas.opengis.net/gml/2.1.2/feature.xsd
// http://schemas.opengis.net/gml/2.1.2/gml.xsd
// http://schemas.opengis.net/gml/2.1.2/geometry.xsd
// http://www.w3.org/1999/xlink.xsd
// http://www.w3.org/2001/xml.xsd <- this takes 30s to download (2/2013)

QXmlSchema schema;
schema.load( mIdentifyResultBodies.value( xsdPart ) );
// Unfortunately the schema cannot be successfully loaded, it reports error
// "Element {http://www.opengis.net/gml}_Feature already defined"
// there is probably a bug in QXmlSchema:
// https://bugreports.qt.io/browse/QTBUG-8394
// xmlpatternsvalidator gives the same error on XSD generated by OGR
if ( !schema.isValid() )
{
// TODO: return QgsError
results.insert( count, tr( "GML schema is not valid" ) );
continue;
}
QXmlSchemaValidator validator( schema );
if ( !validator.validate( mIdentifyResultBodies.value( gmlPart ) ) )
{
results.insert( count, tr( "GML is not valid" ) );
continue;
}
#endif
QgsDebugMsg( "GML XSD (first 4000 bytes):\n" + QString::fromUtf8( mIdentifyResultBodies.value( xsdPart ).left( 4000 ) ) );
gmlSchema.parseXSD( mIdentifyResultBodies.value( xsdPart ) );
}
Expand Down

0 comments on commit b711ef0

Please sign in to comment.