diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-29 15:01:40 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-01 10:51:58 +0200 |
| commit | 430d02db24b95a56ae0acc6a9df6a0effe49da0d (patch) | |
| tree | 8713f11a51f42205dcf2d06894f7f9caa9a49cbe /sources/pyside2/tests/pysidetest/testobject.h | |
| parent | 26e4ba3639bac57b0481bd6bb3964b1afa340ab9 (diff) | |
Consolidate export/import macros
For the 3 libraries that need to export symbols,
(libshiboken, libpyside, pysidetest), fix up the
export/import macros to follow the Qt convention:
- Define generic export/import macros LIBSHIBOKEN_EX/IMPORT equivalent
to Q_DECL_EX/IMPORT. Remove definitions for the ancient g++ 4.X.
- Reuse those in libpyside, pysidetest as PYSIDE_EX/IMPORT and
PYSIDETEST_EX/IMPORT.
- While building, define some BUILD_ macro indicating export.
- Define the _API macros depending on the BUILD_ macro to be export or
import, respectively as is done in Qt. Remove the ugly hack in
pysidetest that tried to re-use the PYSIDE_API macro.
- Brush up the headers a bit.
Change-Id: I635891b7eec5a52a1dcf45022f7bfb6a9cfee83f
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside2/tests/pysidetest/testobject.h')
| -rw-r--r-- | sources/pyside2/tests/pysidetest/testobject.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/sources/pyside2/tests/pysidetest/testobject.h b/sources/pyside2/tests/pysidetest/testobject.h index f8a174d46..41a97a0db 100644 --- a/sources/pyside2/tests/pysidetest/testobject.h +++ b/sources/pyside2/tests/pysidetest/testobject.h @@ -29,15 +29,15 @@ #ifndef TESTOBJECT_H #define TESTOBJECT_H -#include <QObject> -#include <QApplication> -#include <QMetaType> -#include <QVariant> -#include <QDebug> -#ifdef pysidetest_EXPORTS -#define PYSIDE_EXPORTS 1 -#endif -#include "pysidemacros.h" +#include "pysidetest_macros.h" + +#include <QtWidgets/QApplication> + +#include <QtCore/QObject> +#include <QtCore/QMetaType> +#include <QtCore/QVariant> + +QT_FORWARD_DECLARE_CLASS(QDebug) class IntValue { @@ -50,7 +50,7 @@ public: typedef IntValue TypedefValue; -class PYSIDE_API TestObject : public QObject +class PYSIDETEST_API TestObject : public QObject { Q_OBJECT public: @@ -82,15 +82,15 @@ private: int m_idValue; QList<QObject*> m_children; }; -PYSIDE_API QDebug operator<<(QDebug dbg, TestObject &testObject); +PYSIDETEST_API QDebug operator<<(QDebug dbg, TestObject &testObject); typedef int PySideInt; namespace PySideCPP { -class PYSIDE_API TestObjectWithNamespace : public QObject +class PYSIDETEST_API TestObjectWithNamespace : public QObject { Q_OBJECT public: @@ -106,17 +106,18 @@ signals: void emitSignalWithNamespace(PySideCPP::TestObjectWithNamespace* obj); void emitSignalWithTypedef(PySideInt val); }; -PYSIDE_API QDebug operator<<(QDebug dbg, TestObjectWithNamespace &testObject); -class PYSIDE_API TestObject2WithNamespace : public QObject +PYSIDETEST_API QDebug operator<<(QDebug dbg, TestObjectWithNamespace &testObject); + +class PYSIDETEST_API TestObject2WithNamespace : public QObject { Q_OBJECT public: TestObject2WithNamespace(QObject* parent) : QObject(parent) {} QString name() { return "TestObject2WithNamespace"; } }; -PYSIDE_API QDebug operator<<(QDebug dbg, TestObject2WithNamespace& testObject); +PYSIDETEST_API QDebug operator<<(QDebug dbg, TestObject2WithNamespace& testObject); } // Namespace PySideCPP @@ -127,7 +128,7 @@ enum Enum1 { Option1 = 1, Option2 = 2 }; typedef long PySideLong; -class PYSIDE_API TestObjectWithoutNamespace : public QObject +class PYSIDETEST_API TestObjectWithoutNamespace : public QObject { Q_OBJECT public: |