File tree Expand file tree Collapse file tree 1 file changed +8
-11
lines changed Expand file tree Collapse file tree 1 file changed +8
-11
lines changed Original file line number Diff line number Diff line change 169
169
170
170
#if QT_VERSION >= 0x050000
171
171
#include <QtWidgets/QtWidgets>
172
+ #if QT_VERSION < 0x060000
173
+ //in Qt6 qprintengine.h:12:1: error: explicit specialization of 'QMetaTypeId<QMarginsF>' after instantiation
172
174
#include <QtPrintSupport/QtPrintSupport>
173
175
#endif
176
+ #endif
174
177
175
178
#include <QtMultimedia/QtMultimedia>
176
179
180
+
177
181
#if QT_VERSION >= 0x050000
178
182
#include <QtMultimediaWidgets/QtMultimediaWidgets>
179
183
#include <QtQml/QtQml>
180
184
#include <QtQuick/QtQuick>
181
- #include <QtQuickWidgets/QtQuickWidgets>
182
185
#endif
183
186
184
187
#if QT_VERSION < 0x060000
185
- #ifndef QT_NO_XMLPATTERNS
186
- # include <QtXmlPatterns/QtXmlPatterns>
187
- #endif
188
- #endif
189
-
190
- #ifndef QT_NO_WEBKIT
191
- # include <QtWebKit/QtWebKit>
192
188
#if QT_VERSION >= 0x050000
193
- # include <QtWebKitWidgets/QtWebKitWidgets>
189
+ //in Qt6 qprintengine.h:12:1: error: explicit specialization of 'QMetaTypeId<QMarginsF>' after instantiation
190
+ // <-- build error with Qt6 related to duplicate definitions
191
+ #include <QtQuickWidgets/QtQuickWidgets>
192
+ #include <QtWebEngineWidgets/QtWebEngineWidgets>
194
193
#endif
195
194
#endif
196
195
197
- #include <QtWebEngineWidgets/QtWebEngineWidgets>
198
-
199
196
#ifndef QT_NO_PHONON
200
197
# include <phonon/phonon>
201
198
#endif
You can’t perform that action at this time.
0 commit comments