diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 13:20:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 13:20:27 (GMT) |
| commit | 41731f324366eb40b96554b0cb980d55854db25f (patch) | |
| tree | a2d26dbd78bc33643693fb10132d3fee64af5ed9 /src/declarative/graphicsitems/qdeclarativetextedit.cpp | |
| parent | 5d720a3ff97eef934c8bf61805da4df500f8afa5 (diff) | |
| parent | 455440996f659ae246536b7450ba9b7900d015d0 (diff) | |
| download | Qt-41731f324366eb40b96554b0cb980d55854db25f.zip Qt-41731f324366eb40b96554b0cb980d55854db25f.tar.gz Qt-41731f324366eb40b96554b0cb980d55854db25f.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (250 commits)
Disable QtConcurrent for Symbian winscw builds.
Fix loss of focus and activation when hiding a child widget
Symbian build failure for Armv5
update def files
Fix softkeys in case a dialog with softkeys that have icons is closed.
Update softkeys after orientation switch.
ifdef out mac/no_coreservices path more cleanly
fix build on symbian
Provide internal API to avoid automatic translation of input widget
Allow different text for undo actions and items in QUndoView
Allow using not only prefixes for undo command text
QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH_MAX case
Massively update the hurd-g++ mkspec.
Sockets: Fix potential null pointer usages
Update QTBUG-17223 for Qt 4.8
Do not allow multiple threads to acquire a QMutex
rebuild configure
fix tst_qnetworkreply::httpProxyCommands autotest
Send User-Agent from the network request in http proxy CONNECT command
QSslConfiguration documentation fix
...
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextedit.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index af2c8f3..ca78593 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -273,7 +273,6 @@ void QDeclarativeTextEdit::setText(const QString &text) \o TextEdit.AutoText \o TextEdit.PlainText \o TextEdit.RichText - \o TextEdit.StyledText \endlist The default is TextEdit.AutoText. If the text format is TextEdit.AutoText the text edit |