diff options
29 files changed, 30 insertions, 40 deletions
diff --git a/tests/auto/xmlpatternssdk/ASTItem.h b/tests/auto/xmlpatternssdk/ASTItem.h index 3e9d6bff..3cf36739 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 53f18c51..3c0b1d7f 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 0e79cda7..96d8e40f 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 5cb52e18..2e575954 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 a48c20d0..48b5b9c6 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 37055290..148ce397 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 921016ae..21a9da84 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 f460e200..14e12a42 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 f61e1180..8f161159 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 ee9438d1..bd231503 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 5e757faa..eb62a69f 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 20ffa756..9d0a9261 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 046de05d..6ac76a98 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 7b13bcf3..b46e905b 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 f2994bca..9b577e0b 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 5305cf01..06328e0e 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 301e9d73..728b7e86 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 eb3f9e71..37c1bdd2 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 c123e370..25c2f0c9 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 448e3a70..ab94c49c 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 dbc203e7..276f13ac 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 2bf866b1..d5695fdc 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 4559efb3..1d844089 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 236c98fe..0051d666 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 3ea72e2a..1ab54edf 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 2131f326..a82ba8b8 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 652f28cc..3015d8c7 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 2b161ba9..231b55d3 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 f60672a6..e52962c1 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 |