Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix backport
  • Loading branch information
rldhont committed Apr 23, 2020
1 parent ac76dbd commit a30e1a5
Showing 1 changed file with 0 additions and 18 deletions.
18 changes: 0 additions & 18 deletions src/server/services/wms/qgswmsgetschemaextension.cpp
Expand Up @@ -31,24 +31,6 @@ namespace QgsWms

void writeGetSchemaExtension( QgsServerResponse &response )
{
<<<<<<< HEAD
QDomDocument doc = getSchemaExtension( serverIface, version, request );
response.setHeader( QStringLiteral( "Content-Type" ), QStringLiteral( "text/xml; charset=utf-8" ) );
response.write( doc.toByteArray() );
}

QDomDocument getSchemaExtension( QgsServerInterface *serverIface, const QString &version,
const QgsServerRequest &request )
{
Q_UNUSED( version )
Q_UNUSED( serverIface )

QgsServerRequest::Parameters parameters = request.parameters();

QDomDocument xsdDoc;

=======
>>>>>>> 970149f13e... Merge pull request #35702 from jgrocha/fix-wms-capabilities
QDir resourcesDir = QFileInfo( QgsApplication::serverResourcesPath() ).absoluteDir();
QFileInfo xsdFileInfo( resourcesDir, QStringLiteral( "schemaExtension.xsd" ) );
QString schema_str = QStringLiteral( "<?xml version='1.0'?>" );
Expand Down

0 comments on commit a30e1a5

Please sign in to comment.