Merge remote-tracking branch 'origin/3.5'

Change-Id: I7b3ef276d438ff0f184a649153e8aeec08a9f8c9

src/plugins/cmakeprojectmanager/cmakekitinformation.cpp

@@ -47,6 +47,7 @@ CMakeKitInformation::CMakeKitInformation()
 {
     setObjectName(QLatin1String("CMakeKitInformation"));
     setId(CMakeKitInformation::id());
+    setPriority(20000);
 
     //make sure the default value is set if a selected CMake is removed
     connect(CMakeToolManager::instance(), &CMakeToolManager::cmakeRemoved,

src/plugins/cmakeprojectmanager/cmakesettingspage.cpp

@@ -378,6 +378,7 @@ void CMakeToolItemConfigWidget::load(const CMakeToolTreeItem *item)
 
 class CMakeToolConfigWidget : public QWidget
 {
+    Q_OBJECT
 public:
     CMakeToolConfigWidget() : m_currentItem(0)
     {
@@ -572,3 +573,5 @@ void CMakeSettingsPage::finish()
 
 } // namespace Internal
 } // namespace CMakeProjectManager
+
+#include "cmakesettingspage.moc"