Skip to content

Commit c6fd897

Browse files
committed
fixup! feat: improve screen rendering framework
1 parent 0fafde2 commit c6fd897

5 files changed

Lines changed: 4 additions & 95 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2789,7 +2789,7 @@ if(QML)
27892789
src/qml/qmlvisibleeffectsmodel.cpp
27902790
src/qml/qmlchainpresetmodel.cpp
27912791
src/qml/qmlwaveformoverview.cpp
2792-
src/qml/qmlmixxxcontroller.cpp
2792+
src/qml/qmlmixxxcontrollerscreen.cpp
27932793
# The following sources need to be in this target to get QML_ELEMENT properly interpreted
27942794
src/control/controlmodel.cpp
27952795
src/control/controlsortfiltermodel.cpp
@@ -2801,7 +2801,7 @@ if(QML)
28012801
# and :/mixxx.org/imports/Mixxx/Controls are placed into beginning of the binary
28022802
qt_finalize_target(mixxx)
28032803

2804-
# Required for src/qml/qmlmixxxcontroller.h, used in controllerscriptenginelegacy_test.cpp
2804+
# Required for src/qml/qmlmixxxcontrollerscreen.h, used in controllerscriptenginelegacy_test.cpp
28052805
target_link_libraries(mixxx-test PRIVATE Qt6::Quick)
28062806

28072807
install(

src/controllers/scripting/legacy/controllerscriptenginelegacy.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "mixer/playermanager.h"
1818
#include "moc_controllerscriptenginelegacy.cpp"
1919
#ifdef MIXXX_USE_QML
20-
#include "qml/qmlmixxxcontroller.h"
20+
#include "qml/qmlmixxxcontrollerscreen.h"
2121
#include "util/assert.h"
2222
#include "util/cmdlineargs.h"
2323

src/qml/qmlmixxxcontroller.cpp

Lines changed: 0 additions & 40 deletions
This file was deleted.

src/qml/qmlmixxxcontroller.h

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/test/controllerscriptenginelegacy_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "controllers/softtakeover.h"
2222
#include "helpers/log_test.h"
2323
#include "preferences/usersettings.h"
24-
#include "qml/qmlmixxxcontroller.h"
24+
#include "qml/qmlmixxxcontrollerscreen.h"
2525
#include "test/mixxxtest.h"
2626
#include "util/color/colorpalette.h"
2727
#include "util/time.h"

0 commit comments

Comments
 (0)