[vlc-commits] [Git][videolan/vlc][master] 2 commits: qt: define QT_NO_CAST_TO_ASCII in build system

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
5380f935 by Fatih Uzunoglu at 2024-11-01T11:28:53+00:00
qt: define QT_NO_CAST_TO_ASCII in build system

- - - - -
adad43f8 by Fatih Uzunoglu at 2024-11-01T11:28:53+00:00
qt: remove qt version check in qt.hpp

The build system already checks the version, repeating
the check here makes it easy to forget updating it.

- - - - -


3 changed files:

- modules/gui/qt/Makefile.am
- modules/gui/qt/meson.build
- modules/gui/qt/qt.hpp


Changes:

=====================================
modules/gui/qt/Makefile.am
=====================================
@@ -28,6 +28,7 @@ vlc_qt_check_LDFLAGS = $(AM_LDFLAGS) $(QT_LDFLAGS)
 libqt_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_qt) \
 	-DQT_STRICT_ITERATORS \
 	-DQT_USE_QSTRINGBUILDER \
+	-DQT_NO_CAST_TO_ASCII \
 	-I$(srcdir) -I$(builddir) \
 	-I$(builddir)/dialogs/extended \
 	-I$(builddir)/dialogs/fingerprint \


=====================================
modules/gui/qt/meson.build
=====================================
@@ -7,7 +7,7 @@ qt6 = import('qt6')
 qt_include_dir = include_directories('.')
 
 qt_extra_deps = []
-qt_extra_flags = ['-DQT_STRICT_ITERATORS','-DQT_USE_QSTRINGBUILDER']
+qt_extra_flags = ['-DQT_STRICT_ITERATORS','-DQT_USE_QSTRINGBUILDER','-DQT_NO_CAST_TO_ASCII']
 qt_cppargs = []
 qt_link_args = []
 


=====================================
modules/gui/qt/qt.hpp
=====================================
@@ -36,12 +36,8 @@
 
 #include <qconfig.h>
 
-#define QT_NO_CAST_TO_ASCII
 #include <QString>
 
-static_assert (QT_VERSION >= QT_VERSION_CHECK(6, 2, 0),
-               "Update your Qt version to at least 6.2.0");
-
 enum {
     IMEventTypeOffset     = 0,
     MsgEventTypeOffset    = 100



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a49d195d564471487147c21e25c9dbcc76a8b433...adad43f898a6625a3b5883860c46ca98dc586ca1

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


VideoLAN code repository instance