From 9525ef8f3f8c2f28992457a626356cec86bd7279 Mon Sep 17 00:00:00 2001 From: mread Date: Wed, 9 Mar 2011 16:02:27 +0000 Subject: key to string translations for Symbian return and tab characters The Symbian port was not supplying string content for special characters that have a valid string representation. These appear to be return and tab characters. Now it does, for these. Task-number: QTBUG-17545 Reviewed-by: Shane Kearns --- src/gui/kernel/qkeymapper_s60.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/gui/kernel/qkeymapper_s60.cpp b/src/gui/kernel/qkeymapper_s60.cpp index bcf32a5..08cfae0 100644 --- a/src/gui/kernel/qkeymapper_s60.cpp +++ b/src/gui/kernel/qkeymapper_s60.cpp @@ -69,8 +69,17 @@ void QKeyMapperPrivate::clearMappings() QString QKeyMapperPrivate::translateKeyEvent(int keySym, Qt::KeyboardModifiers /* modifiers */) { - if (keySym >= Qt::Key_Escape) - return QString(); + if (keySym >= Qt::Key_Escape) { + switch (keySym) { + case Qt::Key_Tab: + return QString(QChar('\t')); + case Qt::Key_Return: // fall through + case Qt::Key_Enter: + return QString(QChar('\r')); + default: + return QString(); + } + } // Symbian doesn't actually use modifiers, but gives us the character code directly. -- cgit v0.12 From 498d14367250589e803d32155ffdd4c6fb56c764 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 10 Mar 2011 16:18:18 +0200 Subject: Strip echo suppression character "@" from commands in symbian-sbsv2 Symbian-sbsv2 toolchain cannot handle echo suppresion character "@" in recipes, so the character is stripped from all commands if it exists at the beginning of the command. Task-number: QTBUG-4767 Reviewed-by: Iain --- qmake/generators/symbian/symmake_sbsv2.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index f94a63f..6f53288 100644 --- a/qmake/generators/symbian/symmake_sbsv2.cpp +++ b/qmake/generators/symbian/symmake_sbsv2.cpp @@ -84,6 +84,12 @@ static void fixFlmCmd(QString *cmdLine, const QMap &commandsTo // separator, so replace it with "&&" command concatenator. cmdLine->replace("\n\t", "&&"); + // Strip output suppression, as sbsv2 can't handle it in FLMs. Cannot be done by simply + // adding "@" to commandsToReplace, as it'd get handled last due to alphabetical ordering, + // potentially masking other commands that need replacing. + if (cmdLine->contains("@")) + cmdLine->replace(QRegExp(cmdFind.arg("@")), cmdReplace.arg("")); + // Iterate command replacements in reverse alphabetical order of keys so // that keys which are starts of other longer keys are iterated after longer keys. QMapIterator cmdIter(commandsToReplace); -- cgit v0.12 From 59d0c47c82ed5628f0900918e0f6099ba6452e26 Mon Sep 17 00:00:00 2001 From: mread Date: Fri, 11 Mar 2011 10:41:27 +0000 Subject: fixing build error in qthread_symbian.cpp CI found that an include of qsystemerror_p.h was incorrect Reviewed-by: iain --- src/corelib/thread/qthread_symbian.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/thread/qthread_symbian.cpp b/src/corelib/thread/qthread_symbian.cpp index 40764b2..128124f 100644 --- a/src/corelib/thread/qthread_symbian.cpp +++ b/src/corelib/thread/qthread_symbian.cpp @@ -45,7 +45,7 @@ #include #include "qthreadstorage.h" #include "qthread_p.h" -#include "qsystemerror_p.h" +#include #include @@ -462,7 +462,7 @@ void QThread::start(Priority priority) d->data->symbian_thread_handle.SetPriority(symPriority); d->data->symbian_thread_handle.Resume(); } else { - qWarning("QThread::start: Thread creation error: %s", QSystemError(code, QSystemError::NativeError).toString()); + qWarning("QThread::start: Thread creation error: %s", qPrintable(QSystemError(code, QSystemError::NativeError).toString())); d->running = false; d->finished = false; -- cgit v0.12 From eed987453272d925a41d6e8249bdf3458609a58a Mon Sep 17 00:00:00 2001 From: mread Date: Fri, 11 Mar 2011 12:24:47 +0000 Subject: fixing build issue in qwaitcondition_symbian.cpp include of qelapsedtimer was missing a .h Reviewed-by: Robert DeWolf --- src/corelib/thread/qwaitcondition_symbian.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/thread/qwaitcondition_symbian.cpp b/src/corelib/thread/qwaitcondition_symbian.cpp index 1e7172a..9967382 100644 --- a/src/corelib/thread/qwaitcondition_symbian.cpp +++ b/src/corelib/thread/qwaitcondition_symbian.cpp @@ -45,7 +45,7 @@ #include "qreadwritelock.h" #include "qatomic.h" #include "qstring.h" -#include "qelapsedtimer" +#include "qelapsedtimer.h" #include "qmutex_p.h" #include "qreadwritelock_p.h" -- cgit v0.12