diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/Constants.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/Constants.qml.tpl index fb14c1e895d..524cbd0905c 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/Constants.qml.tpl +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/Constants.qml.tpl @@ -7,26 +7,4 @@ QtObject { readonly property color backgroundColor: "#e8e8e8" - - /* DirectoryFontLoader doesn't work with Qt Quick Ultralite. - However you may want to uncomment this block to load fonts in QtQuick environment: */ - /* - property alias fontDirectory: directoryFontLoader.fontDirectory - property alias relativeFontDirectory: directoryFontLoader.relativeFontDirectory - - readonly property font font: Qt.font({ - family: Qt.application.font.family, - pixelSize: Qt.application.font.pixelSize - }) - readonly property font largeFont: Qt.font({ - family: Qt.application.font.family, - pixelSize: Qt.application.font.pixelSize * 1.6 - }) - - - - property DirectoryFontLoader directoryFontLoader: DirectoryFontLoader { - id: directoryFontLoader - } - */ } diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/DirectoryFontLoader.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/DirectoryFontLoader.qml.tpl deleted file mode 100644 index 2030939b0b6..00000000000 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/DirectoryFontLoader.qml.tpl +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 - -import QtQuick 2.15 -import Qt.labs.folderlistmodel 2.15 - -QtObject { - id: loader - - property url fontDirectory: Qt.resolvedUrl("../../" + relativeFontDirectory) - property string relativeFontDirectory: "fonts" - - function loadFont(url) { - var fontLoader = Qt.createQmlObject('import QtQuick 2.15; FontLoader { source: "' + url + '"; }', - loader, - "dynamicFontLoader"); - } - - property FolderListModel folderModel: FolderListModel { - id: folderModel - folder: loader.fontDirectory - nameFilters: [ "*.ttf", "*.otf" ] - showDirs: false - - onStatusChanged: { - if (folderModel.status == FolderListModel.Ready) { - var i - for (i = 0; i < count; i++) { - loadFont(folderModel.get(i, "fileURL")) - } - } - } - } -} diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/wizard.json b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/wizard.json index b485866b602..8b54e315b2f 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/wizard.json +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/wizard.json @@ -160,10 +160,6 @@ "source": "Constants.qml.tpl", "target": "%{ProjectDirectory}/imports/Constants/Constants.qml" }, - { - "source": "DirectoryFontLoader.qml.tpl", - "target": "%{ProjectDirectory}/imports/Constants/DirectoryFontLoader.qml" - }, { "source": "constants_module.qmlproject.tpl", "target": "%{ProjectDirectory}/imports/Constants/constants_module.qmlproject"