diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2023-02-02 16:37:52 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@qt.io> | 2023-02-15 15:08:07 +0100 |
| commit | 41bb52b0a2b02628247a4afd2513aa52a6da5cf6 (patch) | |
| tree | 3d72bd6d7c7721d5a2552ed803e78cc59c8237d4 /src/window-lib | |
| parent | 57b50755515410b94957af7e5ca667eda359c70a (diff) | |
Re-enable dbus xml generation from source
Somehow qdbuscpp2xml is unable to cope with QT_PREPEND_NAMESPACE_AM
in Qt6, so we need to detect it and work around the issue.
Long-term the tool needs a Q_DBUSCPP2XML_RUN define, to make
the identification of this pre-compiler more robust.
Pick-to: 6.5
Change-Id: I88fd50669e7e5c9942fbc96c02aa452cda5171c8
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Diffstat (limited to 'src/window-lib')
| -rw-r--r-- | src/window-lib/windowmanager.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/window-lib/windowmanager.h b/src/window-lib/windowmanager.h index 678ac700..6755d3c2 100644 --- a/src/window-lib/windowmanager.h +++ b/src/window-lib/windowmanager.h @@ -9,6 +9,11 @@ #include <QtCore/QAbstractListModel> #include <QtAppManCommon/global.h> +#if defined(Q_MOC_RUN) && !defined(__attribute__) && !defined(__declspec) +# define QT_PREPEND_NAMESPACE_AM(name) QtAM::name +# error "This pre-processor scope is for qdbuscpp2xml only, but it seems something else triggered it" +#endif + #if defined(AM_MULTI_PROCESS) QT_FORWARD_DECLARE_CLASS(QWaylandSurface) #endif |