Fix remaining merge conflicts

- When both branches added Controls1 as OldControls, it's not marked as a merge conflict. But the merge removed the need for OldControls, so the import can be removed.
- There was one instance where I had removed the OldControls for a checkbox but there it should remain since the checkboxes are updated in a separate ticket.

Contributes to issue CURA-8684.

plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml

@@ -1,8 +1,8 @@
-// Copyright (C) 2021 Ultimaker B.V.
+//Copyright (C) 2022 Ultimaker B.V.
+//Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.10
 import QtQuick.Window 2.2
-import QtQuick.Controls 1.4 as OldControls // TableView doesn't exist in the QtQuick Controls 2.x in 5.10, so use the old one
 import QtQuick.Controls 2.3
 
 import UM 1.2 as UM

plugins/DigitalLibrary/resources/qml/DigitalFactoryOpenDialog.qml

@@ -1,8 +1,8 @@
-// Copyright (C) 2021 Ultimaker B.V.
+//Copyright (C) 2022 Ultimaker B.V.
+//Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.10
 import QtQuick.Window 2.2
-import QtQuick.Controls 1.4 as OldControls // TableView doesn't exist in the QtQuick Controls 2.x in 5.10, so use the old one
 import QtQuick.Controls 2.3
 
 import UM 1.2 as UM

plugins/DigitalLibrary/resources/qml/DigitalFactorySaveDialog.qml

@@ -1,8 +1,8 @@
-// Copyright (C) 2021 Ultimaker B.V.
+//Copyright (C) 2022 Ultimaker B.V.
+//Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.10
 import QtQuick.Window 2.2
-import QtQuick.Controls 1.4 as OldControls // TableView doesn't exist in the QtQuick Controls 2.x in 5.10, so use the old one
 import QtQuick.Controls 2.3
 
 import UM 1.2 as UM

plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml

@@ -1,9 +1,8 @@
-// Copyright (C) 2021 Ultimaker B.V.
-// Cura is released under the terms of the LGPLv3 or higher.
+//Copyright (C) 2022 Ultimaker B.V.
+//Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.10
 import QtQuick.Window 2.2
-import QtQuick.Controls 1.4 as OldControls // TableView doesn't exist in the QtQuick Controls 2.x in 5.10, so use the old one
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.1
 

plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml

@@ -3,7 +3,6 @@
 
 import QtQuick 2.2
 import QtQuick.Controls 2.15
-import QtQuick.Controls 1.2 as OldControls
 import QtQuick.Controls.Styles 1.2
 
 import UM 1.5 as UM

resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml

@@ -3,7 +3,6 @@
 
 import Qt.labs.qmlmodels 1.0
 import QtQuick 2.1
-import QtQuick.Controls 1.1 as OldControls
 import QtQuick.Controls 2.15
 import QtQuick.Dialogs 1.2
 import QtQuick.Window 2.1

resources/qml/Preferences/Materials/MaterialsView.qml

@@ -3,7 +3,6 @@
 
 import QtQuick 2.7
 import QtQuick.Controls 2.15
-import QtQuick.Controls 1.4 as OldControls
 import QtQuick.Dialogs 1.2
 
 import UM 1.5 as UM
@@ -326,7 +325,6 @@ Item
                 id: spoolWeightSpinBox
                 width: informationPage.columnWidth
                 value: base.getMaterialPreferenceValue(properties.guid, "spool_weight", Cura.ContainerManager.getContainerMetaDataEntry(properties.container_id, "properties/weight"))
-                suffix: " g"
                 stepSize: 100
                 to: 10000
                 editable: true

resources/qml/Preferences/ProfilesPage.qml

@@ -2,7 +2,6 @@
 //Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.7
-import QtQuick.Controls 1.4 as OldControls
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.3
 import QtQuick.Dialogs 1.2

resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml

@@ -3,7 +3,6 @@
 
 import QtQuick 2.10
 import QtQuick.Controls 2.3
-import QtQuick.Controls 1.4 as OldControls
 import QtQuick.Layouts 1.3
 
 import UM 1.5 as UM

resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml

@@ -2,7 +2,6 @@
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.10
-import QtQuick.Controls 1.4 as OldControls
 import QtQuick.Controls 2.3
 
 import UM 1.5 as UM

resources/qml/ProfileOverview.qml

@@ -3,7 +3,6 @@
 
 import Qt.labs.qmlmodels 1.0
 import QtQuick 2.7
-import QtQuick.Controls 1.4 as OldControls
 import QtQuick.Controls 2.15
 
 import UM 1.5 as UM