diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-01 03:32:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-01 03:32:36 (GMT) |
| commit | 918b7d92a1c27d0fa10a75db975dcf30963acc94 (patch) | |
| tree | ec93afad8058af542bf2938b1051efb364aa38a2 /src/corelib/global | |
| parent | c9bb16f0b34f180bf955682ab31fc1ff63d5de84 (diff) | |
| parent | e3f05380d79ca9b23c120b496104ea44b5ab5b5a (diff) | |
| download | Qt-918b7d92a1c27d0fa10a75db975dcf30963acc94.zip Qt-918b7d92a1c27d0fa10a75db975dcf30963acc94.tar.gz Qt-918b7d92a1c27d0fa10a75db975dcf30963acc94.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:
Add the Qt::TextBypassShaping flag.
QTextEngine: skip an unnecessary call to GetDeviceCaps on Windows.
Add my 4.7.0 changes
qdoc: Added DITA XML generator
doc: Fixed confusing ownership issue.
update Russian translations for Qt tools
update Russian translation for Qt libraries
QXmlSchema documentation correction
doc: Changed last breadcrumb to not be a link.
doc: Fixed reference to setSize(), which is in QRectF.
QNetworkCookie: do not accept cookies with non-alNum domain
QtDeclarative: Remove trailing commas in enums
Doc: MonotonicClock is obviously monotonic
Diffstat (limited to 'src/corelib/global')
| -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, |