diff options
Diffstat (limited to 'ports/qtdeclarative')
| -rw-r--r-- | ports/qtdeclarative/fix_alignment.patch | 15 | ||||
| -rw-r--r-- | ports/qtdeclarative/portfile.cmake | 29 | ||||
| -rw-r--r-- | ports/qtdeclarative/vcpkg.json | 20 |
3 files changed, 64 insertions, 0 deletions
diff --git a/ports/qtdeclarative/fix_alignment.patch b/ports/qtdeclarative/fix_alignment.patch new file mode 100644 index 000000000..088f60dc6 --- /dev/null +++ b/ports/qtdeclarative/fix_alignment.patch @@ -0,0 +1,15 @@ +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 new file mode 100644 index 000000000..fcea8ed2b --- /dev/null +++ b/ports/qtdeclarative/portfile.cmake @@ -0,0 +1,29 @@ +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 + qmleasing + qmlformat + qmlimportscanner + qmllint + qmlplugindump + qmlpreview + qmlprofiler + qmlscene + qmltestrunner + qmltime + qmltyperegistrar + ) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json new file mode 100644 index 000000000..99866447b --- /dev/null +++ b/ports/qtdeclarative/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "qtdeclarative", + "version-semver": "6.1.0", + "description": "Qt Declarative (Quick 2)", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "testlib" + ] + }, + { + "name": "qtdeclarative", + "host": true, + "default-features": false + } + ] +} |
