[Libreoffice-commits] core.git: vcl/unx

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Tue Jan 14 19:44:39 UTC 2020


 vcl/unx/gtk3_kde5/kde5_filepicker.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a504edb024bb2cbe07e98a0df42efdb2f1a2135b
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jan 14 19:46:47 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Jan 14 20:44:07 2020 +0100

    Silence -Werror,-Wdeprecated-declarations for now
    
    ...as seen with qt5-qtbase-devel-5.13.2-1.fc31.x86_64:
    
    > vcl/unx/gtk3_kde5/kde5_filepicker.cxx:233:18: error: 'setConfirmOverwrite' is deprecated: Use setOption(DontConfirmOverwrite, !enabled) instead [-Werror,-Wdeprecated-declarations]
    >         _dialog->setConfirmOverwrite(true);
    >                  ^
    > /usr/include/qt5/QtWidgets/qfiledialog.h:174:5: note: 'setConfirmOverwrite' has been explicitly marked deprecated here
    >     QT_DEPRECATED_X("Use setOption(DontConfirmOverwrite, !enabled) instead")
    >     ^
    
    Change-Id: I322dda4353a69746cc80afade8206c3cecee8a96
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86799
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
index 064c696953cb..27043053c3da 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
@@ -230,7 +230,9 @@ void KDE5FilePicker::initialize(bool saveDialog)
 
     if (saveDialog)
     {
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         _dialog->setConfirmOverwrite(true);
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         _dialog->setFileMode(QFileDialog::AnyFile);
     }
 }


More information about the Libreoffice-commits mailing list