Merge remote-tracking branch 'origin/8.0'

Conflicts:
	src/libs/utils/terminalprocess.cpp
	tests/auto/qml/qmldesigner/coretests/CMakeLists.txt

Change-Id: Ifc5b37dadd46af752f0771a2685da1ac9a6260bd

src/plugins/cmakeprojectmanager/configmodelitemdelegate.cpp

@@ -64,6 +64,7 @@ QWidget *ConfigModelItemDelegate::createEditor(QWidget *parent, const QStyleOpti
             auto edit = new QComboBox(parent);
             edit->setAttribute(Qt::WA_MacSmallSize);
             edit->setFocusPolicy(Qt::StrongFocus);
+            edit->setAutoFillBackground(true);
             for (const QString &s : qAsConst(data.values))
                 edit->addItem(s);
             return edit;