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 169169
170170#if QT_VERSION >= 0x050000
171171#include <QtWidgets/QtWidgets>
172+ #if QT_VERSION < 0x060000
173+ //in Qt6 qprintengine.h:12:1: error: explicit specialization of 'QMetaTypeId<QMarginsF>' after instantiation
172174#include <QtPrintSupport/QtPrintSupport>
173175#endif
176+ #endif
174177
175178#include <QtMultimedia/QtMultimedia>
176179
180+
177181#if QT_VERSION >= 0x050000
178182#include <QtMultimediaWidgets/QtMultimediaWidgets>
179183#include <QtQml/QtQml>
180184#include <QtQuick/QtQuick>
181- #include <QtQuickWidgets/QtQuickWidgets>
182185#endif
183186
184187#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>
192188#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>
194193#endif
195194#endif
196195
197- #include <QtWebEngineWidgets/QtWebEngineWidgets>
198-
199196#ifndef QT_NO_PHONON
200197# include <phonon/phonon>
201198#endif
You can’t perform that action at this time.
0 commit comments