6 Commits

Author SHA1 Message Date
j.delarago
184f4b808e Bump QtQuick version to fix RegularExpressionValidator import
CURA-8640
2022-04-05 15:11:07 +02:00
c.lamboo
3c9e2a1b08 Update RegExpValidator to RegularExpressionValidator
Due to Qt6 API change

CURA-8640
2022-03-30 15:10:37 +02:00
Ghostkeeper
ee81326d6a
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.
2022-01-31 17:08:56 +01:00
Jaime van Kessel
2aa931cbca Remove unneded styles import 2022-01-04 09:48:02 +01:00
Remco Burema
71937bf828
DL: Align with online backend on allowed characters.
CURA-8395
2021-07-20 17:58:29 +02:00
Kostas Karmas
d972c505d0 Initial commit for the DL 2021-04-20 11:30:49 +02:00