diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-06-07 17:10:56 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-06-07 17:10:57 +0200 |
| commit | fc5da399c3145621c5945d53dde7b37fa463c6e9 (patch) | |
| tree | 8deec4c78b5add097ba7f2b1e371f27e3ae759c5 /src/widgets | |
| parent | 225dcf355a95f272aaa7ac236c7274e254dca41c (diff) | |
| parent | a14a943f9ac3d1e85514d7fb6688c84e624ac850 (diff) | |
Merge 5.11 into 5.11.1
Change-Id: I28f48e980a9e23ddde5251608dd9d1d83df65392
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/util/qcompleter.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/widgets/qabstractspinbox.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/widgets/qcalendarwidget.cpp | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp index d444fe6053..599b983748 100644 --- a/src/widgets/util/qcompleter.cpp +++ b/src/widgets/util/qcompleter.cpp @@ -162,6 +162,7 @@ #if QT_CONFIG(lineedit) #include "QtWidgets/qlineedit.h" #endif +#include "QtCore/qdir.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp index 77423e85e5..f059980c5c 100644 --- a/src/widgets/widgets/qabstractspinbox.cpp +++ b/src/widgets/widgets/qabstractspinbox.cpp @@ -619,6 +619,8 @@ void QAbstractSpinBox::stepDown() function. Note that this function is called even if the resulting value will be outside the bounds of minimum and maximum. It's this function's job to handle these situations. + + \sa stepUp(), stepDown(), keyPressEvent() */ void QAbstractSpinBox::stepBy(int steps) @@ -970,6 +972,8 @@ void QAbstractSpinBox::paintEvent(QPaintEvent *) \row \li Page down \li This will invoke stepBy(-10) \endtable + + \sa stepBy() */ diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index 059fb21295..9559b58339 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -1005,7 +1005,7 @@ Qt::DayOfWeek QCalendarModel::dayOfWeekForColumn(int column) const int QCalendarModel::columnForDayOfWeek(Qt::DayOfWeek day) const { - if (day < 1 || day > 7) + if (day < 1 || unsigned(day) > unsigned(7)) return -1; int column = (int)day - (int)m_firstDay; if (column < 0) |