diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-07-01 19:24:01 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-07-01 19:24:01 +0200 |
| commit | 745ecfd8925716d962c97a4415881377faf6bdd5 (patch) | |
| tree | c4f78b3bd143af52372064cd3ba5c0ae440813c5 /src/corelib/tools/qstring.h | |
| parent | bda164303570629e44185e8baa52908ced6da301 (diff) | |
| parent | 8968c79c575755cdb52d5e615ed19e4529047464 (diff) | |
| download | qt4-tools-745ecfd8925716d962c97a4415881377faf6bdd5.tar.gz | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
bin/syncqt
src/gui/text/qtextlayout.cpp
tools/assistant/tools/assistant/helpviewer_qwv.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/configure/configureapp.cpp
Diffstat (limited to 'src/corelib/tools/qstring.h')
| -rw-r--r-- | src/corelib/tools/qstring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index ed87acf294..952c572ef1 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -596,7 +596,7 @@ public: #endif bool isSimpleText() const { if (!d->clean) updateProperties(); return d->simpletext; } - bool isRightToLeft() const { if (!d->clean) updateProperties(); return d->righttoleft; } + bool isRightToLeft() const; QString(int size, Qt::Initialization); |