[vlc-commits] [Git][videolan/vlc][master] 2 commits: qt: do not use HAVE_QT_WAYLAND

Steve Lhomme (@robUx4) gitlab at videolan.org
Tue Jun 4 11:14:46 UTC 2024



Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
9f6afa36 by Fatih Uzunoglu at 2024-06-04T10:47:15+00:00
qt: do not use HAVE_QT_WAYLAND

- - - - -
d1e64ef2 by Fatih Uzunoglu at 2024-06-04T10:47:15+00:00
Revert "configure: detect private Qt6 Wayland Client using qmake"

This reverts commit e5546bc02dcff257dc31fbf6c5a55f3c8fad6042.

- - - - -


7 changed files:

- configure.ac
- modules/gui/qt/Makefile.am
- modules/gui/qt/maininterface/mainctx.cpp
- modules/gui/qt/maininterface/mainctx.hpp
- modules/gui/qt/maininterface/video_window_handler.cpp
- modules/gui/qt/maininterface/video_window_handler.hpp
- − modules/gui/qt/wayland.pro


Changes:

=====================================
configure.ac
=====================================
@@ -4048,25 +4048,6 @@ AS_IF([test "${enable_qt}" != "no"], [
       AC_SUBST([QT_CFLAGS])
       AC_SUBST([QT_LDFLAGS])
 
-      AC_MSG_CHECKING([for Qt6WaylandClient])
-      (${QMAKE} ${srcdir}/modules/gui/qt/wayland.pro -o ${ac_pwd}/modules/gui/qt/qmake-wayland) 2>/dev/null
-      ac_status=$?
-      AS_IF([test $ac_status = 0 && test -f ${ac_pwd}/modules/gui/qt/qmake-wayland],[
-        echo "include ${ac_pwd}/modules/gui/qt/qmake-common.mk"  >> ${ac_pwd}/modules/gui/qt/qmake-wayland
-
-        AC_MSG_RESULT([yes])
-        QT_WAYLAND_LIBS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-wayland get_libs)
-        QT_WAYLAND_CFLAGS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-wayland get_cflags)
-        QT_WAYLAND_LDFLAGS=$(cd ${ac_pwd}/modules/gui/qt && make -s -f qmake-wayland get_ldflags)
-        AC_SUBST([QT_WAYLAND_LIBS])
-        AC_SUBST([QT_WAYLAND_CFLAGS])
-        AC_SUBST([QT_WAYLAND_LDFLAGS])
-        have_qt_wayland="yes"
-      ],[
-        AC_MSG_RESULT([no])
-      ])
-      rm -f ${ac_pwd}/modules/gui/qt/qmake-wayland
-
       QT_LIBEXEC_DIRECTORY="$(${QT_PATHS}     -query QT_HOST_LIBEXECS 2>/dev/null)"
       QT_QML_LIBEXEC_DIRECTORY=${QT_LIBEXEC_DIRECTORY}
       QT_SHADERTOOLS_BIN_DIRECTORY=${QT_BIN_DIRECTORY}
@@ -4225,7 +4206,6 @@ AS_IF([test "${enable_qt}" != "no"], [
 ])
 AC_SUBST([QT_INDIRECT_LIBS])
 AM_CONDITIONAL([ENABLE_QT], [test "$enable_qt" != "no"])
-AM_CONDITIONAL([HAVE_QT_WAYLAND], [test "${have_qt_wayland}" = "yes"])
 AM_CONDITIONAL([HAVE_QT_GTK], [test "${have_qt_gtk}" = "yes"])
 AM_CONDITIONAL([HAVE_QT_QUICK_TEST], [test "${have_qt_quick_test}" = "yes"])
 AM_CONDITIONAL([HAVE_QT_DECLARATIVE_PRIVATE], [test "${have_qt_declarative_private}" = "yes"])


=====================================
modules/gui/qt/Makefile.am
=====================================
@@ -16,8 +16,7 @@ guidir = $(pluginsdir)/gui
 gui_LTLIBRARIES =
 SUFFIXES += .ui .h .hpp .moc.cpp .qml
 TEST_EXTENSIONS = .qml
-EXTRA_DIST = qt6.pro private-core.pro private-gui.pro private-quick.pro quicktest.pro wayland.pro
-
+EXTRA_DIST = qt6.pro private-core.pro private-gui.pro private-quick.pro quicktest.pro
 vlc_qt_libs = $(QT_LIBS)
 
 vlc_qt_check_SOURCES = vlc-qt-check.cpp plugins.hpp
@@ -55,15 +54,6 @@ vlc_qt_check_CXXFLAGS += $(XCB_CFLAGS) -DQT_HAS_X11
 endif
 endif
 
