diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-13 22:56:02 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-13 22:56:03 +0100 |
| commit | 9c055e8e47d9411a8f34abe6872e4bfd942cc372 (patch) | |
| tree | 895e139477c88a064a993f035afec614de9dafc7 /examples | |
| parent | d08e0e861acadf3a354d3833dd5623ef71fa7a4b (diff) | |
| parent | 76010f4af8c9a59a20c489d70c7f99b802f9721f (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Iaec2e57d6bf33355ddfa61d25133580a8740335f
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/widgets/itemviews/spreadsheet/spreadsheetitem.cpp | 2 | ||||
| -rw-r--r-- | examples/widgets/tools/completer/fsmodel.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheetitem.cpp b/examples/widgets/itemviews/spreadsheet/spreadsheetitem.cpp index e9d5235ddc..4c18fa8251 100644 --- a/examples/widgets/itemviews/spreadsheet/spreadsheetitem.cpp +++ b/examples/widgets/itemviews/spreadsheet/spreadsheetitem.cpp @@ -117,7 +117,7 @@ QVariant SpreadSheetItem::computeFormula(const QString &formula, const QTableWidget *widget, const QTableWidgetItem *self) { - // check if the s tring is actually a formula or not + // check if the string is actually a formula or not QStringList list = formula.split(' '); if (list.isEmpty() || !widget) return formula; // it is a normal string diff --git a/examples/widgets/tools/completer/fsmodel.h b/examples/widgets/tools/completer/fsmodel.h index a243c48b43..7b2e7b7dab 100644 --- a/examples/widgets/tools/completer/fsmodel.h +++ b/examples/widgets/tools/completer/fsmodel.h @@ -55,7 +55,7 @@ // With a QFileSystemModel, set on a view, you will see "Program Files" in the view // But with this model, you will see "C:\Program Files" in the view. -// We acheive this, by having the data() return the entire file path for +// We achieve this, by having the data() return the entire file path for // the display role. Note that the Qt::EditRole over which the QCompleter // looks for matches is left unchanged //! [0] |