diff options
| author | Yuhang Zhao <2546789017@qq.com> | 2023-02-20 17:06:46 +0800 |
|---|---|---|
| committer | Yuhang Zhao <2546789017@qq.com> | 2023-02-22 22:27:35 +0800 |
| commit | f7fd5eaf95c964956b2b353784105c89950ffff2 (patch) | |
| tree | 999559256f061a87dc4e3d0957f21d11cd0a15d8 /src/widgets/accessible | |
| parent | b4b4c8140112e3e327ca7bfc1263b948001b93f8 (diff) | |
Fix qtbase build when all deprecated code are disabled
Adjust the callers to use the non-deprecated APIs.
Pick-to: 6.5
Change-Id: I8e96f25684a2d613bc400a8626dc9e3af2bb8dcf
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/widgets/accessible')
| -rw-r--r-- | src/widgets/accessible/simplewidgets.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp index d0e42fde85..da4566bfff 100644 --- a/src/widgets/accessible/simplewidgets.cpp +++ b/src/widgets/accessible/simplewidgets.cpp @@ -403,10 +403,10 @@ QAccessible::Role QAccessibleDisplay::role() const #if QT_CONFIG(label) QLabel *l = qobject_cast<QLabel*>(object()); if (l) { - if (!l->pixmap(Qt::ReturnByValue).isNull()) + if (!l->pixmap().isNull()) return QAccessible::Graphic; #ifndef QT_NO_PICTURE - if (!l->picture(Qt::ReturnByValue).isNull()) + if (!l->picture().isNull()) return QAccessible::Graphic; #endif #if QT_CONFIG(movie) @@ -531,7 +531,7 @@ QSize QAccessibleDisplay::imageSize() const #endif return QSize(); #if QT_CONFIG(label) - return label->pixmap(Qt::ReturnByValue).size(); + return label->pixmap().size(); #endif } @@ -544,7 +544,7 @@ QPoint QAccessibleDisplay::imagePosition() const #endif return QPoint(); #if QT_CONFIG(label) - if (label->pixmap(Qt::ReturnByValue).isNull()) + if (label->pixmap().isNull()) return QPoint(); return QPoint(label->mapToGlobal(label->pos())); |