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/testview.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/testview.h')
| -rw-r--r-- | sources/pyside2/tests/pysidetest/testview.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sources/pyside2/tests/pysidetest/testview.h b/sources/pyside2/tests/pysidetest/testview.h index 66d0a94d9..b80a7fca9 100644 --- a/sources/pyside2/tests/pysidetest/testview.h +++ b/sources/pyside2/tests/pysidetest/testview.h @@ -29,11 +29,9 @@ #ifndef TESTVIEW_H #define TESTVIEW_H -#include <QObject> -#ifdef pysidetest_EXPORTS -#define PYSIDE_EXPORTS 1 -#endif -#include "pysidemacros.h" +#include "pysidetest_macros.h" + +#include <QtCore/QObject> QT_BEGIN_NAMESPACE class QWidget; @@ -41,7 +39,7 @@ class QAbstractListModel; class QAbstractItemDelegate; QT_END_NAMESPACE -class PYSIDE_API TestView : public QObject +class PYSIDETEST_API TestView : public QObject { Q_OBJECT public: |