Merge branch 'master' into kf6

4 files changed, 8 insertions, 1 deletions

diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp
index 5bd9cb296..9d1e5b971 100644
--- a/src/panels/information/informationpanel.cpp
+++ b/src/panels/information/informationpanel.cpp
@@ -165,7 +165,7 @@ void InformationPanel::showContextMenu(const QPoint &pos)
     showHoveredAction->setCheckable(true);
     showHoveredAction->setChecked(InformationPanelSettings::showHovered());
 
-    QAction *configureAction = popup.addAction(i18nc("@action:inmenu", "Configure..."));
+    QAction *configureAction = popup.addAction(i18nc("@action:inmenu", "Configure…"));
     configureAction->setIcon(QIcon::fromTheme(QStringLiteral("configure")));
     if (m_inConfigurationMode) {
         configureAction->setEnabled(false);
@@ -419,3 +419,5 @@ void InformationPanel::init()
 
     m_initialized = true;
 }
+
+#include "moc_informationpanel.cpp"
diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index d731d4de7..62f25b24b 100644
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -489,3 +489,5 @@ void InformationPanelContent::adjustWidgetSizes(int width)
         m_phononWidget->setVideoSize(QSize(maxWidth, maxWidth));
     }
 }
+
+#include "moc_informationpanelcontent.cpp"
diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index 683eaafdb..3365998f4 100644
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -261,4 +261,5 @@ void PhononWidget::applyVideoSize()
     }
 }
 
+#include "moc_phononwidget.cpp"
 #include "phononwidget.moc"
diff --git a/src/panels/information/pixmapviewer.cpp b/src/panels/information/pixmapviewer.cpp
index 7eca876c8..11c13e348 100644
--- a/src/panels/information/pixmapviewer.cpp
+++ b/src/panels/information/pixmapviewer.cpp
@@ -174,3 +174,5 @@ bool PixmapViewer::isAnimatedMimeType(const QString &mimeType)
         return QMovie::supportedFormats().contains(format);
     });
 }
+
+#include "moc_pixmapviewer.cpp"