Merge pull request #9184 from cjmayo/xmlpatterns

Remove unused Qt5XmlPatterns dependency

Author: m-kuhn

.docker/qgis3-build-deps-cosmic.dockerfile

@@ -49,7 +49,6 @@ RUN  apt-get update \
     libqt5svg5-dev \
     libqt5webkit5-dev \
     libqt5xml5 \
-    libqt5xmlpatterns5-dev \
     libqt5serialport5-dev \
     libqwt-qt5-dev \
     libspatialindex-dev \

.docker/qgis3-build-deps.dockerfile

@@ -49,7 +49,6 @@ RUN  apt-get update \
     libqt5svg5-dev \
     libqt5webkit5-dev \
     libqt5xml5 \
-    libqt5xmlpatterns5-dev \
     libqt5serialport5-dev \
     libqwt-qt5-dev \
     libspatialindex-dev \

INSTALL

@@ -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,

debian/control

@@ -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,

debian/control.in

@@ -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

doc/INSTALL.html

@@ -1,6 +1,3 @@
-FIND_PACKAGE(Qt5XmlPatterns REQUIRED)
-
-
 SET (WMS_SRCS
   qgswmscapabilities.cpp
   qgswmsprovider.cpp

doc/linux.t2t

@@ -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 ) );
         }