diff options
| -rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/thread/qthread_symbian.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/thread/qwaitcondition_symbian.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qkeymapper_s60.cpp | 13 |
4 files changed, 20 insertions, 5 deletions
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<QString, QString> &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<QString, QString> cmdIter(commandsToReplace); 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 <private/qeventdispatcher_symbian_p.h> #include "qthreadstorage.h" #include "qthread_p.h" -#include "qsystemerror_p.h" +#include <private/qsystemerror_p.h> #include <sched.h> @@ -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; 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" 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. |