summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qevent.cpp46
-rw-r--r--src/gui/kernel/qevent.h16
-rw-r--r--src/gui/kernel/qguiapplication.cpp5
-rw-r--r--src/gui/kernel/qkeysequence.cpp2
-rw-r--r--src/gui/kernel/qplatformdialoghelper.cpp2
-rw-r--r--src/gui/kernel/qwindowsysteminterface.cpp4
6 files changed, 36 insertions, 39 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 1716cbc557..dc49d8b324 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -2224,14 +2224,14 @@ QVariant QInputMethodQueryEvent::value(Qt::InputMethodQuery query) const
(pressing the stylus tip against the tablet surface is equivalent to a left
mouse button). But tablet events also pass through some extra information
that the tablet device driver provides; for example, you might want to do
- subpixel rendering with higher resolution coordinates (\l hiResGlobalX()
- and \l hiResGlobalY()), adjust color brightness based on the \l pressure()
- of the tool against the tablet surface, use different brushes depending on
- the type of tool in use (\l device()), modulate the brush shape in some way
- according to the X-axis and Y-axis tilt of the tool with respect to the
- tablet surface (\l xTilt() and \l yTilt()), and use a virtual eraser
- instead of a brush if the user switches to the other end of a double-ended
- stylus (\l pointerType()).
+ subpixel rendering with higher resolution coordinates (\l globalPosF()),
+ adjust color brightness based on the \l pressure() of the tool against the
+ tablet surface, use different brushes depending on the type of tool in use
+ (\l deviceType()), modulate the brush shape in some way according to the
+ X-axis and Y-axis tilt of the tool with respect to the tablet surface
+ (\l xTilt() and \l yTilt()), and use a virtual eraser instead of a brush if
+ the user switches to the other end of a double-ended stylus
+ (\l pointerType()).
Every event contains an accept flag that indicates whether the receiver
wants the event. You should call QTabletEvent::accept() if you handle the
@@ -4572,19 +4572,12 @@ QPointF QTouchEvent::TouchPoint::lastNormalizedPos() const
return d->lastNormalizedPos;
}
+#if QT_DEPRECATED_SINCE(5, 15)
/*!
- Returns the rect for this touch point, relative to the widget
- or QGraphicsItem that received the event. The rect is centered
- around the point returned by pos().
-
- \note This function returns an empty rect if the device does not report touch point sizes.
-
- \obsolete This function is deprecated in 5.9 because it returns the outer bounds
+ \deprecated This function is deprecated since 5.9 because it returns the outer bounds
of the touchpoint regardless of rotation, whereas a touchpoint is more correctly
modeled as an ellipse at position pos() with ellipseDiameters()
which are independent of rotation().
-
- \sa scenePos(), ellipseDiameters()
*/
QRectF QTouchEvent::TouchPoint::rect() const
{
@@ -4594,16 +4587,10 @@ QRectF QTouchEvent::TouchPoint::rect() const
}
/*!
- Returns the rect for this touch point in scene coordinates.
-
- \note This function returns an empty rect if the device does not report touch point sizes.
-
- \obsolete This function is deprecated in 5.9 because it returns the outer bounds
+ \deprecated This function is deprecated since 5.9 because it returns the outer bounds
of the touchpoint regardless of rotation, whereas a touchpoint is more correctly
modeled as an ellipse at position scenePos() with ellipseDiameters()
which are independent of rotation().
-
- \sa scenePos(), ellipseDiameters()
*/
QRectF QTouchEvent::TouchPoint::sceneRect() const
{
@@ -4613,16 +4600,10 @@ QRectF QTouchEvent::TouchPoint::sceneRect() const
}
/*!
- Returns the rect for this touch point in screen coordinates.
-
- \note This function returns an empty rect if the device does not report touch point sizes.
-
- \obsolete This function is deprecated because it returns the outer bounds of the
+ \deprecated This function is deprecated since 5.9 because it returns the outer bounds of the
touchpoint regardless of rotation, whereas a touchpoint is more correctly
modeled as an ellipse at position screenPos() with ellipseDiameters()
which are independent of rotation().
-
- \sa screenPos(), ellipseDiameters()
*/
QRectF QTouchEvent::TouchPoint::screenRect() const
{
@@ -4630,6 +4611,7 @@ QRectF QTouchEvent::TouchPoint::screenRect() const
ret.moveCenter(d->screenPos);
return ret;
}
+#endif
/*!
Returns the pressure of this touch point. The return value is in
@@ -4828,6 +4810,7 @@ void QTouchEvent::TouchPoint::setLastNormalizedPos(const QPointF &lastNormalized
d->lastNormalizedPos = lastNormalizedPos;
}
+#if QT_DEPRECATED_SINCE(5, 15)
// ### remove the following 3 setRect functions and their usages soon
/*! \internal
\obsolete
@@ -4861,6 +4844,7 @@ void QTouchEvent::TouchPoint::setScreenRect(const QRectF &screenRect)
d->screenPos = screenRect.center();
d->ellipseDiameters = screenRect.size();
}
+#endif
/*! \internal */
void QTouchEvent::TouchPoint::setPressure(qreal pressure)
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 8a4acec257..05d79ad803 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -888,10 +888,23 @@ public:
QPointF startNormalizedPos() const;
QPointF lastNormalizedPos() const;
+#if QT_DEPRECATED_SINCE(5, 15)
+ // All these are actually deprecated since 5.9, in docs
+ QT_DEPRECATED_VERSION_X_5_15("Use pos() and ellipseDiameters()")
QRectF rect() const;
+ QT_DEPRECATED_VERSION_X_5_15("Use scenePos() and ellipseDiameters()")
QRectF sceneRect() const;
+ QT_DEPRECATED_VERSION_X_5_15("Use screenPos() and ellipseDiameters()")
QRectF screenRect() const;
+ // internal
+ QT_DEPRECATED_VERSION_X_5_15("Use setPos() and setEllipseDiameters()")
+ void setRect(const QRectF &rect); // deprecated
+ QT_DEPRECATED_VERSION_X_5_15("Use setScenePos() and setEllipseDiameters()")
+ void setSceneRect(const QRectF &sceneRect); // deprecated
+ QT_DEPRECATED_VERSION_X_5_15("Use setScreenPos() and setEllipseDiameters()")
+ void setScreenRect(const QRectF &screenRect); // deprecated
+#endif
qreal pressure() const;
qreal rotation() const;
QSizeF ellipseDiameters() const;
@@ -916,9 +929,6 @@ public:
void setLastScenePos(const QPointF &lastScenePos);
void setLastScreenPos(const QPointF &lastScreenPos);
void setLastNormalizedPos(const QPointF &lastNormalizedPos);
- void setRect(const QRectF &rect); // deprecated
- void setSceneRect(const QRectF &sceneRect); // deprecated
- void setScreenRect(const QRectF &screenRect); // deprecated
void setPressure(qreal pressure);
void setRotation(qreal angle);
void setEllipseDiameters(const QSizeF &dia);
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 0ad6272a7c..92256078dc 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -134,6 +134,7 @@ QT_BEGIN_NAMESPACE
return __VA_ARGS__; \
}
+Q_CORE_EXPORT void qt_call_post_routines();
Q_GUI_EXPORT bool qt_is_gui_used = true;
Qt::MouseButtons QGuiApplicationPrivate::mouse_buttons = Qt::NoButton;
@@ -685,6 +686,8 @@ QGuiApplication::~QGuiApplication()
{
Q_D(QGuiApplication);
+ qt_call_post_routines();
+
d->eventDispatcher->closingDown();
d->eventDispatcher = nullptr;
@@ -2328,7 +2331,7 @@ void QGuiApplicationPrivate::processKeyEvent(QWindowSystemInterfacePrivate::KeyE
static bool menuKeyPressAccepted = false;
#endif
-#if !defined(Q_OS_OSX)
+#if !defined(Q_OS_MACOS)
// FIXME: Include OS X in this code path by passing the key event through
// QPlatformInputContext::filterEvent().
if (e->keyType == QEvent::KeyPress && window) {
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 57a89bb8c2..cdcb6e8faf 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -1286,7 +1286,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
QString p = keyName(key, format);
-#if defined(Q_OS_OSX)
+#if defined(Q_OS_MACOS)
if (nativeText)
s += p;
else
diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp
index d2e079b57f..443f5d2552 100644
--- a/src/gui/kernel/qplatformdialoghelper.cpp
+++ b/src/gui/kernel/qplatformdialoghelper.cpp
@@ -980,7 +980,7 @@ QPlatformDialogHelper::ButtonRole QPlatformDialogHelper::buttonRole(QPlatformDia
const int *QPlatformDialogHelper::buttonLayout(Qt::Orientation orientation, ButtonLayout policy)
{
if (policy == UnknownLayout) {
-#if defined (Q_OS_OSX)
+#if defined (Q_OS_MACOS)
policy = MacLayout;
#elif defined (Q_OS_LINUX) || defined (Q_OS_UNIX)
policy = KdeLayout;
diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp
index 9d90bf5db2..e8f0892b95 100644
--- a/src/gui/kernel/qwindowsysteminterface.cpp
+++ b/src/gui/kernel/qwindowsysteminterface.cpp
@@ -498,7 +498,7 @@ QT_DEFINE_QPA_EVENT_HANDLER(bool, handleKeyEvent, QWindow *window, QEvent::Type
QT_DEFINE_QPA_EVENT_HANDLER(bool, handleKeyEvent, QWindow *window, ulong timestamp, QEvent::Type t, int k, Qt::KeyboardModifiers mods, const QString & text, bool autorep, ushort count)
{
-#if defined(Q_OS_OSX)
+#if defined(Q_OS_MACOS)
if (t == QEvent::KeyPress && QWindowSystemInterface::handleShortcutEvent(window, timestamp, k, mods, 0, 0, 0, text, autorep, count))
return true;
#endif
@@ -526,7 +526,7 @@ bool QWindowSystemInterface::handleExtendedKeyEvent(QWindow *window, ulong times
const QString& text, bool autorep,
ushort count, bool tryShortcutOverride)
{
-#if defined(Q_OS_OSX)
+#if defined(Q_OS_MACOS)
if (tryShortcutOverride && type == QEvent::KeyPress && QWindowSystemInterface::handleShortcutEvent(window,
timestamp, key, modifiers, nativeScanCode, nativeVirtualKey, nativeModifiers, text, autorep, count)) {
return true;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 21:30:02 +0000