From 419cb075571fa4e7ad5af427a57ebba85a336fd8 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Sat, 8 Apr 2023 19:30:29 +0000 Subject: [PATCH] Revert "Temporarily disable android Qt6 CI" This reverts commit d6ebb1308ce7dd060ed1fc9733d78e9d9b443b51 --- .gitlab-ci.yml | 2 +- src/chatdocumenthandler.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9be5a7ffe..f17f97fa6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ include: - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml -# - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml diff --git a/src/chatdocumenthandler.cpp b/src/chatdocumenthandler.cpp index 0c81f0ad3..7c02cbd22 100644 --- a/src/chatdocumenthandler.cpp +++ b/src/chatdocumenthandler.cpp @@ -138,12 +138,13 @@ int ChatDocumentHandler::completionStartIndex() const return 0; } -#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0) +#if !defined(Q_OS_ANDROID) && QT_VERSION > QT_VERSION_CHECK(6, 0, 0) const long long cursor = cursorPosition(); #else const auto cursor = cursorPosition(); #endif const auto &text = getText(); + auto start = std::min(cursor, text.size()) - 1; while (start > -1) { if (text.at(start) == QLatin1Char(' ')) { @@ -355,4 +356,4 @@ void ChatDocumentHandler::setErrorColor(const QColor &color) m_highlighter->errorFormat.setForeground(m_errorColor); m_highlighter->rehighlight(); Q_EMIT errorColorChanged(); -} \ No newline at end of file +}