diff options
| author | Marius Bugge Monsen <mmonsen@trolltech.com> | 2009-11-17 15:51:00 (GMT) |
|---|---|---|
| committer | Marius Bugge Monsen <mmonsen@trolltech.com> | 2009-11-17 15:51:00 (GMT) |
| commit | 1188cd220787162a2c8327ea1291a743863b12c5 (patch) | |
| tree | 36ee60fc41010b651fbb0d6a6d77c771c6fbcdc0 /src/gui/kernel | |
| parent | a380c528344d35a20078c7cc37bcbac3b607e618 (diff) | |
| parent | 7bb7914a183694be43029ed4c39651f3d95cfe67 (diff) | |
| download | Qt-1188cd220787162a2c8327ea1291a743863b12c5.zip Qt-1188cd220787162a2c8327ea1291a743863b12c5.tar.gz Qt-1188cd220787162a2c8327ea1291a743863b12c5.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qkeysequence.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 89c18fb..e3af683 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -1036,7 +1036,7 @@ QKeySequence QKeySequence::mnemonic(const QString &text) #else found = true; } else { - qWarning(qPrintable(QString::fromLatin1("QKeySequence::mnemonic: \"%1\" contains multiple occurences of '&'").arg(text))); + qWarning("QKeySequence::mnemonic: \"%s\" contains multiple occurences of '&'", qPrintable(text)); #endif } } |