Remove not needed leftover file from Coffee Machine example

Removed Cup.qml from Coffee Machine example. The file was not supposed
to be there after the example re-design as it is supposed to be
replaced by the Cup.ui.qml but apparently it was not fully removed and
was left in the file listing of coffeemachine.qrc.

With Cmake the file has not been visible in Qt Creator or Squish
but with qmake its visible in Qt Creator
and exposed to Squish as well.

Affects testing the example because the same object has different
object names in Squish between Cmake and qmake.

Task-number: QTBUG-123440
Pick-to: 6.7 6.7.1
Change-Id: I82c2a315cd8af9459e5d5caecb3a3efe8a1e5eff
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Jani Korteniemi <jani.korteniemi@qt.io>

3 files changed, 13 insertions, 65 deletions

diff --git a/examples/demos/coffee/Cup.qml b/examples/demos/coffee/Cup.qml
deleted file mode 100644
index a6d332e69..000000000
--- a/examples/demos/coffee/Cup.qml
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (C) 2023 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-import QtQuick
-
-Item {
-    property int coffeeAmount
-    property int milkAmount
-    property int foamAmount
-    property double sugarAmount
-    property alias coffee: coffee
-
-    Image {
-        id: foam
-        source: "./images/Ingredients/Milk_foam.svg"
-        anchors.bottom: cup.bottom
-        sourceSize.width: cup.width
-        anchors.horizontalCenter: parent.horizontalCenter
-        sourceSize.height: milk.height + (foamAmount * (cup.height / 700))
-    }
-    Image {
-        id: milk
-        source: "./images/Ingredients/milk.svg"
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.bottom: cup.bottom
-        sourceSize.width: cup.width
-        sourceSize.height: coffee.height + (milkAmount * (cup.height / 700))
-    }
-    Image {
-        id: coffee
-        source: "./images/Ingredients/espresso_coffee.svg"
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.bottom: cup.bottom
-        sourceSize.width: cup.width
-        sourceSize.height: (cup.height / 6.4) + (coffeeAmount * (cup.height / 550))
-    }
-    Image {
-        id: sugar
-        source: "./images/Ingredients/sugar.svg"
-        anchors.horizontalCenter: cup.horizontalCenter
-        anchors.top: coffee.top
-        sourceSize.width: cup.width / 6
-        opacity: sugarAmount
-    }
-    Image {
-        id: cup
-        source: (Colors.currentTheme == Colors.dark) ? "./images/Cups/dark_cup.svgz" : "./images/Cups/light_cup.svgz"
-        sourceSize.width: parent.width
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.verticalCenter: parent.verticalCenter
-    }
-}
diff --git a/examples/demos/coffee/coffeemachine.qrc b/examples/demos/coffee/coffeemachine.qrc
index f152e611e..36cb87bf6 100644
--- a/examples/demos/coffee/coffeemachine.qrc
+++ b/examples/demos/coffee/coffeemachine.qrc
@@ -5,7 +5,6 @@
         <file>Ready.qml</file>
         <file>Progress.qml</file>
         <file>CustomToolBar.qml</file>
-        <file>Cup.qml</file>
         <file>Insert.qml</file>
         <file>Home.qml</file>
         <file>Settings.qml</file>
@@ -16,6 +15,18 @@
         <file>ApplicationFlow.qml</file>
         <file>main.qml</file>
         <file>qtquickcontrols2.conf</file>
+        <file>qmldir</file>
+        <file>Cup.ui.qml</file>
+        <file>SettingsForm.ui.qml</file>
+        <file>ReadyForm.ui.qml</file>
+        <file>InsertForm.ui.qml</file>
+        <file>HomeForm.ui.qml</file>
+        <file>CustomToolBarForm.ui.qml</file>
+        <file>CustomSliderForm.ui.qml</file>
+        <file>CustomButtonForm.ui.qml</file>
+        <file>CoffeeCardForm.ui.qml</file>
+        <file>ChoosingCoffeeForm.ui.qml</file>
+        <file>ProgressForm.ui.qml</file>
         <file>images/icons/light_mode_black_24dp.svg</file>
         <file>images/icons/dark_mode_black_24dp.svg</file>
         <file>images/icons/Qt-logo-white-transparent.svg</file>
@@ -38,18 +49,6 @@
         <file>images/Cups/dark_cup.svgz</file>
         <file>images/Cups/card_cup_light.svg</file>
         <file>images/Cups/card_cup_dark.svg</file>
-        <file>qmldir</file>
-        <file>Cup.ui.qml</file>
-        <file>SettingsForm.ui.qml</file>
-        <file>ReadyForm.ui.qml</file>
-        <file>InsertForm.ui.qml</file>
-        <file>HomeForm.ui.qml</file>
-        <file>CustomToolBarForm.ui.qml</file>
-        <file>CustomSliderForm.ui.qml</file>
-        <file>CustomButtonForm.ui.qml</file>
-        <file>CoffeeCardForm.ui.qml</file>
-        <file>ChoosingCoffeeForm.ui.qml</file>
-        <file>ProgressForm.ui.qml</file>
     </qresource>
     <qresource prefix="/"/>
 </RCC>
diff --git a/examples/demos/coffee/qmldir b/examples/demos/coffee/qmldir
index d0704d3c1..b3af709c1 100644
--- a/examples/demos/coffee/qmldir
+++ b/examples/demos/coffee/qmldir
@@ -9,7 +9,7 @@ singleton Colors 254.0 Colors.qml
 CustomButton 254.0 CustomButton.qml
 CustomSlider 254.0 CustomSlider.qml
 CustomToolBar 254.0 CustomToolBar.qml
-FilledCup 254.0 Cup.qml
+Cup 254.0 Cup.ui.qml
 Home 254.0 Home.qml
 Insert 254.0 Insert.qml
 Progress 254.0 Progress.qml