diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-08 13:19:37 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-10 13:59:30 +0200 |
| commit | 033d01bd6e2aef740ad1408a04d3ca0ae3b9ba9b (patch) | |
| tree | af2e47a222cf6f4ed3687305df2d1cc3a578b2ed /src/widgets/kernel | |
| parent | c0873b7832d8aaf79dda0c5c5820f97c84b399ed (diff) | |
QApplication: remove obsolete globalStrut functionality
Change-Id: If56873f86f5291264cac720f8db7dbd4db756f49
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/widgets/kernel')
| -rw-r--r-- | src/widgets/kernel/qapplication.cpp | 28 | ||||
| -rw-r--r-- | src/widgets/kernel/qapplication.h | 7 |
2 files changed, 0 insertions, 35 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 3f2c15b739..029be25620 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -350,7 +350,6 @@ QPointer<QWidget> QApplicationPrivate::wheel_widget; #endif bool qt_in_tab_key_event = false; int qt_antialiasing_threshold = -1; -QSize QApplicationPrivate::app_strut = QSize(0,0); // no default application strut int QApplicationPrivate::enabledAnimations = QPlatformTheme::GeneralUiEffect; bool QApplicationPrivate::widgetCount = false; #ifdef QT_KEYPAD_NAVIGATION @@ -741,7 +740,6 @@ QApplication::~QApplication() QApplicationPrivate::obey_desktop_settings = true; - QApplicationPrivate::app_strut = QSize(0, 0); QApplicationPrivate::enabledAnimations = QPlatformTheme::GeneralUiEffect; QApplicationPrivate::widgetCount = false; @@ -1101,32 +1099,6 @@ QStyle* QApplication::setStyle(const QString& style) return s; } -/*! - \property QApplication::globalStrut - \brief the minimum size that any GUI element that the user can interact - with should have - \deprecated - - For example, no button should be resized to be smaller than the global - strut size. The strut size should be considered when reimplementing GUI - controls that may be used on touch-screens or similar I/O devices. - - Example: - - \snippet code/src_gui_kernel_qapplication.cpp 3 - - By default, this property contains a QSize object with zero width and height. -*/ -QSize QApplication::globalStrut() -{ - return QApplicationPrivate::app_strut; -} - -void QApplication::setGlobalStrut(const QSize& strut) -{ - QApplicationPrivate::app_strut = strut; -} - // Widget specific palettes QApplicationPrivate::PaletteHash QApplicationPrivate::widgetPalettes; diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 594c7bbead..974c789e08 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -77,9 +77,6 @@ class Q_WIDGETS_EXPORT QApplication : public QGuiApplication #if QT_CONFIG(wheelevent) Q_PROPERTY(int wheelScrollLines READ wheelScrollLines WRITE setWheelScrollLines) #endif -#if QT_DEPRECATED_SINCE(5, 15) - Q_PROPERTY(QSize globalStrut READ globalStrut WRITE setGlobalStrut) -#endif Q_PROPERTY(int startDragTime READ startDragTime WRITE setStartDragTime) Q_PROPERTY(int startDragDistance READ startDragDistance WRITE setStartDragDistance) #ifndef QT_NO_STYLE_STYLESHEET @@ -142,10 +139,6 @@ public: static void setWheelScrollLines(int); static int wheelScrollLines(); #endif -#if QT_DEPRECATED_SINCE(5, 15) - static void setGlobalStrut(const QSize &); - static QSize globalStrut(); -#endif static void setStartDragTime(int ms); static int startDragTime(); |