diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 08:38:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 08:38:32 (GMT) |
| commit | a8829a52d65a9759d5dffe98fb07b384c54db1c8 (patch) | |
| tree | 59559409ffaa4f204685bdf1ab7e0721d79203b1 /src/corelib/global/qnamespace.h | |
| parent | a7189fb75a168f89db07d07eeb4f7fcd35d69942 (diff) | |
| parent | ab9cb342554e89e0ff51afe3e8063d2719af16b1 (diff) | |
| download | Qt-a8829a52d65a9759d5dffe98fb07b384c54db1c8.zip Qt-a8829a52d65a9759d5dffe98fb07b384c54db1c8.tar.gz Qt-a8829a52d65a9759d5dffe98fb07b384c54db1c8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (30 commits)
Revert "Split Symbian bearer plugin into three platform specfic plugins"
Don't poll non-polling engines when configurations are in use.
Doc: updating images
Fix a corner case where a gesture sometimes doesn't start.
write PO files without duplicated message ids
my changes
Fix failing bypassShaping autotest on the Mac OS X
More Pixmap cache key optimizations
QNAM: Improve child deletion order
QSslCertificate: support large serial numbers
Split Symbian bearer plugin into three platform specfic plugins
Doc: adding offline docs to assistant and Qt Creator. Improving small docs and adding highlighting
Some optimizations for QImage::load()
fix setRawData()
Fix QML crashes on the N900
doc: Added DITA XML generator
Fix build failure on Symbian 3.1.
Add the Qt::TextBypassShaping flag.
QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows.
Add my 4.7.0 changes
...
Diffstat (limited to 'src/corelib/global/qnamespace.h')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 08674d2..52a24de 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -236,7 +236,8 @@ public: TextJustificationForced = 0x10000, TextForceLeftToRight = 0x20000, TextForceRightToLeft = 0x40000, - TextLongestVariant = 0x80000 + TextLongestVariant = 0x80000, + TextBypassShaping = 0x100000 #if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN) ,SingleLine = TextSingleLine, |