From 0b059705b59ccc57733d059970ad7ac2f0758b4e Mon Sep 17 00:00:00 2001 From: Nodir Temirkhodjaev Date: Fri, 3 May 2019 18:28:36 +0500 Subject: [PATCH] Installer: Include Qt5QmlModels. --- deploy/deployment.json | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/deploy/deployment.json b/deploy/deployment.json index d6e8b0e7..d64e25e5 100644 --- a/deploy/deployment.json +++ b/deploy/deployment.json @@ -5,6 +5,7 @@ "${QTPATH}/bin/Qt5Core.dll", "${QTPATH}/bin/Qt5Gui.dll", "${QTPATH}/bin/Qt5Qml.dll", + "${QTPATH}/bin/Qt5QmlModels.dll", "${QTPATH}/bin/Qt5Quick.dll", "${QTPATH}/bin/Qt5QuickControls2.dll", "${QTPATH}/bin/Qt5QuickTemplates2.dll", @@ -13,31 +14,36 @@ "fort": [ "${BUILD}/FortFirewall.exe", "${ROOT}/ChangeLog", - "${ROOT}/src/scripts | *.qs Readme.txt |", - "${ROOT}/src/ui/i18n | *.qm |" + "${ROOT}/src/scripts | *.qs Readme.txt |", + "${ROOT}/src/ui/i18n | *.qm |" ] }, "${TARGET}/driver": { "fort": [ - "${ROOT}/src/driver/scripts | *.bat *.lnk |" + "${ROOT}/src/driver/scripts | *.bat *.lnk |" ] }, "${TARGET}/imports": { "common": [ - "${QTPATH}/qml/QtQuick.2 | *.dll *.qmltypes qmldir | *d.dll" + "${QTPATH}/qml/QtQuick.2 | *.dll qmldir | *d.dll" + ] + }, + "${TARGET}/imports/QtQml": { + "common": [ + "${QTPATH}/qml/QtQml/Models.2 | *.dll qmldir | *d.dll" ] }, "${TARGET}/imports/QtQuick": { "common": [ - "${QTPATH}/qml/QtQuick/Controls.2 | *.dll *.qmltypes qmldir *.qml | *d.dll", - "${QTPATH}/qml/QtQuick/Layouts | *.dll *.qmltypes qmldir | *d.dll", - "${QTPATH}/qml/QtQuick/Templates.2 | *.dll *.qmltypes qmldir | *d.dll", - "${QTPATH}/qml/QtQuick/Window.2 | *.dll *.qmltypes qmldir | *d.dll" + "${QTPATH}/qml/QtQuick/Controls.2 | *.dll qmldir *.qml | *d.dll", + "${QTPATH}/qml/QtQuick/Layouts | *.dll qmldir | *d.dll", + "${QTPATH}/qml/QtQuick/Templates.2 | *.dll qmldir | *d.dll", + "${QTPATH}/qml/QtQuick/Window.2 | *.dll qmldir | *d.dll" ] }, "${TARGET}/plugins": { "common": [ - "${QTPATH}/plugins/platforms | qwindows.dll | *d.dll" + "${QTPATH}/plugins/platforms | qwindows.dll | *d.dll" ] } }