Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

qmltoqt6 rebasing #1610

Merged
merged 129 commits into from
Sep 2, 2024
Merged

qmltoqt6 rebasing #1610

merged 129 commits into from
Sep 2, 2024

Conversation

Ledjlale
Copy link

@Ledjlale Ledjlale commented Sep 2, 2024 •
edited
Loading

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)

lilyCalla and others added 30 commits April 30, 2024 22:45
@lilyCalla
prevent invisible search filter
6b19673
@lilyCalla
prevent accidental nullptr entries in map
689ed36
@lilyCalla
prevent ESC from clearing fixture text
74be2d8
@lilyCalla
correct filename in license header
9afdc73
@lilyCalla
prevent ESC from erasing universe names
8d9ec56
@lilyCalla
fixed code style issues
6bf200f
@mcallegari
ui: fix deprecation of combobox activated signal
01fdda1
@lilyCalla
refresh cue list widget on add or remove
9ab04d0
@mcallegari
ui/vcbutton: indentation
810efe3
@mcallegari
vc/slider: add an optional button to flash in playback mode (fix mcal…
a1f6cd7 
…legari#1524)
@mcallegari
build: attempt to fix build on Arch with GCC 14 (mcallegari#1565)
5070725
@mcallegari
build: attempt to fix build on Arch with GCC 14 (mcallegari#1565)
6382dd1
@mcallegari
resources: 5 new fixtures (see changelog)
b60a56d
@lilyCalla
fixed formatting
9805f86
@mcallegari
Merge pull request mcallegari#1564 from lilyCalla/cuelist-refresh
28167be 
Refresh Cue List Widget on Addition or Removal of a Step from Chaser
@mcallegari
qmlui: improve mcallegari#1564
f860c6b
@mcallegari
Merge pull request mcallegari#1560 from lilyCalla/fixture-select-segf…
9aea2e7 
…ault

Fix bugs in Fixture Search
@mcallegari
qmlui: more code hardening
ee16a5f
@qfulmina
plugins/hiddmxdevice: Add possibility to activate merger mode
4d8eefa
@qfulmina
plugins/hiddmxdevice: Add translation stubs for new merger mode option
e6f9100
@qfulmina
docs: Add documentation for merger mode of DE/FX5/Nodle DMX devices
b8d7cb1
@Binary-Vanguard-12138
mcallegari#1559 Added animation widget preset buttons in Web API test…
6a66af8 
… page
@mcallegari
qmlui: add VC Slider flash button
cc741db
@YesterKo
Added beamZ PS10W fixture
d55aada
@qfulmina
plugins/hidplugin: Add device's serial number to name string of HIDDM…
9b5938f 
…XDevice
@qfulmina
plugins/hidplugin: Add device's serial number to name string of HIDJs…
ecd6445 
…Device
@mcallegari
Update beamZ-PS10W.qxf
febc595
@mcallegari
Merge pull request mcallegari#1568 from YesterKo/master
ccfce2c 
Added beamZ PS10W fixture
@mcallegari
resources: 4 new fixtures (see changelog)
8378b8f
@mcallegari
Merge pull request mcallegari#1566 from Binary-Vanguard-12138/webapi_…
31a9aa5 
…test_animation

Animation widget in Web API test page.
mcallegari and others added 27 commits August 21, 2024 10:05
@mcallegari
actions: attempt to fix macos build
10e53c7
@mcallegari
actions: attempt to fix macos build
9f12f27
@mcallegari
actions: attempt to fix macos build
dd5b80f
@mcallegari
actions: attempt to fix macos build
766d852
@mcallegari
actions: attempt to fix macos build
7cbbbfc
@mcallegari
actions: attempt to fix macos build
5a709e4
@mcallegari
actions: attempt to fix macos build
7f2cc47
@mcallegari
resources: fix Fun Generation name (fix mcallegari#1605)
cb35bba
@mcallegari
qmlui: preliminary implementation of Animation widget
d078e89
@yestalgia
Fix(add-fixture): Hidden channel address in add fixture dialogue
d85724f
@mcallegari
Merge pull request mcallegari#1606 from yestalgia/feature/channel-num…
5989f22 
…bers-for-add-fixture-to-scene

Add channel address in add fixture dialogue
@mcallegari @Ledjlale
qmlui: port Dialogs to up-to-date syntax
c91e9de
@Ledjlale
qmlui: follow Qt6 guidelines for unqualified imports
22539db
@mcallegari @Ledjlale
qmlui: fix build issues due to deprecations
60465cc
@mcallegari @Ledjlale
actions: build with Qt6 and cmake
e71e00b
@mcallegari @Ledjlale
actions: qml and coverage build
83f2316
@mcallegari @Ledjlale
actions: add required Qt modules
599449f
@mcallegari @Ledjlale
actions: add required Qt modules
614243e
@mcallegari @Ledjlale
actions: add required Qt modules
1f144de
@mcallegari @Ledjlale
actions: fix unit test phase
2dd37df
@mcallegari @Ledjlale
actions: fix install target
481ddeb
@mcallegari @Ledjlale
actions: improve install in appimage
9cae5ad
@mcallegari @Ledjlale
actions: fix qml install
f0a2eba
@mcallegari @Ledjlale
actions: coverage is a debug build
88641cb
@mcallegari @Ledjlale
ui: fix key sequence CTRL strip
ce58471
@mcallegari @Ledjlale
plugins: temporarily disable enttec wing test unit
59d8156
@mcallegari @Ledjlale
coverage: exclude enttecwing from coverage
31a294e
@Ledjlale Ledjlale changed the title Fix/qt6 rebase2 qmltoqt6 rebasing Sep 2, 2024
@Ledjlale Ledjlale marked this pull request as ready for review September 2, 2024 13:31
@mcallegari mcallegari merged commit 371f514 into mcallegari:qmltoqt6 Sep 2, 2024
7 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.