summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Köhne <kai.koehne@qt.io>2023-06-28 17:02:18 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-12-12 13:24:14 +0000
commitea69ef281060e8ec3106af156af04389331b3ab6 (patch)
treeaf1e3d5450ea9de6710b98d96135bde40ad5b92b
parent4c5d629e0989ab65a6cc5e0f75b1e0b0af09bf4f (diff)
Remove .qmlproject files from FX_Material_showroom example
The example uses cpp code to download assets. It therefore can't be edited in Qt Design Studio, or run without main.cpp. Pick-to: 6.6 Change-Id: I2d39bf3d91248ccec5a7892e108bb093e69de1e4 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit 52b97cd6d0ce3543ee7ddd296acafc502ba9f570) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/demos/FX_Material_Showroom/PocketDemo.qmlproject110
-rw-r--r--examples/demos/FX_Material_Showroom/PocketDemo.qmlproject.qtds123
2 files changed, 0 insertions, 233 deletions
diff --git a/examples/demos/FX_Material_Showroom/PocketDemo.qmlproject b/examples/demos/FX_Material_Showroom/PocketDemo.qmlproject
deleted file mode 100644
index 6f9ff80b2..000000000
--- a/examples/demos/FX_Material_Showroom/PocketDemo.qmlproject
+++ /dev/null
@@ -1,110 +0,0 @@
-import QmlProject
-
-Project {
- mainFile: "content/App.qml"
-
- /* Include .qml, .js, and image files from current directory and subdirectories */
- QmlFiles {
- directory: "content"
- }
-
- QmlFiles {
- directory: "imports"
- }
-
- JavaScriptFiles {
- directory: "content"
- }
-
- JavaScriptFiles {
- directory: "imports"
- }
-
- ImageFiles {
- directory: "content"
- }
-
- ImageFiles {
- directory: "asset_imports"
- }
-
- Files {
- filter: "*.conf"
- files: ["qtquickcontrols2.conf"]
- }
-
- Files {
- filter: "qmldir"
- directory: "."
- }
-
- Files {
- filter: "*.ttf;*.otf"
- }
-
- Files {
- filter: "*.wav;*.mp3"
- }
-
- Files {
- filter: "*.mp4"
- }
-
- Files {
- filter: "*.glsl;*.glslv;*.glslf;*.vsh;*.fsh;*.vert;*.frag"
- }
-
- Files {
- filter: "*.mesh"
- directory: "asset_imports"
- }
-
- Files {
- filter: "*.qml"
- directory: "asset_imports"
- }
-
- Environment {
- QT_QUICK_CONTROLS_CONF: "qtquickcontrols2.conf"
- QT_AUTO_SCREEN_SCALE_FACTOR: "1"
- QT_LOGGING_RULES: "qt.qml.connections=false"
- QT_ENABLE_HIGHDPI_SCALING: "0"
- /* Useful for debugging
- QSG_VISUALIZE=batches
- QSG_VISUALIZE=clip
- QSG_VISUALIZE=changes
- QSG_VISUALIZE=overdraw
- */
- }
-
- qt6Project: true
-
- /* List of plugin directories passed to QML runtime */
- importPaths: [ "imports", "asset_imports" ]
-
- /* Required for deployment */
- targetDirectory: "/opt/PocketDemo"
-
- qdsVersion: "3.7"
-
- quickVersion: "6.2"
-
- /* If any modules the project imports require widgets (e.g. QtCharts), widgetApp must be true */
- widgetApp: true
-
- /* args: Specifies command line arguments for qsb tool to generate shaders.
- files: Specifies target files for qsb tool. If path is included, it must be relative to this file.
- Wildcard '*' can be used in the file name part of the path.
- e.g. files: [ "content/shaders/*.vert", "*.frag" ] */
- ShaderTool {
- args: "-s --glsl \"100 es,120,150\" --hlsl 50 --msl 12"
- files: [ "content/shaders/*" ]
- }
-
- multilanguageSupport: true
- supportedLanguages: ["en"]
- primaryLanguage: "en"
-
-
- mainUiFile: "content/MouseRotatorAndWASD.qml"
-}
diff --git a/examples/demos/FX_Material_Showroom/PocketDemo.qmlproject.qtds b/examples/demos/FX_Material_Showroom/PocketDemo.qmlproject.qtds
deleted file mode 100644
index c4ca88a7d..000000000
--- a/examples/demos/FX_Material_Showroom/PocketDemo.qmlproject.qtds
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorProject>
-<!-- Written by QtDesignStudio 4.1.0, 2023-05-30T19:17:26. -->
-<qtcreator>
- <data>
- <variable>EnvironmentId</variable>
- <value type="QByteArray">{464bda2b-5338-456d-af03-3f916943c0fc}</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.ActiveTarget</variable>
- <value type="qlonglong">0</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.EditorSettings</variable>
- <valuemap type="QVariantMap">
- <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
- <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
- <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
- <value type="QString" key="language">Cpp</value>
- <valuemap type="QVariantMap" key="value">
- <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
- </valuemap>
- </valuemap>
- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
- <value type="QString" key="language">QmlJS</value>
- <valuemap type="QVariantMap" key="value">
- <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
- </valuemap>
- </valuemap>
- <value type="qlonglong" key="EditorConfiguration.CodeStyle.Count">2</value>
- <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
- <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
- <value type="int" key="EditorConfiguration.IndentSize">4</value>
- <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
- <value type="int" key="EditorConfiguration.MarginColumn">80</value>
- <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
- <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
- <value type="int" key="EditorConfiguration.PaddingMode">1</value>
- <value type="bool" key="EditorConfiguration.PreferSingleLineComments">false</value>
- <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
- <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
- <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
- <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
- <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
- <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
- <value type="int" key="EditorConfiguration.TabSize">8</value>
- <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
- <value type="bool" key="EditorConfiguration.UseIndenter">false</value>
- <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
- <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
- <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
- <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
- <value type="QString" key="EditorConfiguration.ignoreFileTypes">*.md, *.MD, Makefile</value>
- <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
- <value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value>
- <value type="bool" key="EditorConfiguration.tintMarginArea">true</value>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.PluginSettings</variable>
- <valuemap type="QVariantMap">
- <valuemap type="QVariantMap" key="CppEditor.QuickFix">
- <value type="bool" key="UseGlobalSettings">true</value>
- </valuemap>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Target.0</variable>
- <valuemap type="QVariantMap">
- <value type="QString" key="DeviceType">Desktop</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 6.5.1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 6.5.1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{63f87550-2541-4163-9631-08b7fea781da}</value>
- <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">-1</value>
- <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
- <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
- <value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">0</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
- <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
- </valuemap>
- <value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
- <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
- <valuelist type="QVariantList" key="CustomOutputParsers"/>
- <value type="int" key="PE.EnvironmentAspect.Base">0</value>
- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QML Runtime</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmlProjectManager.QmlRunConfiguration.Qml</value>
- <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
- <value type="QString" key="QmlProjectManager.QmlRunConfiguration.LastUsedLanguage">en</value>
- <value type="QString" key="QmlProjectManager.QmlRunConfiguration.MainScript">CurrentFile</value>
- <value type="int" key="QmlProjectManager.kit">0</value>
- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- </valuemap>
- <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.TargetCount</variable>
- <value type="qlonglong">1</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
- <value type="int">22</value>
- </data>
- <data>
- <variable>Version</variable>
- <value type="int">22</value>
- </data>
-</qtcreator>