Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: I963b5f48b5d6f3500ca379fbd7f1a4290b570175

3 files changed, 6 insertions, 2 deletions

diff --git a/src/platformsupport/fbconvenience/qfbvthandler.cpp b/src/platformsupport/fbconvenience/qfbvthandler.cpp
index 7bb9e28ac2..8aab0bada4 100644
--- a/src/platformsupport/fbconvenience/qfbvthandler.cpp
+++ b/src/platformsupport/fbconvenience/qfbvthandler.cpp
@@ -70,6 +70,10 @@ QT_BEGIN_NAMESPACE
 #ifdef VTH_ENABLED
 static void setTTYCursor(bool enable)
 {
+    static bool ignore = qEnvironmentVariableIntValue("QT_QPA_PRESERVE_CONSOLE_STATE");
+    if (ignore)
+        return;
+
     const char * const devs[] = { "/dev/tty0", "/dev/tty", "/dev/console", 0 };
     int fd = -1;
     for (const char * const *dev = devs; *dev; ++dev) {
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
index 072dd1a28a..30c80ebd86 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
@@ -471,7 +471,7 @@ void QCoreTextFontEngine::draw(CGContextRef ctx, qreal x, qreal y, const QTextIt
     const qreal firstY = positions[0].y.toReal();
     for (int i = 0; i < glyphs.size(); ++i) {
         cgPositions[i].x = positions[i].x.toReal() - firstX;
-        cgPositions[i].y = positions[i].y.toReal() - firstY;
+        cgPositions[i].y = firstY - positions[i].y.toReal();
         cgGlyphs[i] = glyphs[i];
     }
 
diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
index 8a825f8284..4a83c6eb80 100644
--- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
+++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
@@ -958,7 +958,7 @@ void AtSpiAdaptor::notify(QAccessibleEvent *event)
                 textRemoved = textEvent->textRemoved();
                 changePosition = textEvent->changePosition();
                 cursorPosition = textEvent->cursorPosition();
-            } else if (event->type() == QAccessible::TextInserted) {
+            } else if (event->type() == QAccessible::TextUpdated) {
                 QAccessibleTextUpdateEvent *textEvent = static_cast<QAccessibleTextUpdateEvent*>(event);
                 textInserted = textEvent->textInserted();
                 textRemoved = textEvent->textRemoved();