diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/painting/qpagedpaintdevice.cpp | 1 | ||||
-rw-r--r-- | src/gui/util/qdesktopservices.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/painting/qpagedpaintdevice.cpp b/src/gui/painting/qpagedpaintdevice.cpp index 0c2123f9a6..3fdd0206b7 100644 --- a/src/gui/painting/qpagedpaintdevice.cpp +++ b/src/gui/painting/qpagedpaintdevice.cpp @@ -42,6 +42,7 @@ QT_BEGIN_NAMESPACE +// ### Qt 6: remove when the deprecated constructor is removed class QDummyPagedPaintDevicePrivate : public QPagedPaintDevicePrivate { bool setPageLayout(const QPageLayout &newPageLayout) override diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp index ee0ff4c6ef..99214c4960 100644 --- a/src/gui/util/qdesktopservices.cpp +++ b/src/gui/util/qdesktopservices.cpp @@ -290,6 +290,7 @@ void QDesktopServices::unsetUrlHandler(const QString &scheme) setUrlHandler(scheme, 0, 0); } +#if QT_DEPRECATED_SINCE(5, 0) /*! \enum QDesktopServices::StandardLocation \since 4.4 @@ -344,6 +345,7 @@ void QDesktopServices::unsetUrlHandler(const QString &scheme) \obsolete Use QStandardPaths::displayName() */ +#endif extern Q_CORE_EXPORT QString qt_applicationName_noFallback(); |