diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-08 09:11:01 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-08 09:11:02 +0100 |
| commit | 78c687f98eabb3da00026ac2375cdb4bb5770a0a (patch) | |
| tree | 0bd20a65aa9051229e813bc6b09cb59f8b5778f1 /src/platformsupport/fbconvenience/qfbvthandler.cpp | |
| parent | 3e529369eb16704aa0d601a7f4b8e490dc8b772c (diff) | |
| parent | a866055d18b2c2efc0f3cf5307d8eac78cce26eb (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I963b5f48b5d6f3500ca379fbd7f1a4290b570175
Diffstat (limited to 'src/platformsupport/fbconvenience/qfbvthandler.cpp')
| -rw-r--r-- | src/platformsupport/fbconvenience/qfbvthandler.cpp | 4 |
1 files changed, 4 insertions, 0 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) { |