pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix qt6 feature checks in libmpv (#1612)

Browse source 
Fix Qt6 feature checks to ensure the `QT_CONFIG` macro rather than
incorrectly checking for the definitions.  `QT_FEATURE_*` are always
defined, and they take values 1 or -1 to indicate whether the feature
is present or not.  The `QT_CONFIG` macro wraps checking for that, see:
https://code.qt.io/cgit/qt/qtbase.git/tree/src/corelib/global/qtconfigmacros.h?id=f9163ae7a8167daded0798654d99a2e3a5aaa2b5#n60

This fixes build failure when qtbase is built without Wayland support:

```
/tmp/portage/net-news/rssguard-4.8.1/work/rssguard-4.8.1/src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.cpp: In member function ‘v
irtual void LibMpvWidget::initializeGL()’:
/tmp/portage/net-news/rssguard-4.8.1/work/rssguard-4.8.1/src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.cpp:123:60: error: ‘QWayla
ndApplication’ is not a member of ‘QNativeInterface’; did you mean ‘QX11Application’?
  123 |     display.data = qApp->nativeInterface<QNativeInterface::QWaylandApplication>()->display();
      |                                                            ^~~~~~~~~~~~~~~~~~~
      |                                                            QX11Application
/tmp/portage/net-news/rssguard-4.8.1/work/rssguard-4.8.1/src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.cpp:123:80: error: no matc
hing function for call to ‘Application::nativeInterface<<expression error> >()’
  123 |     display.data = qApp->nativeInterface<QNativeInterface::QWaylandApplication>()->display();
In file included from /usr/include/qt6/QtCore/qcoreapplication.h:17,
                 from /usr/include/qt6/QtCore/QCoreApplication:1,
                 from /tmp/portage/net-news/rssguard-4.8.1/work/rssguard-4.8.1/src/librssguard/miscellaneous/iofactory.h:8,
                 from /tmp/portage/net-news/rssguard-4.8.1/work/rssguard-4.8.1/src/librssguard/miscellaneous/application.h:11,
                 from /tmp/portage/net-news/rssguard-4.8.1/work/rssguard-4.8.1/src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.cpp:
5:
/usr/include/qt6/QtWidgets/qapplication.h:125:5: note: candidate: ‘template<class NativeInterface, class TypeInfo, class BaseType, typename std::enable_if<TypeInfo::isCompatibleWith<QApplication>, bool>::type <anonymous> > NativeInterface* QApplication::nativeInterface() const’
  125 |     QT_DECLARE_NATIVE_INTERFACE_ACCESSOR(QApplication)
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/include/qt6/QtWidgets/qapplication.h:125:5: note:   template argument deduction/substitution failed:
/tmp/portage/net-news/rssguard-4.8.1/work/rssguard-4.8.1/src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.cpp:123:80: error: templat
e argument 1 is invalid
```

Originally reported in https://bugs.gentoo.org/948473.
This commit is contained in:
Michał Górny 2025-01-25 13:29:21 +01:00 • committed by GitHub
parent c88b609463
commit 12ac668869
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.cpp
View file

@ -110,14 +110,14 @@ void LibMpvWidget::initializeGL() {
mpv_render_param display{MPV_RENDER_PARAM_INVALID, nullptr}; mpv_render_param display{MPV_RENDER_PARAM_INVALID, nullptr};
#if QT_VERSION_MAJOR == 6 && defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) && !defined(Q_OS_ANDROID) #if QT_VERSION_MAJOR == 6 && defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) && !defined(Q_OS_ANDROID)
#if defined(QT_FEATURE_xcb) #if QT_CONFIG(xcb)
if (QGuiApplication::platformName() == QStringLiteral("xcb")) { if (QGuiApplication::platformName() == QStringLiteral("xcb")) {
display.type = MPV_RENDER_PARAM_X11_DISPLAY; display.type = MPV_RENDER_PARAM_X11_DISPLAY;
display.data = qApp->nativeInterface<QNativeInterface::QX11Application>()->display(); display.data = qApp->nativeInterface<QNativeInterface::QX11Application>()->display();
} }
#endif #endif
#if defined(QT_FEATURE_wayland) #if QT_CONFIG(wayland)
if (qApp->isWayland()) { if (qApp->isWayland()) {
display.type = MPV_RENDER_PARAM_WL_DISPLAY; display.type = MPV_RENDER_PARAM_WL_DISPLAY;
display.data = qApp->nativeInterface<QNativeInterface::QWaylandApplication>()->display(); display.data = qApp->nativeInterface<QNativeInterface::QWaylandApplication>()->display();