ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Temporarily disable android Qt6 CI"

Browse Source 
This reverts commit d6ebb1308c
This commit is contained in:
Tobias Fella
2023-04-08 19:30:29 +00:00
parent 57fccaa076
commit 419cb07557
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -4,7 +4,7 @@
include: 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/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.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.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/linux-qt6.yml
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml

5
src/chatdocumenthandler.cpp
View File

@@ -138,12 +138,13 @@ int ChatDocumentHandler::completionStartIndex() const
return 0; 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(); const long long cursor = cursorPosition();
#else #else
const auto cursor = cursorPosition(); const auto cursor = cursorPosition();
#endif #endif
const auto &text = getText(); const auto &text = getText();
auto start = std::min(cursor, text.size()) - 1; auto start = std::min(cursor, text.size()) - 1;
while (start > -1) { while (start > -1) {
if (text.at(start) == QLatin1Char(' ')) { if (text.at(start) == QLatin1Char(' ')) {
@@ -355,4 +356,4 @@ void ChatDocumentHandler::setErrorColor(const QColor &color)
m_highlighter->errorFormat.setForeground(m_errorColor); m_highlighter->errorFormat.setForeground(m_errorColor);
m_highlighter->rehighlight(); m_highlighter->rehighlight();
Q_EMIT errorColorChanged(); Q_EMIT errorColorChanged();
} }