diff options
Diffstat (limited to 'src/gui/compat/removed_api.cpp')
-rw-r--r-- | src/gui/compat/removed_api.cpp | 53 |
1 files changed, 52 insertions, 1 deletions
diff --git a/src/gui/compat/removed_api.cpp b/src/gui/compat/removed_api.cpp index c38b30d812..c052ce6a25 100644 --- a/src/gui/compat/removed_api.cpp +++ b/src/gui/compat/removed_api.cpp @@ -7,8 +7,21 @@ QT_USE_NAMESPACE +#if QT_GUI_REMOVED_SINCE(6, 4) + +#include "qpagesize.h" // removed duplicate declaration of op== + // (still caused an symbol on some platforms) + +// #include "qotherheader.h" +// // implement removed functions from qotherheader.h +// order sections alphabetically + +#endif // QT_GUI_REMOVED_SINCE(6, 4) + #if QT_GUI_REMOVED_SINCE(6, 6) +#include "qpixmapcache.h" // inlined API + // #include "qotherheader.h" // // implement removed functions from qotherheader.h // order sections alphabetically @@ -17,8 +30,46 @@ QT_USE_NAMESPACE #if QT_GUI_REMOVED_SINCE(6, 7) +#include "qtextdocument.h" + +bool Qt::mightBeRichText(const QString& text) +{ + return Qt::mightBeRichText(qToStringViewIgnoringNull(text)); +} + +#endif // QT_GUI_REMOVED_SINCE(6, 7) + +#if QT_GUI_REMOVED_SINCE(6, 8) + +#include "qpagelayout.h" + +bool QPageLayout::setMargins(const QMarginsF &margins) +{ + return setMargins(margins, OutOfBoundsPolicy::Reject); +} + +bool QPageLayout::setLeftMargin(qreal leftMargin) +{ + return setLeftMargin(leftMargin, OutOfBoundsPolicy::Reject); +} + +bool QPageLayout::setRightMargin(qreal rightMargin) +{ + return setRightMargin(rightMargin, OutOfBoundsPolicy::Reject); +} + +bool QPageLayout::setTopMargin(qreal topMargin) +{ + return setTopMargin(topMargin, OutOfBoundsPolicy::Reject); +} + +bool QPageLayout::setBottomMargin(qreal bottomMargin) +{ + return setBottomMargin(bottomMargin, OutOfBoundsPolicy::Reject); +} + // #include "qotherheader.h" // // implement removed functions from qotherheader.h // order sections alphabetically -#endif // QT_GUI_REMOVED_SINCE(6, 7) +#endif // QT_GUI_REMOVED_SINCE(6, 8) |