From 7bc5ab5e48e28e48210833f4b38e7cacd472079c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sivert=20Kr=C3=B8vel?= Date: Tue, 30 Jan 2024 12:16:36 +0100 Subject: [PATCH] McuSupport: Comment out Spark properties in template projects MCU tooling is more strict about QmlProject properties from Qt for MCUs 2.7, so leaving these properties in would trigger several warnings Change-Id: Ia251f74180493b6ff115218a237994886cf65379 Reviewed-by: Reviewed-by: Yasser Grimes Reviewed-by: Alessandro Portale --- .../wizards/qmlproject-empty/project.qmlproject.tpl | 12 ++++++------ .../wizards/qmlproject/project.qmlproject.tpl | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/plugins/mcusupport/wizards/qmlproject-empty/project.qmlproject.tpl b/src/plugins/mcusupport/wizards/qmlproject-empty/project.qmlproject.tpl index ab85861a5ec..c69a7d22f55 100644 --- a/src/plugins/mcusupport/wizards/qmlproject-empty/project.qmlproject.tpl +++ b/src/plugins/mcusupport/wizards/qmlproject-empty/project.qmlproject.tpl @@ -33,12 +33,12 @@ Project { // Font properties for "Spark" // These properties are in effect only if the "Spark" font engine is used - complexTextRendering: true // Set this to false if complex scripts are not needed (Arabic scripts, Indic scripts, etc.) - fontCachePriming: false // Set to true to decrease application startup time. Only applies to fonts configured with unicode ranges (font.unicodeCoverage). - fontCacheSize: 0 // If this is needed, use a suitable number. Setting this to a sensible value will improve performance, the global default is 104800. - fontHeapSize: -1 // Set to sufficient value to improve performance. -1 means no restrictions to heap allocation. - fontHeapPrealloc: true - fontCachePrealloc: true + // complexTextRendering: true // Set this to false if complex scripts are not needed (Arabic scripts, Indic scripts, etc.) + // fontCachePriming: false // Set to true to decrease application startup time. Only applies to fonts configured with unicode ranges (font.unicodeCoverage). + // fontCacheSize: 0 // If this is needed, use a suitable number. Setting this to a sensible value will improve performance, the global default is 104800. + // fontHeapSize: -1 // Set to sufficient value to improve performance. -1 means no restrictions to heap allocation. + // fontHeapPrealloc: true + // fontCachePrealloc: true } QmlFiles { diff --git a/src/plugins/mcusupport/wizards/qmlproject/project.qmlproject.tpl b/src/plugins/mcusupport/wizards/qmlproject/project.qmlproject.tpl index 0c879ccfb0d..8fb9526a968 100644 --- a/src/plugins/mcusupport/wizards/qmlproject/project.qmlproject.tpl +++ b/src/plugins/mcusupport/wizards/qmlproject/project.qmlproject.tpl @@ -34,12 +34,12 @@ Project { // Font properties for "Spark" // These properties are in effect only if the "Spark" font engine is used - complexTextRendering: true // Set this to false if complex scripts are not needed (Arabic scripts, Indic scripts, etc.) - fontCachePriming: false // Set to true to decrease application startup time. Only applies to fonts configured with unicode ranges (font.unicodeCoverage). - fontCacheSize: 0 // If this is needed, use a suitable number. Setting this to a sensible value will improve performance, the global default is 104800. - fontHeapSize: -1 // Set to sufficient value to improve performance. -1 means no restrictions to heap allocation. - fontHeapPrealloc: true - fontCachePrealloc: true + // complexTextRendering: true // Set this to false if complex scripts are not needed (Arabic scripts, Indic scripts, etc.) + // fontCachePriming: false // Set to true to decrease application startup time. Only applies to fonts configured with unicode ranges (font.unicodeCoverage). + // fontCacheSize: 0 // If this is needed, use a suitable number. Setting this to a sensible value will improve performance, the global default is 104800. + // fontHeapSize: -1 // Set to sufficient value to improve performance. -1 means no restrictions to heap allocation. + // fontHeapPrealloc: true + // fontCachePrealloc: true } /* QML files */