diff options
Diffstat (limited to 'ports/qtdeclarative')
| -rw-r--r-- | ports/qtdeclarative/fix_alignment.patch | 15 | ||||
| -rw-r--r-- | ports/qtdeclarative/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/qtdeclarative/vcpkg.json | 6 |
3 files changed, 6 insertions, 20 deletions
diff --git a/ports/qtdeclarative/fix_alignment.patch b/ports/qtdeclarative/fix_alignment.patch deleted file mode 100644 index 088f60dc6..000000000 --- a/ports/qtdeclarative/fix_alignment.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/qml/jsruntime/qv4enginebase_p.h b/src/qml/jsruntime/qv4enginebase_p.h -index 612c2dd4530..17e47e1b059 100644 ---- a/src/qml/jsruntime/qv4enginebase_p.h -+++ b/src/qml/jsruntime/qv4enginebase_p.h -@@ -88,7 +88,9 @@ struct Q_QML_EXPORT EngineBase { - MemoryManager *memoryManager = nullptr; - - qint32 callDepth = 0; -- quint8 padding2[QT_POINTER_SIZE - sizeof(quint32)]; -+#if QT_POINTER_SIZE == 8 -+ quint32 padding2; -+#endif - Object *globalObject = nullptr; - Value *jsStackLimit = nullptr; - Value *jsStackBase = nullptr; diff --git a/ports/qtdeclarative/portfile.cmake b/ports/qtdeclarative/portfile.cmake index fcea8ed2b..3928c3af3 100644 --- a/ports/qtdeclarative/portfile.cmake +++ b/ports/qtdeclarative/portfile.cmake @@ -1,10 +1,6 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -if(QT_IS_LATEST) - set(${PORT}_PATCHES fix_alignment.patch) -endif() - set(TOOL_NAMES qml qmlcachegen @@ -19,6 +15,7 @@ endif() qmltestrunner qmltime qmltyperegistrar + qmldom ) qt_install_submodule(PATCHES ${${PORT}_PATCHES} diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index b8249ab25..7a8e82c7a 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "dependencies": [ @@ -15,6 +15,10 @@ "name": "qtdeclarative", "host": true, "default-features": false + }, + { + "name": "qtshadertools", + "default-features": false } ] } |
