Merge branch 'release/19.12'

diff --cc src/kitemviews/kitemlistcontainer.cpp
Simple merge

diff --cc src/kitemviews/kitemlistview.cpp
Simple merge

diff --cc src/kitemviews/kitemlistview.h
Simple merge