diff options
author | Juha Vuolle <juha.vuolle@insta.fi> | 2021-01-07 09:45:21 +0200 |
---|---|---|
committer | Juha Vuolle <juha.vuolle@insta.fi> | 2021-01-21 16:45:14 +0200 |
commit | 682271c9e62e58d48b7e4d17761aade3465ca4d8 (patch) | |
tree | 7e35071847fddaac547faba32e1550cd82ae3599 /src/scxml/qscxmlcompiler.cpp | |
parent | b789cfdd4fb7a833e426072393a4cb23328a1641 (diff) |
Fix a set of compilation errors against Qt6
Fixes include
-qmllistproperty uses qsizetype instead of int
-implicit constructor calls that Qt6 marks as explicit
-QEnableIf removed => std::enable_if
-Replace the removed QCoreApplicationPrivate::cloneEvent()
-Conflicting forward declaration for QStringList (comes via qglobal.h)
N.B. after this task the generated (by generator.cpp) code won’t still
compile, and it likely requires more in-depth study how to fix it
=> looks like they relate to the Qt6 property system changes. By
temporarily disabling the violating generated code all unit tests pass
though => needs a followup task to analyze and fix.
Task-number: QTBUG-89832
Change-Id: I9f7d1cd5898b549f243a7df464ca124d29074c46
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
Diffstat (limited to 'src/scxml/qscxmlcompiler.cpp')
-rw-r--r-- | src/scxml/qscxmlcompiler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scxml/qscxmlcompiler.cpp b/src/scxml/qscxmlcompiler.cpp index 60e7197..687d255 100644 --- a/src/scxml/qscxmlcompiler.cpp +++ b/src/scxml/qscxmlcompiler.cpp @@ -2451,7 +2451,7 @@ QByteArray QScxmlCompilerPrivate::DefaultLoader::load(const QString &name, const const QUrl url(name); if (!url.isLocalFile() && !url.isRelative()) errs << QStringLiteral("src attribute is not a local file (%1)").arg(name); - QFileInfo fInfo = url.isLocalFile() ? url.toLocalFile() : name; + QFileInfo fInfo(url.isLocalFile() ? url.toLocalFile() : name); #endif // BUILD_QSCXMLC if (fInfo.isRelative()) fInfo = QFileInfo(QDir(baseDir).filePath(fInfo.filePath())); |