diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:41 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:52 +0200 |
| commit | 64255ef6502b1144f7b0aa4b2bf62803e0d4788b (patch) | |
| tree | 29bf116bfda2ccf61057115690d14f85cc9b085b /src/gui/text/qtextoption.h | |
| parent | 4a9fb41a7947d0bb7a47a9625603a436df288b24 (diff) | |
| parent | 7e0beba891cb963a1d535bd45b0be78b43b8d07f (diff) | |
Merge remote-tracking branch 'origin/api_changes'
Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1
Diffstat (limited to 'src/gui/text/qtextoption.h')
| -rw-r--r-- | src/gui/text/qtextoption.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h index f2a9f52a26..44dc79e255 100644 --- a/src/gui/text/qtextoption.h +++ b/src/gui/text/qtextoption.h @@ -86,7 +86,7 @@ public: }; QTextOption(); - QTextOption(Qt::Alignment alignment); + /*implicit*/ QTextOption(Qt::Alignment alignment); ~QTextOption(); QTextOption(const QTextOption &o); |