diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-12-30 11:44:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-12-30 11:44:50 +0100 |
| commit | ec686af14f817cc51323cfb01186f036905789c3 (patch) | |
| tree | 29d229c8df8f37db56b9f6f5f3997bcd732689d4 /examples | |
| parent | 0425562e14e41b62dc7631c7c02768b8294454d0 (diff) | |
| parent | 090eab86b05478572485b3086c087a846fbae7fd (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
tests/auto/controls/data/tst_combobox.qml
Change-Id: I8471cdac4397f77a8e58140d58c6b50d3c437928
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quickcontrols2/texteditor/documenthandler.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/quickcontrols2/texteditor/documenthandler.h b/examples/quickcontrols2/texteditor/documenthandler.h index 97e55658..1a34f0e0 100644 --- a/examples/quickcontrols2/texteditor/documenthandler.h +++ b/examples/quickcontrols2/texteditor/documenthandler.h @@ -170,7 +170,6 @@ private: int m_selectionEnd; QFont m_font; - int m_fontSize; QUrl m_fileUrl; }; |