Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qt6: generator/typesystem.cpp: XML workround #123

Merged
merged 1 commit into from
Oct 9, 2023
Merged

Qt6: generator/typesystem.cpp: XML workround #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions generator/generator.pri
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ SOURCES += \

QT += core xml

greaterThan(QT_MAJOR_VERSION, 5) {
QT += core5compat
message("WARNING: Qt module core5compat for XML handling in typesystem.cpp")
}

win32-msvc.net {
QMAKE_CXXFLAGS += /Zm500
QMAKE_CXXFLAGS -= -Zm200
Expand Down
16 changes: 16 additions & 0 deletions generator/typesystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,22 @@
#include <QtXml>
#include <qcompilerdetection.h> // Q_FALLTHROUGH

/* This file needs to be rewritten as documented here:
*
* See: https://doc.qt.io/qt-6/xml-changes-qt6.html
*
* The rewrite may be backward compatible to Qt4.3 APIs because the base
* facilites (QXmlStreamReader) used to relace the 'SAX' parser were apparently
* available then. Use of Xml5Compat is a work round until such a rewrite has
* been done.
*/
#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
# if defined(__GNUC__)
# pragma GCC warning "Qt6: implement Qt6 compatible XML reading"
# endif
# include <QtCore5Compat/QXmlDefaultHandler>
#endif
jbowler marked this conversation as resolved.
Show resolved Hide resolved

QString strings_Object = QLatin1String("Object");
QString strings_String = QLatin1String("String");
QString strings_Thread = QLatin1String("Thread");
Expand Down
Loading