search

mcallegari / qlcplus

Q Light Controller Plus (QLC+) is a free and cross-platform software to control DMX or analog lighting systems like moving heads, dimmers, scanners etc. This project is a fork of the great QLC project written by Heikki Junnila that aims to continue the QLC development and to introduce new features.
Apache License 2.0
1.02k stars 360 forks source link

qmltoqt6 rebasing #1610

Closed Ledjlale closed 2 months ago

Ledjlale commented 2 months ago

Rebase from master (git rebase origin/master) Only these 2 files had conflicts and needed to be edited: qmlui/qml/virtualconsole/VCSpeedDialProperties.qml qmlui/qml/virtualconsole/VCSpeedDialItem.qml

Which are

<<<<<<< HEAD
import QtQuick 2.14
import QtQuick.Layouts 1.14
import QtQuick.Controls 2.14
=======
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
>>>>>>> 3e43affa2 (qmlui: follow Qt6 guidelines for unqualified imports)