summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextoption.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-12 09:20:03 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-12 09:20:03 (GMT)
commit05477289bb7f99e617d8b39c64fbbff2b30be368 (patch)
tree3cdb997b64fcc17e496845ec714cf3582b4d1abe /src/gui/text/qtextoption.h
parent1c20abaaeef1ab448526e5821db06350537c1333 (diff)
parent91b3cea424e08e7480fb32987f757206d885504c (diff)
downloadQt-05477289bb7f99e617d8b39c64fbbff2b30be368.zip
Qt-05477289bb7f99e617d8b39c64fbbff2b30be368.tar.gz
Qt-05477289bb7f99e617d8b39c64fbbff2b30be368.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: (55 commits) Fix symbian-abld build failure with bearer plugins remove certificate bundle make QSslSocket::systemCaCertificates() use system certs Adjusted RegExp in QSslCertificate::fromPath() Fix QSystemTrayIcon::supportsMessages() on Windows Use NIM_SETVERSION to get the latest behavior Cleanup obsolete stuff doc: Added DITA XML generator Fixed a broken merge. Changed the way we detect touch screen on Windows. Fixed error deploying qsymbianbearer.qtplugin on Symbian. Revert "Attempt to fix build failure on Symbian." Attempt to fix build failure on Symbian. Replaced redundant "!contains" scopes in "contains(A, B) {...} !contains(A, B) {...}" constructions with "else" Updated leading whitespace to make indentation more consistent Updated project files so it is now possible to use "-system-zlib" configuration option on Windows and Symbian platforms. make postgresql support sensitive to PSQL_LIBS support for cross building Qt for MinGW (win32-g++) on Unix use "win32-g++*" scope to match all MinGW makespecs Demos: Fix compilation with namespace. ...
Diffstat (limited to 'src/gui/text/qtextoption.h')
-rw-r--r--src/gui/text/qtextoption.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h
index fa8c6f2..a48efc1 100644
--- a/src/gui/text/qtextoption.h
+++ b/src/gui/text/qtextoption.h
@@ -68,6 +68,8 @@ public:
struct Q_GUI_EXPORT Tab {
inline Tab() : position(80), type(QTextOption::LeftTab) { }
+ inline Tab(qreal pos, TabType tabType, QChar delim = QChar())
+ : position(pos), type(tabType), delimiter(delim) {}
inline bool operator==(const Tab &other) const {
return type == other.type