Skip to content

Commit cb99b7e

Browse files
jcfrjamesobutler
authored andcommitted
cmake: Simplify PythonQt_QtAll reusing PYTHONQT_EXPORT export macro
1 parent eb1e1a9 commit cb99b7e

2 files changed

Lines changed: 4 additions & 12 deletions

File tree

extensions/PythonQt_QtAll/PythonQt_QtAll.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ void PythonQt_init_QtWebKit(PyObject*);
7676
#endif
7777

7878
namespace PythonQt_QtAll {
79-
PYTHONQT_QTALL_EXPORT void init()
79+
PYTHONQT_EXPORT void init()
8080
{
8181
#ifdef PYTHONQT_WITH_CORE
8282
PythonQt_init_QtCore(0);

extensions/PythonQt_QtAll/PythonQt_QtAll.h

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,11 @@
3333
*
3434
*/
3535

36-
#ifdef WIN32
37-
#ifdef PYTHONQT_QTALL_EXPORTS
38-
#define PYTHONQT_QTALL_EXPORT __declspec(dllexport)
39-
#else
40-
#define PYTHONQT_QTALL_EXPORT __declspec(dllimport)
41-
#endif
42-
#else
43-
#define PYTHONQT_QTALL_EXPORT
44-
#endif
36+
#include "PythonQtSystem.h" // For PYTHONQT_EXPORT
4537

4638
namespace PythonQt_QtAll {
47-
//! initialize the Qt binding
48-
PYTHONQT_QTALL_EXPORT void init();
39+
//! Initialize the Qt bindings enabled at configuration time
40+
PYTHONQT_EXPORT void init();
4941
}
5042

5143
#endif

0 commit comments

Comments
 (0)