Merge branch 'master' into kf6

4 files changed, 9 insertions, 1 deletions

diff --git a/src/settings/viewmodes/contentdisplaytab.cpp b/src/settings/viewmodes/contentdisplaytab.cpp
index 442bd3b49..aa320b79e 100644
--- a/src/settings/viewmodes/contentdisplaytab.cpp
+++ b/src/settings/viewmodes/contentdisplaytab.cpp
@@ -146,3 +146,5 @@ void ContentDisplayTab::restoreDefaults()
     loadSettings();
     settings->useDefaults(false);
 }
+
+#include "moc_contentdisplaytab.cpp"
diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp
index 68ffa4f00..609c368c0 100644
--- a/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
@@ -29,7 +29,7 @@ DolphinFontRequester::DolphinFontRequester(QWidget *parent)
     m_modeCombo->addItem(i18nc("@item:inlistbox Font", "Custom Font"));
     connect(m_modeCombo, &QComboBox::activated, this, &DolphinFontRequester::changeMode);
 
-    m_chooseFontButton = new QPushButton(i18nc("@action:button Choose font", "Choose..."), this);
+    m_chooseFontButton = new QPushButton(i18nc("@action:button Choose font", "Choose…"), this);
     connect(m_chooseFontButton, &QPushButton::clicked, this, &DolphinFontRequester::openFontDialog);
 
     changeMode(m_modeCombo->currentIndex());
@@ -85,3 +85,5 @@ void DolphinFontRequester::changeMode(int index)
     setMode((index == CustomFont) ? CustomFont : SystemFont);
     Q_EMIT changed();
 }
+
+#include "moc_dolphinfontrequester.cpp"
diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp
index 33409ec25..0d4d4277b 100644
--- a/src/settings/viewmodes/viewsettingspage.cpp
+++ b/src/settings/viewmodes/viewsettingspage.cpp
@@ -79,3 +79,5 @@ void ViewSettingsPage::restoreDefaults()
         }
     }
 }
+
+#include "moc_viewsettingspage.cpp"
diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp
index df850e530..ae80a2558 100644
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -249,3 +249,5 @@ void ViewSettingsTab::showToolTip(QSlider *slider, int value)
     QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), slider->mapToGlobal(global));
     QApplication::sendEvent(slider, &toolTipEvent);
 }
+
+#include "moc_viewsettingstab.cpp"