Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
	configure
	src/corelib/io/qurl.cpp
	src/gui/kernel/qwindow.cpp
	src/tools/moc/generator.cpp
	src/widgets/kernel/qwidget_qpa.cpp
	src/widgets/styles/qstyle.h
	src/widgets/widgets/qtabbar.cpp
	tests/auto/corelib/codecs/utf8/tst_utf8.cpp

Change-Id: Ia457228d6f684ec8184e13e8fcc9d25857b1751e

1 files changed, 4 insertions, 4 deletions

diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp
index 285099a4cb..44c450ca47 100644
--- a/src/widgets/widgets/qsplitter.cpp
+++ b/src/widgets/widgets/qsplitter.cpp
@@ -232,14 +232,14 @@ void QSplitterHandle::resizeEvent(QResizeEvent *event)
 {
     Q_D(const QSplitterHandle);
 
-    // When splitters are only 1 pixel large we increase the
+    // When splitters are only 1 or 0 pixel large we increase the
     // actual grab area to five pixels
 
     // Note that QSplitter uses contentsRect for layouting
     // and ensures that handles are drawn on top of widgets
     // We simply use the contents margins for draggin and only
     // paint the mask area
-    bool useTinyMode = (d->s->handleWidth() == 1);
+    bool useTinyMode = (d->s->handleWidth() <= 1);
     setAttribute(Qt::WA_MouseNoMask, useTinyMode);
     if (useTinyMode) {
         if (orientation() == Qt::Horizontal)
@@ -1528,14 +1528,14 @@ void QSplitter::setSizes(const QList<int> &list)
     By default, this property contains a value that depends on the user's platform
     and style preferences.
 
-    If you set handleWidth to 1, the actual grab area will grow to overlap a
+    If you set handleWidth to 1 or 0, the actual grab area will grow to overlap a
     few pixels of it's respective widgets.
 */
 
 int QSplitter::handleWidth() const
 {
     Q_D(const QSplitter);
-    if (d->handleWidth > 0) {
+    if (d->handleWidth >= 0) {
         return d->handleWidth;
     } else {
         return style()->pixelMetric(QStyle::PM_SplitterWidth, 0, this);