summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-08 11:08:40 +0100
committerJukka Jokiniva <jukka.jokiniva@qt.io>2020-02-26 07:11:39 +0000
commit111f80c615c4cef23558e2942a3c4081e2c19121 (patch)
treecce3a1372ec5e45235d997306528eb90e799c855
parent74c5be960cbd4709cd8e4dee897cf53c00838128 (diff)
downloadqtxmlpatterns-5.13.tar.gz
Enable auto tests run stand-alone5.13
Change the QtXmlPatternsSDK helper library to be a static library. Fixes: QTBUG-79802 Change-Id: I2f299fbcb73da155643a0b66a13a88745de6d00f Reviewed-by: Matti Paaso <matti.paaso@qt.io> (cherry picked from commit 45ad1dc9c5f7330ea5d33cc8c8585d33b097e2e8) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r--tests/auto/xmlpatternssdk/ASTItem.h2
-rw-r--r--tests/auto/xmlpatternssdk/DebugExpressionFactory.h2
-rw-r--r--tests/auto/xmlpatternssdk/ErrorHandler.h2
-rw-r--r--tests/auto/xmlpatternssdk/ErrorItem.h2
-rw-r--r--tests/auto/xmlpatternssdk/ExitCode.h2
-rw-r--r--tests/auto/xmlpatternssdk/ExpressionInfo.h2
-rw-r--r--tests/auto/xmlpatternssdk/ExpressionNamer.h2
-rw-r--r--tests/auto/xmlpatternssdk/ExternalSourceLoader.h2
-rw-r--r--tests/auto/xmlpatternssdk/Global.h12
-rw-r--r--tests/auto/xmlpatternssdk/ResultThreader.h2
-rw-r--r--tests/auto/xmlpatternssdk/TestBaseLine.h2
-rw-r--r--tests/auto/xmlpatternssdk/TestCase.h2
-rw-r--r--tests/auto/xmlpatternssdk/TestContainer.h2
-rw-r--r--tests/auto/xmlpatternssdk/TestGroup.h2
-rw-r--r--tests/auto/xmlpatternssdk/TestItem.h2
-rw-r--r--tests/auto/xmlpatternssdk/TestResult.h2
-rw-r--r--tests/auto/xmlpatternssdk/TestResultHandler.h2
-rw-r--r--tests/auto/xmlpatternssdk/TestSuite.h2
-rw-r--r--tests/auto/xmlpatternssdk/TestSuiteHandler.h2
-rw-r--r--tests/auto/xmlpatternssdk/TestSuiteResult.h2
-rw-r--r--tests/auto/xmlpatternssdk/TreeItem.h2
-rw-r--r--tests/auto/xmlpatternssdk/TreeModel.h2
-rw-r--r--tests/auto/xmlpatternssdk/Worker.h2
-rw-r--r--tests/auto/xmlpatternssdk/XMLWriter.h2
-rw-r--r--tests/auto/xmlpatternssdk/XQTSTestCase.h2
-rw-r--r--tests/auto/xmlpatternssdk/XSDTSTestCase.h2
-rw-r--r--tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h2
-rw-r--r--tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h2
-rw-r--r--tests/auto/xmlpatternssdk/xmlpatternssdk.pro4
29 files changed, 30 insertions, 40 deletions
diff --git a/tests/auto/xmlpatternssdk/ASTItem.h b/tests/auto/xmlpatternssdk/ASTItem.h
index 3e9d6bf..3cf3673 100644
--- a/tests/auto/xmlpatternssdk/ASTItem.h
+++ b/tests/auto/xmlpatternssdk/ASTItem.h
@@ -49,7 +49,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT ASTItem : public TreeItem
+ class ASTItem : public TreeItem
{
public:
virtual ~ASTItem();
diff --git a/tests/auto/xmlpatternssdk/DebugExpressionFactory.h b/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
index 53f18c5..3c0b1d7 100644
--- a/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
+++ b/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
@@ -50,7 +50,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT DebugExpressionFactory : public QPatternist::ExpressionFactory
+ class DebugExpressionFactory : public QPatternist::ExpressionFactory
{
public:
DebugExpressionFactory() : m_ast(0)
diff --git a/tests/auto/xmlpatternssdk/ErrorHandler.h b/tests/auto/xmlpatternssdk/ErrorHandler.h
index 0e79cda..96d8e40 100644
--- a/tests/auto/xmlpatternssdk/ErrorHandler.h
+++ b/tests/auto/xmlpatternssdk/ErrorHandler.h
@@ -50,7 +50,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT ErrorHandler : public QAbstractMessageHandler
+ class ErrorHandler : public QAbstractMessageHandler
{
public:
class Message
diff --git a/tests/auto/xmlpatternssdk/ErrorItem.h b/tests/auto/xmlpatternssdk/ErrorItem.h
index 5cb52e1..2e57595 100644
--- a/tests/auto/xmlpatternssdk/ErrorItem.h
+++ b/tests/auto/xmlpatternssdk/ErrorItem.h
@@ -47,7 +47,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT ErrorItem : public TreeItem
+ class ErrorItem : public TreeItem
{
public:
ErrorItem(const ErrorHandler::Message &error, ErrorItem *parent);
diff --git a/tests/auto/xmlpatternssdk/ExitCode.h b/tests/auto/xmlpatternssdk/ExitCode.h
index a48c20d..48b5b9c 100644
--- a/tests/auto/xmlpatternssdk/ExitCode.h
+++ b/tests/auto/xmlpatternssdk/ExitCode.h
@@ -41,7 +41,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT ExitCode
+ class ExitCode
{
public:
/**
diff --git a/tests/auto/xmlpatternssdk/ExpressionInfo.h b/tests/auto/xmlpatternssdk/ExpressionInfo.h
index 3705529..148ce39 100644
--- a/tests/auto/xmlpatternssdk/ExpressionInfo.h
+++ b/tests/auto/xmlpatternssdk/ExpressionInfo.h
@@ -49,7 +49,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT ExpressionInfo : public QPatternist::ExpressionVisitorResult
+ class ExpressionInfo : public QPatternist::ExpressionVisitorResult
{
public:
ExpressionInfo(const QString &name, const QString &details);
diff --git a/tests/auto/xmlpatternssdk/ExpressionNamer.h b/tests/auto/xmlpatternssdk/ExpressionNamer.h
index 921016a..21a9da8 100644
--- a/tests/auto/xmlpatternssdk/ExpressionNamer.h
+++ b/tests/auto/xmlpatternssdk/ExpressionNamer.h
@@ -48,7 +48,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT ExpressionNamer : public QPatternist::ExpressionVisitor
+ class ExpressionNamer : public QPatternist::ExpressionVisitor
{
public:
diff --git a/tests/auto/xmlpatternssdk/ExternalSourceLoader.h b/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
index f460e20..14e12a4 100644
--- a/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
+++ b/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
@@ -48,7 +48,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT ExternalSourceLoader : public QPatternist::ExternalVariableLoader
+ class ExternalSourceLoader : public QPatternist::ExternalVariableLoader
{
public:
enum TargetOfURI
diff --git a/tests/auto/xmlpatternssdk/Global.h b/tests/auto/xmlpatternssdk/Global.h
index f61e118..8f16115 100644
--- a/tests/auto/xmlpatternssdk/Global.h
+++ b/tests/auto/xmlpatternssdk/Global.h
@@ -34,16 +34,6 @@
#include <private/qitem_p.h>
#include <private/qnamepool_p.h>
-#if defined(Q_OS_WIN) && !defined(QT_STATIC)
-# ifdef Q_PATTERNISTSDK_BUILDING
- #define Q_PATTERNISTSDK_EXPORT __declspec(dllexport)
- #else
- #define Q_PATTERNISTSDK_EXPORT __declspec(dllimport)
- #endif
-#else
- #define Q_PATTERNISTSDK_EXPORT
-#endif
-
/**
* @short Contains testing utilities for Patternist, interfacing W3C's XQuery Test Suite.
*
@@ -60,7 +50,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT Global
+ class Global
{
public:
diff --git a/tests/auto/xmlpatternssdk/ResultThreader.h b/tests/auto/xmlpatternssdk/ResultThreader.h
index ee9438d..bd23150 100644
--- a/tests/auto/xmlpatternssdk/ResultThreader.h
+++ b/tests/auto/xmlpatternssdk/ResultThreader.h
@@ -48,7 +48,7 @@ namespace QPatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
* @ingroup PatternistSDK
*/
- class Q_PATTERNISTSDK_EXPORT ResultThreader : public QThread
+ class ResultThreader : public QThread
, public TestResultHandler
{
public:
diff --git a/tests/auto/xmlpatternssdk/TestBaseLine.h b/tests/auto/xmlpatternssdk/TestBaseLine.h
index 5e757fa..eb62a69 100644
--- a/tests/auto/xmlpatternssdk/TestBaseLine.h
+++ b/tests/auto/xmlpatternssdk/TestBaseLine.h
@@ -57,7 +57,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT TestBaseLine
+ class TestBaseLine
{
public:
typedef QList<TestBaseLine *> List;
diff --git a/tests/auto/xmlpatternssdk/TestCase.h b/tests/auto/xmlpatternssdk/TestCase.h
index 20ffa75..9d0a926 100644
--- a/tests/auto/xmlpatternssdk/TestCase.h
+++ b/tests/auto/xmlpatternssdk/TestCase.h
@@ -55,7 +55,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT TestCase : public TestItem
+ class TestCase : public TestItem
{
public:
/**
diff --git a/tests/auto/xmlpatternssdk/TestContainer.h b/tests/auto/xmlpatternssdk/TestContainer.h
index 046de05..6ac76a9 100644
--- a/tests/auto/xmlpatternssdk/TestContainer.h
+++ b/tests/auto/xmlpatternssdk/TestContainer.h
@@ -44,7 +44,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT TestContainer : public TestItem
+ class TestContainer : public TestItem
{
public:
virtual ~TestContainer();
diff --git a/tests/auto/xmlpatternssdk/TestGroup.h b/tests/auto/xmlpatternssdk/TestGroup.h
index 7b13bcf..b46e905 100644
--- a/tests/auto/xmlpatternssdk/TestGroup.h
+++ b/tests/auto/xmlpatternssdk/TestGroup.h
@@ -45,7 +45,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT TestGroup : public TestContainer
+ class TestGroup : public TestContainer
{
public:
TestGroup(TreeItem *parent);
diff --git a/tests/auto/xmlpatternssdk/TestItem.h b/tests/auto/xmlpatternssdk/TestItem.h
index f2994bc..9b577e0 100644
--- a/tests/auto/xmlpatternssdk/TestItem.h
+++ b/tests/auto/xmlpatternssdk/TestItem.h
@@ -48,7 +48,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT TestItem : public TreeItem
+ class TestItem : public TreeItem
{
public:
diff --git a/tests/auto/xmlpatternssdk/TestResult.h b/tests/auto/xmlpatternssdk/TestResult.h
index 5305cf0..06328e0 100644
--- a/tests/auto/xmlpatternssdk/TestResult.h
+++ b/tests/auto/xmlpatternssdk/TestResult.h
@@ -60,7 +60,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT TestResult : public QObject
+ class TestResult : public QObject
{
Q_OBJECT
diff --git a/tests/auto/xmlpatternssdk/TestResultHandler.h b/tests/auto/xmlpatternssdk/TestResultHandler.h
index 301e9d7..728b7e8 100644
--- a/tests/auto/xmlpatternssdk/TestResultHandler.h
+++ b/tests/auto/xmlpatternssdk/TestResultHandler.h
@@ -46,7 +46,7 @@ namespace QPatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
* @ingroup PatternistSDK
*/
- class Q_PATTERNISTSDK_EXPORT TestResultHandler : public QXmlDefaultHandler
+ class TestResultHandler : public QXmlDefaultHandler
{
public:
/**
diff --git a/tests/auto/xmlpatternssdk/TestSuite.h b/tests/auto/xmlpatternssdk/TestSuite.h
index eb3f9e7..37c1bdd 100644
--- a/tests/auto/xmlpatternssdk/TestSuite.h
+++ b/tests/auto/xmlpatternssdk/TestSuite.h
@@ -53,7 +53,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT TestSuite : public TestContainer
+ class TestSuite : public TestContainer
{
public:
/**
diff --git a/tests/auto/xmlpatternssdk/TestSuiteHandler.h b/tests/auto/xmlpatternssdk/TestSuiteHandler.h
index c123e37..25c2f0c 100644
--- a/tests/auto/xmlpatternssdk/TestSuiteHandler.h
+++ b/tests/auto/xmlpatternssdk/TestSuiteHandler.h
@@ -57,7 +57,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT TestSuiteHandler : public QXmlDefaultHandler
+ class TestSuiteHandler : public QXmlDefaultHandler
{
public:
/**
diff --git a/tests/auto/xmlpatternssdk/TestSuiteResult.h b/tests/auto/xmlpatternssdk/TestSuiteResult.h
index 448e3a7..ab94c49 100644
--- a/tests/auto/xmlpatternssdk/TestSuiteResult.h
+++ b/tests/auto/xmlpatternssdk/TestSuiteResult.h
@@ -48,7 +48,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT TestSuiteResult
+ class TestSuiteResult
{
public:
~TestSuiteResult();
diff --git a/tests/auto/xmlpatternssdk/TreeItem.h b/tests/auto/xmlpatternssdk/TreeItem.h
index dbc203e..276f13a 100644
--- a/tests/auto/xmlpatternssdk/TreeItem.h
+++ b/tests/auto/xmlpatternssdk/TreeItem.h
@@ -55,7 +55,7 @@ namespace QPatternistSDK
* @see TreeModel
* @ingroup PatternistSDK
*/
- class Q_PATTERNISTSDK_EXPORT TreeItem : public QObject
+ class TreeItem : public QObject
{
Q_OBJECT
public:
diff --git a/tests/auto/xmlpatternssdk/TreeModel.h b/tests/auto/xmlpatternssdk/TreeModel.h
index 2bf866b..d5695fd 100644
--- a/tests/auto/xmlpatternssdk/TreeModel.h
+++ b/tests/auto/xmlpatternssdk/TreeModel.h
@@ -53,7 +53,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT TreeModel : public QAbstractItemModel
+ class TreeModel : public QAbstractItemModel
{
Q_OBJECT
public:
diff --git a/tests/auto/xmlpatternssdk/Worker.h b/tests/auto/xmlpatternssdk/Worker.h
index 4559efb..1d84408 100644
--- a/tests/auto/xmlpatternssdk/Worker.h
+++ b/tests/auto/xmlpatternssdk/Worker.h
@@ -49,7 +49,7 @@ namespace QPatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
* @ingroup PatternistSDK
*/
- class Q_PATTERNISTSDK_EXPORT Worker : public QObject
+ class Worker : public QObject
{
Q_OBJECT
public:
diff --git a/tests/auto/xmlpatternssdk/XMLWriter.h b/tests/auto/xmlpatternssdk/XMLWriter.h
index 236c98f..0051d66 100644
--- a/tests/auto/xmlpatternssdk/XMLWriter.h
+++ b/tests/auto/xmlpatternssdk/XMLWriter.h
@@ -95,7 +95,7 @@ namespace QPatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
* @ingroup PatternistSDK
*/
- class Q_PATTERNISTSDK_EXPORT XMLWriter : public QXmlContentHandler
+ class XMLWriter : public QXmlContentHandler
, public QXmlLexicalHandler
{
public:
diff --git a/tests/auto/xmlpatternssdk/XQTSTestCase.h b/tests/auto/xmlpatternssdk/XQTSTestCase.h
index 3ea72e2..1ab54ed 100644
--- a/tests/auto/xmlpatternssdk/XQTSTestCase.h
+++ b/tests/auto/xmlpatternssdk/XQTSTestCase.h
@@ -52,7 +52,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT XQTSTestCase : public TestCase
+ class XQTSTestCase : public TestCase
{
public:
XQTSTestCase(const Scenario scen, TreeItem *parent,
diff --git a/tests/auto/xmlpatternssdk/XSDTSTestCase.h b/tests/auto/xmlpatternssdk/XSDTSTestCase.h
index 2131f32..a82ba8b 100644
--- a/tests/auto/xmlpatternssdk/XSDTSTestCase.h
+++ b/tests/auto/xmlpatternssdk/XSDTSTestCase.h
@@ -50,7 +50,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT XSDTSTestCase : public TestCase
+ class XSDTSTestCase : public TestCase
{
public:
enum TestType
diff --git a/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
index 652f28c..3015d8c 100644
--- a/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
+++ b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
@@ -57,7 +57,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Tobias Koenig <tobias.koenig@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT XSDTestSuiteHandler : public QXmlDefaultHandler
+ class XSDTestSuiteHandler : public QXmlDefaultHandler
{
public:
/**
diff --git a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
index 2b161ba..231b55d 100644
--- a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
+++ b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
@@ -59,7 +59,7 @@ namespace QPatternistSDK
* @ingroup PatternistSDK
* @author Frans Englich <frans.englich@nokia.com>
*/
- class Q_PATTERNISTSDK_EXPORT XSLTTestSuiteHandler : public QXmlDefaultHandler
+ class XSLTTestSuiteHandler : public QXmlDefaultHandler
{
public:
/**
diff --git a/tests/auto/xmlpatternssdk/xmlpatternssdk.pro b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
index f60672a..e52962c 100644
--- a/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
+++ b/tests/auto/xmlpatternssdk/xmlpatternssdk.pro
@@ -2,9 +2,9 @@ include (../xmlpatterns.pri)
TARGET = $$XMLPATTERNS_SDK
TEMPLATE = lib
-DEFINES += Q_PATTERNISTSDK_BUILDING QT_ENABLE_QEXPLICITLYSHAREDDATAPOINTER_STATICCAST
+DEFINES += QT_ENABLE_QEXPLICITLYSHAREDDATAPOINTER_STATICCAST
-CONFIG += exceptions
+CONFIG += exceptions static
# lib_bundle ensures we get a framework on OS X, a library bundle.
CONFIG += resources