avmedia/source/qt6/QtPlayer.cxx | 4 ++++ vcl/inc/qt5/QtAccessibleWidget.hxx | 2 ++ vcl/inc/qt5/QtDragAndDrop.hxx | 2 ++ vcl/inc/qt5/QtFilePicker.hxx | 2 ++ vcl/inc/qt5/QtInstance.hxx | 2 ++ 5 files changed, 12 insertions(+)
New commits: commit a9a52f59f240bde6918dde6f2b444a46f5e1a9b2 Author: Stephan Bergmann <[email protected]> AuthorDate: Thu Aug 14 10:15:21 2025 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Thu Aug 14 12:25:18 2025 +0200 Silence some -Werror,-Wdeprecated-declarations in Qt6 include files > In file included from core/avmedia/source/qt6/QtPlayer.cxx:12: > In file included from /usr/include/qt6/QtCore/QCoreApplication:1: > In file included from /usr/include/qt6/QtCore/qcoreapplication.h:7: > In file included from /usr/include/qt6/QtCore/qglobal.h:45: > /usr/include/qt6/QtCore/qtypeinfo.h:56:27: error: 'is_trivial_v<QMediaPlayer::MediaStatus>' is deprecated: use 'is_trivially_default_constructible_v && is_trivially_copyable_v' instead [-Werror,-Wdeprecated-declarations] > 56 | isComplex = !std::is_trivial_v<T>, > | ^ [...] > /usr/lib/gcc/x86_64-redhat-linux/15/../../../../include/c++/15/type_traits:3530:3: note: 'is_trivial_v<QMediaPlayer::MediaStatus>' has been explicitly marked deprecated here > 3530 | _GLIBCXX26_DEPRECATED_SUGGEST("is_trivially_default_constructible_v && is_trivially_copyable_v") > | ^ etc. on Fedora 42 and --with-latest-c++ Change-Id: I566d1c3d514fe4c366ac81a844afec0822cc5815 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189571 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/avmedia/source/qt6/QtPlayer.cxx b/avmedia/source/qt6/QtPlayer.cxx index b14d8cd3a52a..78ff33ca074b 100644 --- a/avmedia/source/qt6/QtPlayer.cxx +++ b/avmedia/source/qt6/QtPlayer.cxx @@ -9,7 +9,11 @@ #include <sal/config.h> +#include <sal/types.h> + +SAL_WNODEPRECATED_DECLARATIONS_PUSH #include <QtCore/QCoreApplication> +SAL_WNODEPRECATED_DECLARATIONS_POP #include <QtCore/QUrl> #include <QtMultimedia/QAudioOutput> #include <QtMultimedia/QMediaMetaData> diff --git a/vcl/inc/qt5/QtAccessibleWidget.hxx b/vcl/inc/qt5/QtAccessibleWidget.hxx index 297508cbcbdf..ce29c8af052e 100644 --- a/vcl/inc/qt5/QtAccessibleWidget.hxx +++ b/vcl/inc/qt5/QtAccessibleWidget.hxx @@ -15,7 +15,9 @@ #include <comphelper/OAccessible.hxx> #include <rtl/ref.hxx> +SAL_WNODEPRECATED_DECLARATIONS_PUSH #include <QtCore/QObject> +SAL_WNODEPRECATED_DECLARATIONS_POP #include <QtCore/QPair> #include <QtCore/QString> #include <QtCore/QStringList> diff --git a/vcl/inc/qt5/QtDragAndDrop.hxx b/vcl/inc/qt5/QtDragAndDrop.hxx index 77c246352da7..e4133f8f8be1 100644 --- a/vcl/inc/qt5/QtDragAndDrop.hxx +++ b/vcl/inc/qt5/QtDragAndDrop.hxx @@ -17,7 +17,9 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/compbase.hxx> +SAL_WNODEPRECATED_DECLARATIONS_PUSH #include <QtCore/QObject> +SAL_WNODEPRECATED_DECLARATIONS_POP #include <QtGui/QDragEnterEvent> #include <QtGui/QDragMoveEvent> #include <QtGui/QDropEvent> diff --git a/vcl/inc/qt5/QtFilePicker.hxx b/vcl/inc/qt5/QtFilePicker.hxx index d52e98d8cbf8..a048e8ea540a 100644 --- a/vcl/inc/qt5/QtFilePicker.hxx +++ b/vcl/inc/qt5/QtFilePicker.hxx @@ -36,7 +36,9 @@ #include <osl/mutex.hxx> #include <unotools/resmgr.hxx> +SAL_WNODEPRECATED_DECLARATIONS_PUSH #include <QtCore/QObject> +SAL_WNODEPRECATED_DECLARATIONS_POP #include <QtCore/QString> #include <QtCore/QStringList> #include <QtCore/QHash> diff --git a/vcl/inc/qt5/QtInstance.hxx b/vcl/inc/qt5/QtInstance.hxx index dbb9afb63847..337f15697f67 100644 --- a/vcl/inc/qt5/QtInstance.hxx +++ b/vcl/inc/qt5/QtInstance.hxx @@ -28,7 +28,9 @@ #include <osl/conditn.hxx> +SAL_WNODEPRECATED_DECLARATIONS_PUSH #include <QtCore/QObject> +SAL_WNODEPRECATED_DECLARATIONS_POP #include <concepts> #include <cstdlib>