-if HAVE_QT_WAYLAND
-libqt_plugin_la_CPPFLAGS += $(QT_WAYLAND_CFLAGS)
-libqt_plugin_la_LIBADD += $(QT_WAYLAND_LIBS)
-libqt_plugin_la_LDFLAGS += $(QT_WAYLAND_LDFLAGS)
-vlc_qt_check_CPPFLAGS += $(QT_WAYLAND_CFLAGS) -DQT_HAS_WAYLAND
-vlc_qt_check_LDADD += $(QT_WAYLAND_LIBS)
-vlc_qt_check_LDFLAGS += $(QT_WAYLAND_LDFLAGS)
-endif
-
 if HAVE_WIN32
 libqt_plugin_la_CXXFLAGS += $(LIBCOMCXXFLAGS)
 libqt_plugin_la_LIBADD += $(LIBCOM) -lcomctl32 -luuid -ldwmapi
@@ -576,7 +566,6 @@ endif
 # wayland compositor
 
 if HAVE_WAYLAND
-if HAVE_QT_WAYLAND
 if HAVE_QT_GUI_PRIVATE
 
 libqt_plugin_la_CPPFLAGS += -DQT_HAS_WAYLAND_COMPOSITOR
@@ -599,7 +588,6 @@ if ENABLE_QT
 gui_LTLIBRARIES += libqt_wayland_plugin.la
 endif
 
-endif
 endif
 endif
 


=====================================
modules/gui/qt/maininterface/mainctx.cpp
=====================================
@@ -164,9 +164,7 @@ MainCtx::MainCtx(qt_intf_t *_p_intf)
 
     QString platformName = QGuiApplication::platformName();
 
-#ifdef QT_HAS_WAYLAND
     b_hasWayland = platformName.startsWith(QLatin1String("wayland"), Qt::CaseInsensitive);
-#endif
 
     /*********************************
      * Create the Systray Management *


=====================================
modules/gui/qt/maininterface/mainctx.hpp
=====================================
@@ -303,9 +303,7 @@ protected:
     bool                 b_playlistDocked = false;
     QWindow::Visibility  m_windowVisibility = QWindow::Windowed;
     bool                 b_interfaceOnTop = false;      ///keep UI on top
-#ifdef QT_HAS_WAYLAND
     bool                 b_hasWayland = false;
-#endif
     bool                 b_hasMedialibrary = false;
     MediaLib*            m_medialib = nullptr;
     bool                 m_gridView = false;


=====================================
modules/gui/qt/maininterface/video_window_handler.cpp
=====================================
@@ -128,11 +128,8 @@ void VideoWindowHandler::setVideoFullScreen( bool fs )
         {
             QRect screenres = screenList[numscreen]->geometry();
             m_lastWinScreen = m_window->screen();
-#ifdef QT_HAS_WAYLAND
             if( !m_hasWayland )
                 m_window->setScreen(screenList[numscreen]);
-#endif
-            m_window->setScreen(screenList[numscreen]);
 
             /* To be sure window is on proper-screen in xinerama */
             if( !screenres.contains( m_window->position() ) )
@@ -146,13 +143,8 @@ void VideoWindowHandler::setVideoFullScreen( bool fs )
     {
         bool hold = WindowStateHolder::holdFullscreen(m_window,  WindowStateHolder::VIDEO, false);
 
-#ifdef QT_HAS_WAYLAND
         if( m_lastWinScreen != NULL && !m_hasWayland )
             m_window->setScreen(m_lastWinScreen);
-#else
-        if( m_lastWinScreen != NULL )
-            m_window->setScreen(m_lastWinScreen);
-#endif
         if( !hold && m_lastWinGeometry.isNull() == false )
         {
             m_window->setGeometry( m_lastWinGeometry );


=====================================
modules/gui/qt/maininterface/video_window_handler.hpp
=====================================
@@ -68,9 +68,7 @@ private:
     QRect   m_lastWinGeometry;
     QScreen* m_lastWinScreen = nullptr;
 
-#ifdef QT_HAS_WAYLAND
     bool m_hasWayland = false;
-#endif
 };
 
 #endif // VIDEOWINDOWHANDLER_HPP


=====================================
modules/gui/qt/wayland.pro deleted
=====================================
@@ -1,4 +0,0 @@
-QT = waylandcompositor
-CONFIG += wayland-scanner
-CONFIG -= debug_and_release
-CONFIG += no_include_pwd



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d7d6e1801e556fdfc651b721f6652604bc93ec4e...d1e64ef25f4b603c082c52503d43ba3b2e8c4651

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d7d6e1801e556fdfc651b721f6652604bc93ec4e...d1e64ef25f4b603c082c52503d43ba3b2e8c4651
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