diff options
| author | John Fultz <jfultz@wolfram.com> | 2019-07-19 12:05:36 -0500 |
|---|---|---|
| committer | John Fultz <jfultz@wolfram.com> | 2019-07-19 12:05:36 -0500 |
| commit | b6654916b426574a4f576d3511f21a85377746f9 (patch) | |
| tree | a29c5d92541f1e0c6b418445a18d2f917d760ce8 /quacker/bagdisplay.cpp | |
| parent | 595735c6fa5c9ed837151947e6ba1fbfdcd3190c (diff) | |
Fix deprecation errors for Qt 5.13.
Most are Qt4-isms, except where noted.
* Replaced QFontMetrics::width with QFontMetrics::horizontalAdvance,
conditionally as the latter wasn't even introduced until Qt 5.11.
* QColor::light and dark instead of QColor::light and dark.
* QString() instead of QString::null.
* std::sort instead of qSort
* QTreeWidgetItem::setSelected instead of QTreeWidget::setItemSelected.
* QFileDialog::setOption(QFileDialog::DontConfirmOverwrite) instead
of QFileDialog::setConfirmOverwrite(false).
* QDrag::exec instead of QDrag::start.
Diffstat (limited to 'quacker/bagdisplay.cpp')
| -rw-r--r-- | quacker/bagdisplay.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/quacker/bagdisplay.cpp b/quacker/bagdisplay.cpp index 456ef51..f38854d 100644 --- a/quacker/bagdisplay.cpp +++ b/quacker/bagdisplay.cpp @@ -105,7 +105,12 @@ void BagDisplay::showTiles(const Quackle::LongLetterString &tiles) line += sanitizedQString; } +#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)) + // Kill Qt 5.13 deprecation warning without breaking pre-5.11 builds + const int lineWidth = metrics.horizontalAdvance(line); +#else const int lineWidth = metrics.width(line); +#endif if (lineWidth > maxLineWidth) maxLineWidth = lineWidth; |