diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-05 18:40:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-05 18:40:44 (GMT) |
| commit | 777bf47da36292ffd37ae48a19796aafeb4d922e (patch) | |
| tree | cd898e657d0e46c882f00686393e55e26ec36301 /src | |
| parent | b5a5c7ce06291d4f9cae15383bd35677db277138 (diff) | |
| parent | cf14db1f16fffd7755d6200aaa6769a57a9da99d (diff) | |
| download | Qt-777bf47da36292ffd37ae48a19796aafeb4d922e.zip Qt-777bf47da36292ffd37ae48a19796aafeb4d922e.tar.gz Qt-777bf47da36292ffd37ae48a19796aafeb4d922e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
don't use QKeySequence::mnemonic() after all
don't use stylesheet for just making labels bold
remove the rounded extra frame around the main message editor
add const
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qstringbuilder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h index ddb5c7d..74661c2 100644 --- a/src/corelib/tools/qstringbuilder.h +++ b/src/corelib/tools/qstringbuilder.h @@ -71,7 +71,7 @@ public: private: const int m_size; - const char *m_data; + const char * const m_data; }; struct Q_CORE_EXPORT QAbstractConcatenable |