diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-16 15:00:06 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-17 20:49:06 +0200 |
| commit | 714409b23ce5ec33e56adce5ba1966aad67c3b34 (patch) | |
| tree | 83f4655ecfa83f249e85700ce54ca72794d2e544 /src/widgets/widgets/qsplashscreen.cpp | |
| parent | 30141b2fb7bf3800c0f4374d9adfd23eb40ed275 (diff) | |
Remove deprecated members from QtWidgets/widgets classes
Cleaning up those that are trivial to remove because they have direct
replacements.
The QLabel changes to the pixmap/picture getters provide the following
migration path:
QPixmap *ppix = l->pixmap(); // up to 5.15, warns in 5.15
QPixmap pval = l->pixmap(Qt::ReturnByValue); // new in 5.15, works in 6
QPixmap pixmap = l->pixmap(); // from Qt 6 on
The overload with argument can be deprecated after the first LTS or
so.
Change-Id: I8494ceeea55b2aeda0bd340640ad95cb7c91f7d6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/widgets/widgets/qsplashscreen.cpp')
| -rw-r--r-- | src/widgets/widgets/qsplashscreen.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/widgets/widgets/qsplashscreen.cpp b/src/widgets/widgets/qsplashscreen.cpp index 70f05033ea..407f6a0795 100644 --- a/src/widgets/widgets/qsplashscreen.cpp +++ b/src/widgets/widgets/qsplashscreen.cpp @@ -157,25 +157,6 @@ QSplashScreen::QSplashScreen(QScreen *screen, const QPixmap &pixmap, Qt::WindowF d_func()->setPixmap(pixmap, screen); } -#if QT_DEPRECATED_SINCE(5, 15) -/*! - \overload - \obsolete - - This function allows you to specify a parent for your splashscreen. The - typical use for this constructor is if you have a multiple screens and - prefer to have the splash screen on a different screen than your primary - one. In that case pass the proper desktop() as the \a parent. -*/ -QSplashScreen::QSplashScreen(QWidget *parent, const QPixmap &pixmap, Qt::WindowFlags f) - : QWidget(*new QSplashScreenPrivate, parent, Qt::SplashScreen | Qt::FramelessWindowHint | f) -{ - // Does an implicit repaint. Explicitly pass parent as QObject::parent() - // is still 0 here due to QWidget's special handling. - d_func()->setPixmap(pixmap, QSplashScreenPrivate::screenFor(parent)); -} -#endif - /*! Destructor. */ |