diff --git a/FileIO/XmlIO/XMLInterface.cpp b/FileIO/XmlIO/XMLInterface.cpp index f97c869b2cd9eb954849f1d2dfda0185da2ac82b..a25cb40cf086f47489e0157c89ec71a1ace9c9bf 100644 --- a/FileIO/XmlIO/XMLInterface.cpp +++ b/FileIO/XmlIO/XMLInterface.cpp @@ -17,10 +17,9 @@ #include <QCryptographicHash> #include <QFileInfo> -#ifdef QT_USE_QTXMLPATTERNS #include <QtXmlPatterns/QXmlSchema> #include <QtXmlPatterns/QXmlSchemaValidator> -#endif // QT_USE_QTXMLPATTERNS + namespace FileIO { @@ -32,7 +31,6 @@ XMLInterface::XMLInterface(ProjectData* project, const std::string &schemaFile) int XMLInterface::isValid(const QString &fileName) const { -#ifdef QT_USE_QTXMLPATTERNS QXmlSchema schema; schema.load( QUrl::fromLocalFile((QString::fromStdString(_schemaName))) ); @@ -55,13 +53,6 @@ int XMLInterface::isValid(const QString &fileName) const " is invalid." << std::endl; 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) diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake index 91fcc5696fa4f966e58171fe6ac9f9c72a3baa31..e6b98de5295cf2aa021ff3e9d2fd8766308c0a26 100644 --- a/scripts/cmake/Find.cmake +++ b/scripts/cmake/Find.cmake @@ -39,9 +39,7 @@ IF ( QT4_FOUND ) SET(QT_USE_QTSQL TRUE) SET(QT_USE_QTTEST TRUE) SET(QT_USE_QTXML TRUE) - IF(QT_QTXMLPATTERNS_FOUND) - SET(QT_USE_QTXMLPATTERNS TRUE) - ENDIF(QT_QTXMLPATTERNS_FOUND) + SET(QT_USE_QTXMLPATTERNS TRUE) INCLUDE( ${QT_USE_FILE} ) ADD_DEFINITIONS(${QT_DEFINITIONS}) ENDIF (QT4_FOUND )