diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-11 18:03:49 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-11 18:05:16 +0100 |
| commit | fe2c46d86e4287580191fc71357ec776cf1f5dd8 (patch) | |
| tree | 2d580b6a291206d0de54404e03a06b5c58b07b22 /src/designer | |
| parent | fff948341a61ce592013303ec40e64a1bf27e678 (diff) | |
| parent | 58f0987e16ac4580d9e4a6b604dd7603510b0385 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: Ieef1b05234ee67bef28f2dc9abaa65f10840d21b
Diffstat (limited to 'src/designer')
| -rw-r--r-- | src/designer/src/lib/shared/stylesheeteditor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/designer/src/lib/shared/stylesheeteditor.cpp b/src/designer/src/lib/shared/stylesheeteditor.cpp index 7b59c71ce..ccbd6974a 100644 --- a/src/designer/src/lib/shared/stylesheeteditor.cpp +++ b/src/designer/src/lib/shared/stylesheeteditor.cpp @@ -64,7 +64,7 @@ namespace qdesigner_internal { StyleSheetEditor::StyleSheetEditor(QWidget *parent) : QTextEdit(parent) { - setTabStopWidth(fontMetrics().width(QLatin1Char(' '))*4); + setTabStopDistance(fontMetrics().width(QLatin1Char(' ')) * 4); setAcceptRichText(false); new CssHighlighter(document()); } |