[vlc-commits] [Git][videolan/vlc][master] 3 commits: qt: always define private platform header

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
bf43ffde by Johannes Kauffmann at 2022-10-21T05:34:01+00:00
qt: always define private platform header

This header is also used on win32.

- - - - -
3e8b5fb2 by Johannes Kauffmann at 2022-10-21T05:34:01+00:00
qt: maininterface: use private header define

This wil allow removing some sed hacks in contribs, and removes the
dependency on contribs for making sure that the private header directory
is added to the -I flags on win32.

- - - - -
f96b7f63 by Johannes Kauffmann at 2022-10-21T05:34:01+00:00
contrib: qt: remove sed hack for private header

Since the Qt version is now handled in the build system proper, this is
no longer needed.

- - - - -


5 changed files:

- contrib/src/qt/rules.mak
- modules/gui/qt/Makefile.am
- modules/gui/qt/maininterface/compositor_dcomp.cpp
- modules/gui/qt/maininterface/compositor_dcomp_uisurface.cpp
- modules/gui/qt/maininterface/mainctx_win32.cpp


Changes:

=====================================
contrib/src/qt/rules.mak
=====================================
@@ -165,8 +165,8 @@ qmake_toolchain = echo "!host_build {"    > $(1)/.qmake.cache && \
 		sub-styles-install_subtargets
 
 ifdef HAVE_WIN32
-	# Add the private include to our project (similar to using "gui-private" in a qmake project) as well as ANGLE headers
-	sed -i.orig -e 's#-I$${includedir}/QtGui#-I$${includedir}/QtGui -I$${includedir}/QtGui/$(QT_VERSION)/QtGui -I$${includedir}/QtANGLE#' $(PREFIX)/lib/pkgconfig/Qt5Gui.pc
+	# Add the ANGLE headers to our project
+	sed -i.orig -e 's#-I$${includedir}/QtGui#-I$${includedir}/QtGui -I$${includedir}/QtANGLE#' $(PREFIX)/lib/pkgconfig/Qt5Gui.pc
 endif
 
 	#fix host tools headers to avoid collusion with target headers


=====================================
modules/gui/qt/Makefile.am
=====================================
@@ -29,7 +29,8 @@ libqt_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(builddir)/gui/qt/dialogs/podcast \
 	-I$(builddir)/gui/qt/dialogs/preferences \
 	-I$(builddir)/gui/qt/dialogs/sout \
-	-I$(builddir)/gui/qt/dialogs/vlm
+	-I$(builddir)/gui/qt/dialogs/vlm \
+	-DQPNI_HEADER=\<$(QT_VERSION)/QtGui/qpa/qplatformnativeinterface.h\>
 
 libqt_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) $(CXXFLAGS_qt)
 libqt_plugin_la_LIBADD = $(QT_LIBS) $(LIBS_qt) $(LIBM) \
@@ -57,8 +58,7 @@ endif
 endif
 
 if HAVE_WAYLAND
-libqt_plugin_la_CPPFLAGS += -DQT5_HAS_WAYLAND \
-	-DQPNI_HEADER=\<$(QT_VERSION)/QtGui/qpa/qplatformnativeinterface.h\>
+libqt_plugin_la_CPPFLAGS += -DQT5_HAS_WAYLAND
 libqt_plugin_la_CXXFLAGS += $(WAYLAND_CLIENT_CFLAGS)
 libqt_plugin_la_LIBADD += $(WAYLAND_CLIENT_LIBS)
 endif


=====================================
modules/gui/qt/maininterface/compositor_dcomp.cpp
=====================================
@@ -36,7 +36,7 @@
 #include <QOpenGLFramebufferObject>
 #include <QOpenGLExtraFunctions>
 
-#include <qpa/qplatformnativeinterface.h>
+#include QPNI_HEADER
 #include "compositor_dcomp_error.hpp"
 #include "maininterface/interface_window_handler.hpp"
 


=====================================
modules/gui/qt/maininterface/compositor_dcomp_uisurface.cpp
=====================================
@@ -27,7 +27,7 @@
 #include <QQmlEngine>
 #include <QQuickItem>
 
-#include <qpa/qplatformnativeinterface.h>
+#include QPNI_HEADER
 
 #include <d3d11_1.h>
 #include <d3dcompiler.h>


=====================================
modules/gui/qt/maininterface/mainctx_win32.cpp
=====================================
@@ -38,7 +38,7 @@
 #include <assert.h>
 
 #include <QWindow>
-#include <qpa/qplatformnativeinterface.h>
+#include QPNI_HEADER
 
 #include <dwmapi.h>
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8c7ce5361fe15b7cbe7c55fc9303569478a0d270...f96b7f6326150aa38118e092e5959e62561d490b

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8c7ce5361fe15b7cbe7c55fc9303569478a0d270...f96b7f6326150aa38118e092e5959e62561d490b
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance