[vlc-commits] [Git][videolan/vlc][master] 15 commits: qt: eliminate obsolete qt version checks in compositor_x11_renderwindow.cpp
Steve Lhomme (@robUx4)
gitlab at videolan.org
Tue May 21 05:51:07 UTC 2024
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
d0d00d61 by Fatih Uzunoglu at 2024-05-21T05:03:37+00:00
qt: eliminate obsolete qt version checks in compositor_x11_renderwindow.cpp
- - - - -
e7ccbf56 by Fatih Uzunoglu at 2024-05-21T05:03:37+00:00
qt: eliminate obsolete qt version check in custom_menus.cpp
- - - - -
c3629b4e by Fatih Uzunoglu at 2024-05-21T05:03:37+00:00
qt: eliminate obsolete qt version check in EPGView.cpp
- - - - -
8fcadd6c by Fatih Uzunoglu at 2024-05-21T05:03:37+00:00
qt: eliminate obsolete qt version checks in extended_panels.cpp
- - - - -
c1fd5834 by Fatih Uzunoglu at 2024-05-21T05:03:37+00:00
qt: remove unused function in mainui.cpp
- - - - -
c19ccc46 by Fatih Uzunoglu at 2024-05-21T05:03:37+00:00
qt: eliminate obsolete qt version check in mlvideogroupsmodel.cpp
- - - - -
3addd08a by Fatih Uzunoglu at 2024-05-21T05:03:37+00:00
qt: eliminate obsolete qt version check in navigation_attached.hpp
- - - - -
f3ce9e9e by Fatih Uzunoglu at 2024-05-21T05:03:37+00:00
qt: eliminate obsolete qt version check in roundimage.cpp
- - - - -
305e1f02 by Fatih Uzunoglu at 2024-05-21T05:03:37+00:00
qt: eliminate obsolete qt version checks in simple_preferences.cpp
- - - - -
f0eb0198 by Fatih Uzunoglu at 2024-05-21T05:03:37+00:00
qt: eliminate obsolete qt version checks in vlm.cpp
- - - - -
78abd6e5 by Fatih Uzunoglu at 2024-05-21T05:03:37+00:00
qt: bump minimum required qt version to 6.2.0 in qt.hpp
- - - - -
9c22de18 by Fatih Uzunoglu at 2024-05-21T05:03:37+00:00
qt: eliminate obsolete qt version check in qt.hpp
- - - - -
c0d03d11 by Fatih Uzunoglu at 2024-05-21T05:03:37+00:00
qt: eliminate obsolete qt version check in interface_window_handler.cpp
- - - - -
ce62d727 by Fatih Uzunoglu at 2024-05-21T05:03:37+00:00
qt: remove QT_CLIENT_SIDE_DECORATION_AVAILABLE
- - - - -
6e448e97 by Fatih Uzunoglu at 2024-05-21T05:03:37+00:00
qml: remove obsolete qt version check in ArtworkInfoWidget.qml
- - - - -
19 changed files:
- modules/gui/qt/dialogs/epg/EPGView.cpp
- modules/gui/qt/dialogs/extended/extended_panels.cpp
- modules/gui/qt/dialogs/firstrun/firstrunwizard.cpp
- modules/gui/qt/dialogs/preferences/simple_preferences.cpp
- modules/gui/qt/dialogs/vlm/vlm.cpp
- modules/gui/qt/maininterface/compositor_x11_renderwindow.cpp
- modules/gui/qt/maininterface/interface_window_handler.cpp
- modules/gui/qt/maininterface/interface_window_handler.hpp
- modules/gui/qt/maininterface/mainctx.cpp
- modules/gui/qt/maininterface/mainctx_win32.cpp
- modules/gui/qt/maininterface/mainctx_win32.hpp
- modules/gui/qt/maininterface/mainui.cpp
- modules/gui/qt/medialibrary/mlvideogroupsmodel.cpp
- modules/gui/qt/menus/custom_menus.cpp
- modules/gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml
- modules/gui/qt/qt.cpp
- modules/gui/qt/qt.hpp
- modules/gui/qt/widgets/native/navigation_attached.hpp
- modules/gui/qt/widgets/native/roundimage.cpp
Changes:
=====================================
modules/gui/qt/dialogs/epg/EPGView.cpp
=====================================
@@ -45,11 +45,7 @@ void EPGGraphicsScene::drawBackground( QPainter *painter, const QRectF &rect)
/* day change */
QDateTime rectstarttime = epgView->startTime().addSecs( rect.left() );
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
QDateTime nextdaylimit = rectstarttime.date().startOfDay();
-#else
- QDateTime nextdaylimit = QDateTime( rectstarttime.date() );
-#endif
QRectF area( rect );
while( area.left() < width() )
=====================================
modules/gui/qt/dialogs/extended/extended_panels.cpp
=====================================
@@ -63,13 +63,7 @@
static bool filterIsPresent( const QString &filters, const QString &filter )
{
- QStringList list = filters.split( ':',
- #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
- Qt::SkipEmptyParts
- #else
- QString::SkipEmptyParts
- #endif
- );
+ QStringList list = filters.split( ':', Qt::SkipEmptyParts );
foreach( const QString &filterCmp, list )
{
@@ -306,13 +300,7 @@ static QString ChangeFiltersString( qt_intf_t *p_intf, const char *psz_filter_ty
char* psz_chain = var_GetString( p_intf, psz_filter_type );
QString const chain = QString( psz_chain ? psz_chain : "" );
- QStringList list = chain.split( ':',
- #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
- Qt::SkipEmptyParts
- #else
- QString::SkipEmptyParts
- #endif
- );
+ QStringList list = chain.split( ':', Qt::SkipEmptyParts );
if( b_add && std::find(list.begin(), list.end(), psz_name) == list.end() )
list << psz_name;
@@ -1004,13 +992,7 @@ QStringList EqualizerSliderData::getBandsFromAout() const
char *psz_bands = var_GetString( p_aout.get(), qtu(p_data->name) );
if ( psz_bands )
{
- bands = QString( psz_bands ).split( " ",
- #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
- Qt::SkipEmptyParts
- #else
- QString::SkipEmptyParts
- #endif
- );
+ bands = QString( psz_bands ).split( " ", Qt::SkipEmptyParts );
free( psz_bands );
}
}
@@ -1025,13 +1007,7 @@ QStringList EqualizerSliderData::getBandsFromAout() const
char *psz_bands = config_GetPsz( qtu(p_data->name) );
if ( psz_bands )
{
- bands = QString( psz_bands ).split( " ",
- #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
- Qt::SkipEmptyParts
- #else
- QString::SkipEmptyParts
- #endif
- );
+ bands = QString( psz_bands ).split( " ", Qt::SkipEmptyParts );
free( psz_bands );
}
=====================================
modules/gui/qt/dialogs/firstrun/firstrunwizard.cpp
=====================================
@@ -137,9 +137,7 @@ void FirstRunWizard::finish()
/* Layout Page settings */
config_PutInt( "qt-menubar", ui.layoutGroup->checkedId() );
-#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
config_PutInt( "qt-titlebar", ui.layoutGroup->checkedId() );
-#endif
config_PutInt( "qt-pin-controls", ui.layoutGroup->checkedId() );
@@ -311,9 +309,7 @@ void FirstRunWizard::reject()
/* Layout Page settings */
config_PutInt( "qt-menubar", 0 );
-#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
config_PutInt( "qt-titlebar", 0 );
-#endif
p_intf->p_mi->setPinVideoControls( 0 );
p_intf->p_mi->controlbarProfileModel()->setSelectedProfileFromId(ControlbarProfileModel::DEFAULT_STYLE);
=====================================
modules/gui/qt/dialogs/preferences/simple_preferences.cpp
=====================================
@@ -599,13 +599,7 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
connect( ui.volNormBox, &QCheckBox::toggled, ui.volNormSpin, &QDoubleSpinBox::setEnabled );
char* psz = config_GetPsz( "audio-filter" );
- qs_filter = qfu( psz ).split( ':',
- #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
- Qt::SkipEmptyParts
- #else
- QString::SkipEmptyParts
- #endif
- );
+ qs_filter = qfu( psz ).split( ':', Qt::SkipEmptyParts );
free( psz );
@@ -794,9 +788,7 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
/*Update layout radio buttons based on the checkState of the following checkboxes*/
connect(ui.menuBarCheck, &QCheckBox::stateChanged, this, &SPrefsPanel::updateLayoutSelection);
connect(ui.pinVideoControlsCheckbox, &QCheckBox::stateChanged, this, &SPrefsPanel::updateLayoutSelection);
-#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
connect(ui.titleBarCheckBox, &QCheckBox::stateChanged, this, &SPrefsPanel::updateLayoutSelection);
-#endif
/*Clicking on image will check the corresponding layout radio button*/
layoutImages = new QButtonGroup( this );
@@ -807,13 +799,8 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
connect( layoutImages, qOverload<QAbstractButton*>( &QButtonGroup::buttonClicked ), this, &SPrefsPanel::imageLayoutClick );
/* Set checkboxes depending on the layout selected*/
-#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
connect(radioGroup, &QButtonGroup::idClicked, this, &SPrefsPanel::handleLayoutChange);
connect(layoutImages, &QButtonGroup::idClicked, this, &SPrefsPanel::handleLayoutChange);
-#else
- connect(radioGroup, QOverload<int>::of(&QButtonGroup::buttonClicked), this, &SPrefsPanel::handleLayoutChange);
- connect(layoutImages, QOverload<int>::of(&QButtonGroup::buttonClicked), this, &SPrefsPanel::handleLayoutChange);
-#endif
configBool( "embedded-video", ui.embedVideo );
configBool( "qt-video-autoresize", ui.resizingBox );
@@ -884,11 +871,7 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
QObject::connect( ui.toolbarEditor, &QAbstractButton::clicked, provider, &DialogsProvider::showToolbarEditorDialog);
-#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
configBool( "qt-titlebar", ui.titleBarCheckBox );
-#else
- ui.titleBarCheckBox->hide();
-#endif
/* UPDATE options */
#ifdef UPDATE_CHECK
@@ -1156,18 +1139,14 @@ void SPrefsPanel::handleLayoutChange( int id )
// Modern layout selected
ui.styleStackedWidget->setCurrentIndex(0);
ui.menuBarCheck->setChecked(false);
-#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
ui.titleBarCheckBox->setChecked(false);
-#endif
ui.pinVideoControlsCheckbox->setChecked(false);
}
else if (id == 1) {
// Classic layout selected
ui.styleStackedWidget->setCurrentIndex(0);
ui.menuBarCheck->setChecked(true);
-#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
ui.titleBarCheckBox->setChecked(true);
-#endif
ui.pinVideoControlsCheckbox->setChecked(true);
}
else if (id == 2) {
@@ -1179,17 +1158,13 @@ void SPrefsPanel::updateLayoutSelection()
{
auto ui = m_interfaceUI;
bool isModern = !ui.menuBarCheck->isChecked()
-#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
&& !ui.titleBarCheckBox->isChecked()
-#endif
&& !ui.pinVideoControlsCheckbox->isChecked();
ui.modernButton->setChecked(isModern);
bool isClassic = ui.menuBarCheck->isChecked()
-#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
&& ui.titleBarCheckBox->isChecked()
-#endif
&& ui.pinVideoControlsCheckbox->isChecked();
ui.classicButton->setChecked(isClassic);
=====================================
modules/gui/qt/dialogs/vlm/vlm.cpp
=====================================
@@ -637,13 +637,7 @@ void VLMWrapper::EditBroadcast( const QString& name, const QString& input,
vlm_ExecuteCommand( p_vlm, qtu( command ), &message );
vlm_MessageDelete( message );
- QStringList options = inputOptions.split( " :",
- #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
- Qt::SkipEmptyParts
- #else
- QString::SkipEmptyParts
- #endif
- );
+ QStringList options = inputOptions.split( " :", Qt::SkipEmptyParts );
for( int i = 0; i < options.count(); i++ )
{
@@ -735,13 +729,7 @@ void VLMWrapper::EditSchedule( const QString& name, const QString& input,
vlm_ExecuteCommand( p_vlm, qtu( command ), &message );
vlm_MessageDelete( message );
- QStringList options = inputOptions.split( " :",
- #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
- Qt::SkipEmptyParts
- #else
- QString::SkipEmptyParts
- #endif
- );
+ QStringList options = inputOptions.split( " :", Qt::SkipEmptyParts );
for( int i = 0; i < options.count(); i++ )
{
command = "setup \"" + name + "\" option \"" + options[i].trimmed() + "\"";
=====================================
modules/gui/qt/maininterface/compositor_x11_renderwindow.cpp
=====================================
@@ -285,25 +285,19 @@ bool X11DamageObserver::init()
return true;
}
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
//can't use QOverload with private signals
template<class T>
static auto privateOverload(void (QSocketNotifier::* s)( QSocketDescriptor,QSocketNotifier::Type, T) )
{
return s;
}
-#endif
void X11DamageObserver::start()
{
//listen to the x11 socket instead of blocking
m_socketNotifier = new QSocketNotifier(m_connFd, QSocketNotifier::Read, this);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
connect(m_socketNotifier, privateOverload(&QSocketNotifier::activated),
this, &X11DamageObserver::onEvent);
-#else
- connect(m_socketNotifier, &QSocketNotifier::activated, this, &X11DamageObserver::onEvent);
-#endif
}
bool X11DamageObserver::onRegisterSurfaceDamage(unsigned int wid)
=====================================
modules/gui/qt/maininterface/interface_window_handler.cpp
=====================================
@@ -118,10 +118,8 @@ InterfaceWindowHandler::InterfaceWindowHandler(qt_intf_t *_p_intf, MainCtx* main
connect(this, &InterfaceWindowHandler::incrementIntfUserScaleFactor,
m_mainCtx, &MainCtx::incrementIntfUserScaleFactor);
-#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
connect( m_mainCtx, &MainCtx::useClientSideDecorationChanged,
this, &InterfaceWindowHandler::updateCSDWindowSettings );
-#endif
connect(m_mainCtx, &MainCtx::requestInterfaceMaximized,
this, &InterfaceWindowHandler::setInterfaceMaximized);
@@ -144,14 +142,12 @@ InterfaceWindowHandler::~InterfaceWindowHandler()
QVLCTools::saveWindowPosition(getSettings(), m_window);
}
-#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
void InterfaceWindowHandler::updateCSDWindowSettings()
{
m_window->hide(); // some window managers don't like to change frame window hint on visible window
m_window->setFlag(Qt::FramelessWindowHint, m_mainCtx->useClientSideDecoration());
m_window->show();
}
-#endif
bool InterfaceWindowHandler::eventFilter(QObject*, QEvent* event)
{
@@ -225,11 +221,7 @@ bool InterfaceWindowHandler::eventFilter(QObject*, QEvent* event)
QWheelEvent* wheelEvent = static_cast<QWheelEvent*>(event);
if (wheelEvent->modifiers() == Qt::ControlModifier)
{
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
emit incrementIntfUserScaleFactor(wheelEvent->angleDelta().y() > 0);
-#else
- emit incrementIntfUserScaleFactor(wheelEvent->delta() > 0);
-#endif
wheelEvent->accept();
return true;
}
=====================================
modules/gui/qt/maininterface/interface_window_handler.hpp
=====================================
@@ -64,9 +64,7 @@ signals:
private:
bool applyKeyEvent(QKeyEvent * event) const;
-#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
virtual void updateCSDWindowSettings();
-#endif
protected:
qt_intf_t* p_intf = nullptr;
=====================================
modules/gui/qt/maininterface/mainctx.cpp
=====================================
@@ -341,9 +341,7 @@ void MainCtx::loadPrefs(const bool callSignals)
loadFromVLCOption(m_hasToolbarMenu, "qt-menubar", &MainCtx::hasToolbarMenuChanged);
-#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
loadFromVLCOption(m_windowTitlebar, "qt-titlebar" , &MainCtx::useClientSideDecorationChanged);
-#endif
loadFromVLCOption(m_smoothScroll, "qt-smooth-scrolling", &MainCtx::smoothScrollChanged);
=====================================
modules/gui/qt/maininterface/mainctx_win32.cpp
=====================================
@@ -797,11 +797,7 @@ void MainCtxWin32::reloadPrefs()
InterfaceWindowHandlerWin32::InterfaceWindowHandlerWin32(qt_intf_t *_p_intf, MainCtx* mainCtx, QWindow* window, QObject *parent)
: InterfaceWindowHandler(_p_intf, mainCtx, window, parent)
-
-#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
, m_CSDWindowEventHandler(new CSDWin32EventHandler(mainCtx, window, window))
-#endif
-
{
auto systemMenuButton = std::make_shared<WinSystemMenuButton>(mainCtx->intfMainWindow(), nullptr);
mainCtx->csdButtonModel()->setSystemMenuButton(systemMenuButton);
@@ -984,9 +980,7 @@ bool InterfaceWindowHandlerWin32::eventFilter(QObject* obj, QEvent* ev)
-#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
void InterfaceWindowHandlerWin32::updateCSDWindowSettings()
{
static_cast<CSDWin32EventHandler *>(m_CSDWindowEventHandler)->setUseClientSideDecoration(m_mainCtx->useClientSideDecoration());
}
-#endif
=====================================
modules/gui/qt/maininterface/mainctx_win32.hpp
=====================================
@@ -80,10 +80,8 @@ protected:
bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
private:
-#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
void updateCSDWindowSettings() override;
QObject *m_CSDWindowEventHandler {};
-#endif
};
#endif // MAIN_INTERFACE_WIN32_HPP
=====================================
modules/gui/qt/maininterface/mainui.cpp
=====================================
@@ -102,18 +102,6 @@ public:
template<class T>
QPointer<T> SingletonRegisterHelper<T>::m_instance = nullptr;
-template<class T>
-void registerAnonymousType( const char *uri, int versionMajor )
-{
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
- qmlRegisterAnonymousType<T>( uri, versionMajor );
-#else
- qmlRegisterType<T>();
- VLC_UNUSED( uri );
- VLC_UNUSED( versionMajor );
-#endif
-}
-
} // anonymous namespace
=====================================
modules/gui/qt/medialibrary/mlvideogroupsmodel.cpp
=====================================
@@ -73,12 +73,7 @@ QHash<int, QByteArray> MLVideoGroupsModel::roleNames() const /* override */
{GROUP_COUNT, "count"},
};
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
- for (auto i = groupRoles.begin(); i != groupRoles.end(); ++i)
- hash.insert(i.key(), i.value());
-#else
hash.insert(groupRoles);
-#endif
return hash;
}
=====================================
modules/gui/qt/menus/custom_menus.cpp
=====================================
@@ -221,11 +221,7 @@ CheckableListMenu::CheckableListMenu(QString title, QAbstractListModel* model ,
m_actionGroup = new QActionGroup(this);
if (m_grouping == GROUPED_OPTIONAL)
{
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
m_actionGroup->setExclusionPolicy(QActionGroup::ExclusionPolicy::ExclusiveOptional);
-#else
- m_actionGroup->setExclusive(false);
-#endif
}
}
=====================================
modules/gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml
=====================================
@@ -164,7 +164,6 @@ AbstractButton {
Layout.fillHeight: true
Binding on visible {
- delayed: (MainCtx.qtVersion() < MainCtx.qtVersionCheck(5, 15, 8))
value: (infoColumn.height > infoColumn.implicitHeight) && (artistLabel.text.length > 0)
}
=====================================
modules/gui/qt/qt.cpp
=====================================
@@ -367,7 +367,6 @@ vlc_module_begin ()
QT_DISABLE_VOLUME_KEYS_LONGTEXT /* longtext */)
#endif
-#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
add_bool( "qt-titlebar",
#ifdef _WIN32
false /* use CSD by default on windows */,
@@ -375,7 +374,6 @@ vlc_module_begin ()
true /* but not on linux */,
#endif
QT_CLIENT_SIDE_DECORATION_TEXT, QT_CLIENT_SIDE_DECORATION_LONGTEXT )
-#endif
add_bool( "qt-menubar", false, QT_MENUBAR_TEXT, QT_MENUBAR_LONGTEXT )
=====================================
modules/gui/qt/qt.hpp
=====================================
@@ -39,18 +39,12 @@
#define QT_NO_CAST_TO_ASCII
#include <QString>
-static_assert (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0),
- "Update your Qt version to at least 5.12.0");
-
-#if ( QT_VERSION < QT_VERSION_CHECK(5, 15, 0) )
-# define QSIGNALMAPPER_MAPPEDINT_SIGNAL QOverload<int>::of(&QSignalMapper::mapped)
-# define QSIGNALMAPPER_MAPPEDSTR_SIGNAL QOverload<const QString &>::of(&QSignalMapper::mapped)
-# define QSIGNALMAPPER_MAPPEDOBJ_SIGNAL QOverload<QObject *>::of(&QSignalMapper::mapped)
-#else
+static_assert (QT_VERSION >= QT_VERSION_CHECK(6, 2, 0),
+ "Update your Qt version to at least 6.2.0");
+
# define QSIGNALMAPPER_MAPPEDINT_SIGNAL &QSignalMapper::mappedInt
# define QSIGNALMAPPER_MAPPEDSTR_SIGNAL &QSignalMapper::mappedString
# define QSIGNALMAPPER_MAPPEDOBJ_SIGNAL &QSignalMapper::mappedObject
-#endif
enum {
@@ -167,6 +161,4 @@ static inline QString QVLCUserDir( vlc_userdir_t type )
*/
#define QT_XMAS_JOKE_DAY 354
-#define QT_CLIENT_SIDE_DECORATION_AVAILABLE (QT_VERSION >= QT_VERSION_CHECK(5,15,0))
-
#endif
=====================================
modules/gui/qt/widgets/native/navigation_attached.hpp
=====================================
@@ -52,11 +52,9 @@ class NavigationAttached : public QObject
VLC_QT_SIMPLE_PROPERTY(QQuickItem*, cancelItem, nullptr)
VLC_QT_SIMPLE_PROPERTY(QJSValue, cancelAction, QJSValue::UndefinedValue)
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
QML_NAMED_ELEMENT(Navigation)
QML_UNCREATABLE("Navigation is only available via attached properties.")
QML_ATTACHED(NavigationAttached)
-#endif
public:
explicit NavigationAttached(QObject *parent = nullptr);
=====================================
modules/gui/qt/widgets/native/roundimage.cpp
=====================================
@@ -641,7 +641,6 @@ void RoundImage::adjustQSGCustomGeometry(const QQuickWindow* const window)
}
else
{
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
// QSG(Opaque)TextureMaterial supports Qt RHI,
// so there is no obstacle using custom geometry
// if Qt RHI is in use.
@@ -649,11 +648,5 @@ void RoundImage::adjustQSGCustomGeometry(const QQuickWindow* const window)
enableCustomGeometry();
else
disableCustomGeometry();
-#else
- // Qt RHI is introduced in Qt 5.14.
- // QSG(Opaque)TextureMaterial does not support any graphics API other than OpenGL
- // without the Qt RHI abstraction layer.
- disableCustomGeometry();
-#endif
}
}
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a717ae5d428eee88576c2dd77d60e7f97fbd9341...6e448e9709ad139eb074706b83ab01c7bcccbb84
--
This project does not include diff previews in email notifications.
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a717ae5d428eee88576c2dd77d60e7f97fbd9341...6e448e9709ad139eb074706b83ab01c7bcccbb84
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list