Skip to content
Snippets Groups Projects
Commit 10b88496 authored by Lars Bilke's avatar Lars Bilke
Browse files

Required Qt 4.7 always has schema validation functionality.

parent ab628c1d
No related branches found
No related tags found
No related merge requests found
...@@ -17,10 +17,9 @@ ...@@ -17,10 +17,9 @@
#include <QCryptographicHash> #include <QCryptographicHash>
#include <QFileInfo> #include <QFileInfo>
#ifdef QT_USE_QTXMLPATTERNS
#include <QtXmlPatterns/QXmlSchema> #include <QtXmlPatterns/QXmlSchema>
#include <QtXmlPatterns/QXmlSchemaValidator> #include <QtXmlPatterns/QXmlSchemaValidator>
#endif // QT_USE_QTXMLPATTERNS
namespace FileIO namespace FileIO
{ {
...@@ -32,7 +31,6 @@ XMLInterface::XMLInterface(ProjectData* project, const std::string &schemaFile) ...@@ -32,7 +31,6 @@ XMLInterface::XMLInterface(ProjectData* project, const std::string &schemaFile)
int XMLInterface::isValid(const QString &fileName) const int XMLInterface::isValid(const QString &fileName) const
{ {
#ifdef QT_USE_QTXMLPATTERNS
QXmlSchema schema; QXmlSchema schema;
schema.load( QUrl::fromLocalFile((QString::fromStdString(_schemaName))) ); schema.load( QUrl::fromLocalFile((QString::fromStdString(_schemaName))) );
...@@ -55,13 +53,6 @@ int XMLInterface::isValid(const QString &fileName) const ...@@ -55,13 +53,6 @@ int XMLInterface::isValid(const QString &fileName) const
" is invalid." << std::endl; " is invalid." << std::endl;
return 0; return 0;
} }
#else // ifdef QT_USE_QTXMLPATTERNS
Q_UNUSED (fileName);
std::cout <<
"XMLInterface: XML schema validation skipped. Qt 4.6 is required for validation." <<
std::endl;
return 1;
#endif // QT_USE_QTXMLPATTERNS
} }
void XMLInterface::setSchema(const std::string &schemaName) void XMLInterface::setSchema(const std::string &schemaName)
......
...@@ -39,9 +39,7 @@ IF ( QT4_FOUND ) ...@@ -39,9 +39,7 @@ IF ( QT4_FOUND )
SET(QT_USE_QTSQL TRUE) SET(QT_USE_QTSQL TRUE)
SET(QT_USE_QTTEST TRUE) SET(QT_USE_QTTEST TRUE)
SET(QT_USE_QTXML TRUE) SET(QT_USE_QTXML TRUE)
IF(QT_QTXMLPATTERNS_FOUND) SET(QT_USE_QTXMLPATTERNS TRUE)
SET(QT_USE_QTXMLPATTERNS TRUE)
ENDIF(QT_QTXMLPATTERNS_FOUND)
INCLUDE( ${QT_USE_FILE} ) INCLUDE( ${QT_USE_FILE} )
ADD_DEFINITIONS(${QT_DEFINITIONS}) ADD_DEFINITIONS(${QT_DEFINITIONS})
ENDIF (QT4_FOUND ) ENDIF (QT4_FOUND )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment