Skip to content

Commit f9f6ba6

Browse files
committed
Some necessary defines for Qt6
(mostly the same as in parser/rpp/pp-qt-configuration, but for Qt6)
1 parent c94df5f commit f9f6ba6

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

generator/parser/rpp/pp-qt-configuration

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
// Qt
66
#define QOBJECTDEFS_H
7+
#define QTMETAMACROS_H
78

89
// not yet supported
910
#define Q_SLOTS slots
@@ -24,3 +25,8 @@
2425
#define QT_NO_DEBUG
2526

2627
#define QT_JAMBI_RUN
28+
29+
// Qt6
30+
#define Q_NAMESPACE_EXPORT(...)
31+
#define Q_ENUM_NS(x)
32+
#define Q_FLAG_NS(x)

generator/qtscript_masterinclude.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393

9494
// don't need this:
9595
#define Q_REVISION(v)
96+
#define Q_DECLARE_OPERATORS_FOR_FLAGS(x)
9697

9798
#include <QtCore/QtCore>
9899
#include <QtGui/QtGui>
@@ -101,6 +102,10 @@
101102
#include <QtSvg/QtSvg>
102103
#include <QtXml/QtXml>
103104

105+
#if QT_VERSION >= 0x060000
106+
#include <QtSvgWidgets/QtSvgWidgets>
107+
#endif
108+
104109
#include <QtUiTools/QtUiTools>
105110

106111
#if QT_VERSION >= 0x050000

0 commit comments

Comments
 (0)