diff options
Diffstat (limited to 'src/widgets/compat/removed_api.cpp')
-rw-r--r-- | src/widgets/compat/removed_api.cpp | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/src/widgets/compat/removed_api.cpp b/src/widgets/compat/removed_api.cpp index f43efe36ad..5fcbdba47b 100644 --- a/src/widgets/compat/removed_api.cpp +++ b/src/widgets/compat/removed_api.cpp @@ -9,6 +9,7 @@ QT_USE_NAMESPACE #if QT_WIDGETS_REMOVED_SINCE(6, 3) +#if QT_CONFIG(menu) #include "qmenu.h" QAction *QMenu::addAction(const QString &text) @@ -20,6 +21,7 @@ QAction *QMenu::addAction(const QIcon &icon, const QString &text) { return QWidget::addAction(icon, text); } +#endif #if !QT_CONFIG(shortcut) // the overloads taking QKeySequence as a trailing argument are deprecated, not removed, @@ -36,6 +38,7 @@ QAction *QMenu::addAction(const QIcon &icon, const QString &text, } #endif +#if QT_CONFIG(toolbar) #include "qtoolbar.h" QAction *QToolBar::addAction(const QString &text) @@ -59,7 +62,9 @@ QAction *QToolBar::addAction(const QIcon &icon, const QString &text, { return QWidget::addAction(icon, text, receiver, member); } +#endif +#if QT_CONFIG(menubar) #include "qmenubar.h" QAction *QMenuBar::addAction(const QString &text) @@ -71,8 +76,28 @@ QAction *QMenuBar::addAction(const QString &text, const QObject *receiver, const { return QWidget::addAction(text, receiver, member); } +#endif + +#endif // QT_WIDGETS_REMOVED_SINCE(6, 3) + +#if QT_WIDGETS_REMOVED_SINCE(6, 7) + + +#if QT_CONFIG(filedialog) +#include "qfiledialog.h" + +void QFileDialog::getOpenFileContent(const QString &nameFilter, const std::function<void(const QString &, const QByteArray &)> &fileOpenCompleted) +{ + QFileDialog::getOpenFileContent(nameFilter, fileOpenCompleted, nullptr); +} + +void QFileDialog::saveFileContent(const QByteArray &fileContent, const QString &fileNameHint) +{ + saveFileContent(fileContent, fileNameHint, nullptr); +} +#endif // #include <qotherheader.h> // // implement removed functions from qotherheader.h -#endif // QT_WIDGETS_REMOVED_SINCE(6, 3) +#endif // QT_WIDGETS_REMOVED_SINCE(6, 7) |