Browse Source

qt: do not use `QtQuick.Effects` anymore

pull/187/head
Fatih Uzunoglu 8 months ago
committed by Felix Paul Kühne
parent
commit
047f56d00a
  1. 6
      configure.ac
  2. 6
      modules/gui/qt/maininterface/mainui.cpp
  3. 1
      modules/gui/qt/maininterface/qml/MainInterface.qml
  4. 3
      modules/gui/qt/plugins.hpp
  5. 19
      modules/gui/qt/qt.cpp

6
configure.ac

@ -4151,11 +4151,6 @@ AS_IF([test "${enable_qt}" != "no"], [
AC_MSG_CHECKING([if required Qt plugins are installed with ${QMAKE6} and conf ${with_qtconf}])
AS_IF([test "${have_qt65}" = "yes"], [
qt_qml_effects_module="QtQuick.Effects"
], [
qt_qml_effects_module="Qt5Compat.GraphicalEffects"
])
AS_IF([${PYTHON3} ${srcdir}/buildsystem/check_qml_module.py \
--qmake "${QMAKE6}" \
--qtconf "${with_qtconf}" \
@ -4165,7 +4160,6 @@ AS_IF([test "${enable_qt}" != "no"], [
QtQuick.Layouts="" \
QtQuick.Window="" \
QtQuick.Controls="" \
${qt_qml_effects_module}="" \
>&AS_MESSAGE_FD ], [
AC_MSG_RESULT([yes])
],[

6
modules/gui/qt/maininterface/mainui.cpp

@ -423,10 +423,4 @@ void MainUI::registerQMLTypes()
qmlRegisterModule(uri, versionMajor, versionMinor);
qmlProtectModule(uri, versionMajor);
}
#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
// Dummy QtQuick.Effects module
qmlRegisterModule("QtQuick.Effects", 0, 0);
// Do not protect, types can still be registered.
#endif
}

1
modules/gui/qt/maininterface/qml/MainInterface.qml

@ -25,7 +25,6 @@ import QtQuick.Layouts
import QtQuick.Templates
import QtQuick.Controls
import QtQuick.Window
import QtQuick.Effects // Unconditionally available, dummy if Qt version is less than 6.5.0
import VLC.MainInterface
import VLC.Widgets as Widgets

3
modules/gui/qt/plugins.hpp

@ -51,9 +51,6 @@
Q_IMPORT_QML_PLUGIN(QtQuickLayoutsPlugin)
Q_IMPORT_QML_PLUGIN(QtQuick_WindowPlugin)
Q_IMPORT_QML_PLUGIN(QtQuickTemplates2Plugin)
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
Q_IMPORT_QML_PLUGIN(QtQuickEffectsPlugin)
#endif
Q_IMPORT_QML_PLUGIN(QtQmlModelsPlugin)
Q_IMPORT_QML_PLUGIN(QtQmlPlugin)
Q_IMPORT_QML_PLUGIN(QtQmlWorkerScriptPlugin)

19
modules/gui/qt/qt.cpp

@ -855,25 +855,6 @@ static void *Thread( void *obj )
Q_INIT_RESOURCE( qmake_QtQuick_Controls_Basic_impl );
Q_INIT_RESOURCE( qmake_QtQuick_Layouts );
Q_INIT_RESOURCE( qmake_QtQuick_Templates );
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
// Qt Quick Effects:
Q_INIT_RESOURCE( qmake_QtQuick_Effects );
Q_INIT_RESOURCE( effects );
Q_INIT_RESOURCE( multieffect_shaders1 );
Q_INIT_RESOURCE( multieffect_shaders2 );
Q_INIT_RESOURCE( multieffect_shaders3 );
Q_INIT_RESOURCE( multieffect_shaders4 );
Q_INIT_RESOURCE( multieffect_shaders6 );
Q_INIT_RESOURCE( multieffect_shaders8 );
Q_INIT_RESOURCE( multieffect_shaders9 );
Q_INIT_RESOURCE( multieffect_shaders12 );
Q_INIT_RESOURCE( multieffect_shaders14 );
Q_INIT_RESOURCE( multieffect_shaders15 );
Q_INIT_RESOURCE( multieffect_shaders18 );
Q_INIT_RESOURCE( multieffect_shaders20 );
Q_INIT_RESOURCE( multieffect_shaders21 );
Q_INIT_RESOURCE( multieffect_shaders24 );
#endif
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
Q_INIT_RESOURCE( QuickControls2Basic_raw_qml_0 );

Loading…
Cancel
Save