diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,6 +87,7 @@
 add_definitions(
     -DQT_DEPRECATED_WARNINGS
     -DQT_DISABLE_DEPRECATED_BEFORE=0x050400
+    -DQT_NO_SIGNALS_SLOTS_KEYWORDS
     -DQT_NO_URL_CAST_FROM_STRING
     -DQT_STRICT_ITERATORS
     -DQT_USE_FAST_CONCATENATION
diff --git a/debugger/variable/variablecollection.h b/debugger/variable/variablecollection.h
--- a/debugger/variable/variablecollection.h
+++ b/debugger/variable/variablecollection.h
@@ -100,7 +100,7 @@
     void setChanged(bool c);
     void resetChanged();
 
-public slots:
+public Q_SLOTS:
     void die();
 
 protected:
diff --git a/debugger/variable/variabletooltip.h b/debugger/variable/variabletooltip.h
--- a/debugger/variable/variabletooltip.h
+++ b/debugger/variable/variabletooltip.h
@@ -43,7 +43,7 @@
         VariableToolTip(QWidget* parent, const QPoint& position,
                         const QString& identifier);
         Variable* variable() const { return m_var; };
-    private slots:
+    private Q_SLOTS:
         void variableCreated(bool hasValue);
         void slotLinkActivated(const QString& link);
         void slotRangeChanged(int min, int max);
diff --git a/debugger/variable/variablewidget.h b/debugger/variable/variablewidget.h
--- a/debugger/variable/variablewidget.h
+++ b/debugger/variable/variablewidget.h
@@ -78,7 +78,7 @@
     void contextMenuEvent(QContextMenuEvent* event) override;
     Variable *selectedVariable() const;
 
-private slots:
+private Q_SLOTS:
     void changeVariableFormat(int);
     void watchDelete();
     void copyVariableValue();
diff --git a/documentation/documentationview.h b/documentation/documentationview.h
--- a/documentation/documentationview.h
+++ b/documentation/documentationview.h
@@ -44,7 +44,7 @@
 
     void showDocumentation(const KDevelop::IDocumentation::Ptr& doc);
 
-public slots:
+public Q_SLOTS:
     void initialize();
 
     void addHistory(const KDevelop::IDocumentation::Ptr& doc);
@@ -84,7 +84,7 @@
     KDevelop::IDocumentationProvider* provider(int pos) const;
     int rowForProvider(KDevelop::IDocumentationProvider* provider);
 
-public slots:
+public Q_SLOTS:
     void unloaded(KDevelop::IPlugin* p);
     void loaded(KDevelop::IPlugin* p);
     void reloadProviders();
@@ -94,7 +94,7 @@
     void removeProvider(KDevelop::IDocumentationProvider* provider);
 
     QList<KDevelop::IDocumentationProvider*> mProviders;
-signals:
+Q_SIGNALS:
     void providersChanged();
 };
 
diff --git a/documentation/standarddocumentationview.h b/documentation/standarddocumentationview.h
--- a/documentation/standarddocumentationview.h
+++ b/documentation/standarddocumentationview.h
@@ -60,7 +60,7 @@
 Q_SIGNALS:
     void linkClicked(const QUrl &link);
 
-public slots:
+public Q_SLOTS:
     /**
      * Search for @p text in the documentation view.
      */
diff --git a/interfaces/iprojectprovider.h b/interfaces/iprojectprovider.h
--- a/interfaces/iprojectprovider.h
+++ b/interfaces/iprojectprovider.h
@@ -47,7 +47,7 @@
         /** @returns whether we have a correct location in the widget. */
         virtual bool isCorrect() const = 0;
 
-    signals:
+    Q_SIGNALS:
         void changed(const QString& name);
 };
 
diff --git a/interfaces/launchconfigurationtype.h b/interfaces/launchconfigurationtype.h
--- a/interfaces/launchconfigurationtype.h
+++ b/interfaces/launchconfigurationtype.h
@@ -139,7 +139,7 @@
      */
     virtual QMenu* launcherSuggestions() { return nullptr; }
 
-signals:
+Q_SIGNALS:
     void signalAddLaunchConfiguration(KDevelop::ILaunchConfiguration* launch);
 
 private:
diff --git a/language/assistant/staticassistantsmanager.h b/language/assistant/staticassistantsmanager.h
--- a/language/assistant/staticassistantsmanager.h
+++ b/language/assistant/staticassistantsmanager.h
@@ -64,7 +64,7 @@
 
     QVector<KDevelop::Problem::Ptr> problemsForContext(const ReferencedTopDUContext& top);
 
-signals:
+Q_SIGNALS:
     void problemsChanged(const IndexedString& url);
 
 private:
diff --git a/language/backgroundparser/documentchangetracker.h b/language/backgroundparser/documentchangetracker.h
--- a/language/backgroundparser/documentchangetracker.h
+++ b/language/backgroundparser/documentchangetracker.h
@@ -237,7 +237,7 @@
 
     void updateChangedRange(int delay);
     int recommendedDelay(KTextEditor::Document* doc, const KTextEditor::Range& range, const QString& text, bool removal);
-public slots:
+public Q_SLOTS:
     void textInserted(KTextEditor::Document* document, const KTextEditor::Cursor& position, const QString& inserted);
     void textRemoved(KTextEditor::Document* document, const KTextEditor::Range& range, const QString& oldText);
     void lineWrapped(KTextEditor::Document* document, const KTextEditor::Cursor& position);
diff --git a/language/backgroundparser/tests/test_backgroundparser.h b/language/backgroundparser/tests/test_backgroundparser.h
--- a/language/backgroundparser/tests/test_backgroundparser.h
+++ b/language/backgroundparser/tests/test_backgroundparser.h
@@ -74,7 +74,7 @@
 
     JobPrototype jobForUrl(const IndexedString& url);
 
-private slots:
+private Q_SLOTS:
     void updateReady(const KDevelop::IndexedString& url, const KDevelop::ReferencedTopDUContext& context);
     void parseJobCreated(KDevelop::ParseJob*);
 
@@ -90,7 +90,7 @@
 {
 Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
diff --git a/language/backgroundparser/tests/testlanguagesupport.h b/language/backgroundparser/tests/testlanguagesupport.h
--- a/language/backgroundparser/tests/testlanguagesupport.h
+++ b/language/backgroundparser/tests/testlanguagesupport.h
@@ -38,7 +38,7 @@
     KDevelop::ParseJob* createParseJob(const IndexedString& url) override;
     QString name() const override;
 
-signals:
+Q_SIGNALS:
     void aboutToCreateParseJob(const IndexedString& url, KDevelop::ParseJob** job);
     void parseJobCreated(KDevelop::ParseJob* job);
 };
diff --git a/language/codecompletion/codecompletion.h b/language/codecompletion/codecompletion.h
--- a/language/codecompletion/codecompletion.h
+++ b/language/codecompletion/codecompletion.h
@@ -59,7 +59,7 @@
      */
     void checkDocuments();
 
-  signals:
+  Q_SIGNALS:
     void registeredToView(KTextEditor::View* view);
     void unregisteredFromView(KTextEditor::View* view);
 
diff --git a/language/codegen/basicrefactoring.h b/language/codegen/basicrefactoring.h
--- a/language/codegen/basicrefactoring.h
+++ b/language/codegen/basicrefactoring.h
@@ -101,7 +101,7 @@
      */
     virtual bool shouldRenameFile(KDevelop::Declaration* declaration);
 
-public slots:
+public Q_SLOTS:
     void executeRenameAction();
 
 protected:
diff --git a/language/codegen/progressdialogs/refactoringdialog.h b/language/codegen/progressdialogs/refactoringdialog.h
--- a/language/codegen/progressdialogs/refactoringdialog.h
+++ b/language/codegen/progressdialogs/refactoringdialog.h
@@ -36,7 +36,7 @@
 public:
     RefactoringProgressDialog(const QString& action, UsesCollector* collector);
 
-private slots:
+private Q_SLOTS:
     void progress(uint done, uint max);
     void maximumProgress(uint max);
     void processUses(const KDevelop::ReferencedTopDUContext& context);
diff --git a/language/codegen/tests/test_documentchangeset.h b/language/codegen/tests/test_documentchangeset.h
--- a/language/codegen/tests/test_documentchangeset.h
+++ b/language/codegen/tests/test_documentchangeset.h
@@ -27,7 +27,7 @@
 class TestDocumentchangeset : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/language/codegen/tests/test_templateclassgenerator.h b/language/codegen/tests/test_templateclassgenerator.h
--- a/language/codegen/tests/test_templateclassgenerator.h
+++ b/language/codegen/tests/test_templateclassgenerator.h
@@ -37,7 +37,7 @@
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/language/codegen/tests/test_templaterenderer.h b/language/codegen/tests/test_templaterenderer.h
--- a/language/codegen/tests/test_templaterenderer.h
+++ b/language/codegen/tests/test_templaterenderer.h
@@ -33,7 +33,7 @@
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/language/codegen/tests/test_templatesmodel.h b/language/codegen/tests/test_templatesmodel.h
--- a/language/codegen/tests/test_templatesmodel.h
+++ b/language/codegen/tests/test_templatesmodel.h
@@ -31,7 +31,7 @@
 class TestTemplatesModel : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/language/duchain/navigation/abstractnavigationwidget.h b/language/duchain/navigation/abstractnavigationwidget.h
--- a/language/duchain/navigation/abstractnavigationwidget.h
+++ b/language/duchain/navigation/abstractnavigationwidget.h
@@ -53,7 +53,7 @@
 
       QSize sizeHint() const override;
 
-    public slots:
+    public Q_SLOTS:
       ///Keyboard-action "next"
       void next() override;
       ///Keyboard-action "previous"
diff --git a/language/duchain/navigation/problemnavigationcontext.h b/language/duchain/navigation/problemnavigationcontext.h
--- a/language/duchain/navigation/problemnavigationcontext.h
+++ b/language/duchain/navigation/problemnavigationcontext.h
@@ -48,7 +48,7 @@
 
     NavigationContextPointer executeKeyAction(QString key) override;
 
-public slots:
+public Q_SLOTS:
     void executeAction(int index); // TODO: Add API in base class?
 
   private:
diff --git a/language/duchain/navigation/usescollector.h b/language/duchain/navigation/usescollector.h
--- a/language/duchain/navigation/usescollector.h
+++ b/language/duchain/navigation/usescollector.h
@@ -88,7 +88,7 @@
             void progressSignal(uint, uint);
             ///@see processUses()
             void processUsesSignal(KDevelop::ReferencedTopDUContext);
-        private slots:
+        private Q_SLOTS:
             void updateReady(KDevelop::IndexedString url, KDevelop::ReferencedTopDUContext topContext);
         private:
             ///Called with every top-context that can contain uses of the declaration, or if setProcessDeclarations(false)
diff --git a/language/duchain/navigation/useswidget.h b/language/duchain/navigation/useswidget.h
--- a/language/duchain/navigation/useswidget.h
+++ b/language/duchain/navigation/useswidget.h
@@ -114,7 +114,7 @@
           TopContextUsesWidget(IndexedDeclaration declaration, QList<IndexedDeclaration> localDeclarations, IndexedTopDUContext topContext);
           void setExpanded(bool);
           int usesCount() const;
-        private slots:
+        private Q_SLOTS:
             void labelClicked();
         private:
             IndexedTopDUContext m_topContext;
@@ -154,7 +154,7 @@
             QLabel* m_headerLine;
             QSharedPointer<UsesWidgetCollector> m_collector;
             QProgressBar* m_progressBar;
-        public slots:
+        public Q_SLOTS:
             void headerLinkActivated(QString linkName);
             void redrawHeaderLine();
     };
diff --git a/language/duchain/tests/bench_hashes.h b/language/duchain/tests/bench_hashes.h
--- a/language/duchain/tests/bench_hashes.h
+++ b/language/duchain/tests/bench_hashes.h
@@ -30,7 +30,7 @@
 private:
   void feedData();
 
-private slots:
+private Q_SLOTS:
   void initTestCase();
   void cleanupTestCase();
 
diff --git a/language/duchain/tests/test_duchain.h b/language/duchain/tests/test_duchain.h
--- a/language/duchain/tests/test_duchain.h
+++ b/language/duchain/tests/test_duchain.h
@@ -30,7 +30,7 @@
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/language/duchain/tests/test_duchain.cpp b/language/duchain/tests/test_duchain.cpp
--- a/language/duchain/tests/test_duchain.cpp
+++ b/language/duchain/tests/test_duchain.cpp
@@ -606,7 +606,7 @@
 class TestWorker : public QObject
 {
   Q_OBJECT
-public slots:
+public Q_SLOTS:
   void lockForWrite()
   {
     for(int i = 0; i < 10000; ++i) {
diff --git a/language/duchain/tests/test_duchainshutdown.h b/language/duchain/tests/test_duchainshutdown.h
--- a/language/duchain/tests/test_duchainshutdown.h
+++ b/language/duchain/tests/test_duchainshutdown.h
@@ -31,7 +31,7 @@
 {
   Q_OBJECT
 
-private slots:
+private Q_SLOTS:
   void initTestCase();
   void cleanupTestCase();
 
diff --git a/language/duchain/tests/test_identifier.h b/language/duchain/tests/test_identifier.h
--- a/language/duchain/tests/test_identifier.h
+++ b/language/duchain/tests/test_identifier.h
@@ -27,7 +27,7 @@
 {
   Q_OBJECT
 
-private slots:
+private Q_SLOTS:
   void initTestCase();
   void cleanupTestCase();
 
diff --git a/language/duchain/tests/test_stringhelpers.h b/language/duchain/tests/test_stringhelpers.h
--- a/language/duchain/tests/test_stringhelpers.h
+++ b/language/duchain/tests/test_stringhelpers.h
@@ -27,7 +27,7 @@
 class TestDUChain : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void testFormatComment_data();
     void testFormatComment();
 
diff --git a/language/duchain/waitforupdate.h b/language/duchain/waitforupdate.h
--- a/language/duchain/waitforupdate.h
+++ b/language/duchain/waitforupdate.h
@@ -34,7 +34,7 @@
   public:
     WaitForUpdate();
 
-  public slots:
+  public Q_SLOTS:
     void updateReady(const KDevelop::IndexedString& url,
                      const KDevelop::ReferencedTopDUContext& topContext);
 
diff --git a/language/highlighting/colorcache.h b/language/highlighting/colorcache.h
--- a/language/highlighting/colorcache.h
+++ b/language/highlighting/colorcache.h
@@ -104,12 +104,12 @@
     /// access the foreground color
     QColor foregroundColor() const;
 
-  signals:
+  Q_SIGNALS:
     /// will be emitted whenever the colors got changed
     /// @see update()
     void colorsGotChanged();
 
-  private slots:
+  private Q_SLOTS:
     /// if necessary, adapt to the colors of this document
     void slotDocumentActivated();
     /// settings got changed, update to the settings of the sender
diff --git a/language/highlighting/tests/test_highlighting.h b/language/highlighting/tests/test_highlighting.h
--- a/language/highlighting/tests/test_highlighting.h
+++ b/language/highlighting/tests/test_highlighting.h
@@ -28,7 +28,7 @@
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/language/util/tests/test_kdevhash.cpp b/language/util/tests/test_kdevhash.cpp
--- a/language/util/tests/test_kdevhash.cpp
+++ b/language/util/tests/test_kdevhash.cpp
@@ -55,7 +55,7 @@
 class TestKDevHash : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void benchHash_int()
     {
         runBench<int>();
diff --git a/outputview/outputexecutejob.h b/outputview/outputexecutejob.h
--- a/outputview/outputexecutejob.h
+++ b/outputview/outputexecutejob.h
@@ -225,7 +225,7 @@
 protected:
     bool doKill() override;
 
-protected slots:
+protected Q_SLOTS:
     // Redefine these functions if you want to post-process the output somehow
     // before it hits the output model.
     // Default implementations for either function call "model()->appendLines( lines );".
diff --git a/outputview/outputmodel.h b/outputview/outputmodel.h
--- a/outputview/outputmodel.h
+++ b/outputview/outputmodel.h
@@ -78,7 +78,7 @@
     void ensureAllDone();
     void clear();
 
-signals:
+Q_SIGNALS:
     /// If the current filter strategy supports it, reports progress information
     void progress(const KDevelop::IFilterStrategy::Progress& progress);
     void allDone();
diff --git a/outputview/outputmodel.cpp b/outputview/outputmodel.cpp
--- a/outputview/outputmodel.cpp
+++ b/outputview/outputmodel.cpp
@@ -71,7 +71,7 @@
         connect(m_timer, &QTimer::timeout, this, &ParseWorker::process);
     }
 
-public slots:
+public Q_SLOTS:
     void changeFilterStrategy( KDevelop::IFilterStrategy* newFilterStrategy )
     {
         m_filter = QSharedPointer<IFilterStrategy>( newFilterStrategy );
@@ -97,12 +97,12 @@
         emit allDone();
     }
 
-signals:
+Q_SIGNALS:
     void parsedBatch(const QVector<KDevelop::FilteredItem>& filteredItems);
     void progress(const KDevelop::IFilterStrategy::Progress& progress);
     void allDone();
 
-private slots:
+private Q_SLOTS:
     /**
      * Process *all* cached lines, emit parsedBatch for each batch
      */
diff --git a/outputview/tests/test_filteringstrategy.h b/outputview/tests/test_filteringstrategy.h
--- a/outputview/tests/test_filteringstrategy.h
+++ b/outputview/tests/test_filteringstrategy.h
@@ -26,7 +26,7 @@
 class TestFilteringStrategy : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void testNoFilterStrategy_data();
     void testNoFilterStrategy();
     void testCompilerFilterStrategy_data();
diff --git a/outputview/tests/test_outputmodel.h b/outputview/tests/test_outputmodel.h
--- a/outputview/tests/test_outputmodel.h
+++ b/outputview/tests/test_outputmodel.h
@@ -31,7 +31,7 @@
 public:
     explicit TestOutputModel(QObject* parent = nullptr);
 
-private slots:
+private Q_SLOTS:
     void bench();
     void bench_data();
 };
diff --git a/plugins/appwizard/appwizarddialog.h b/plugins/appwizard/appwizarddialog.h
--- a/plugins/appwizard/appwizarddialog.h
+++ b/plugins/appwizard/appwizarddialog.h
@@ -48,7 +48,7 @@
 
     ApplicationInfo appInfo() const;
 
-private slots:
+private Q_SLOTS:
     void pageInValid( QWidget* w );
     void pageValid( QWidget* w );
     void next() override;
diff --git a/plugins/appwizard/appwizardplugin.h b/plugins/appwizard/appwizardplugin.h
--- a/plugins/appwizard/appwizardplugin.h
+++ b/plugins/appwizard/appwizardplugin.h
@@ -40,7 +40,7 @@
     void loadTemplate(const QString& fileName) override;
     void reload() override;
 
-private slots:
+private Q_SLOTS:
     void slotNewProject();
 
 private:
diff --git a/plugins/appwizard/projectselectionpage.h b/plugins/appwizard/projectselectionpage.h
--- a/plugins/appwizard/projectselectionpage.h
+++ b/plugins/appwizard/projectselectionpage.h
@@ -38,11 +38,11 @@
     QString selectedTemplate();
     QString projectName();
     QUrl location();
-signals:
+Q_SIGNALS:
     void locationChanged( const QUrl& );
     void valid();
     void invalid();
-private slots:
+private Q_SLOTS:
     void itemChanged( const QModelIndex& current );
     void urlEdited();
     void validateData();
diff --git a/plugins/appwizard/projectvcspage.h b/plugins/appwizard/projectvcspage.h
--- a/plugins/appwizard/projectvcspage.h
+++ b/plugins/appwizard/projectvcspage.h
@@ -44,10 +44,10 @@
     explicit ProjectVcsPage( KDevelop::IPluginController*, QWidget* parent = nullptr );
     ~ProjectVcsPage() override;
     bool shouldContinue() override;
-signals:
+Q_SIGNALS:
     void valid();
     void invalid();
-public slots:
+public Q_SLOTS:
     void setSourceLocation( const QUrl& );
     void vcsTypeChanged(int);
     void validateData();
diff --git a/plugins/bazaar/bazaarplugin.h b/plugins/bazaar/bazaarplugin.h
--- a/plugins/bazaar/bazaarplugin.h
+++ b/plugins/bazaar/bazaarplugin.h
@@ -67,7 +67,7 @@
     KDevelop::VcsLocationWidget* vcsLocation(QWidget* parent) const override;
     KDevelop::ContextMenuExtension contextMenuExtension(KDevelop::Context* context) override;
 
-private slots:
+private Q_SLOTS:
     void parseBzrStatus(KDevelop::DVcsJob* job);
     void parseBzrLog(KDevelop::DVcsJob* job);
     void parseBzrRoot(KDevelop::DVcsJob* job);
diff --git a/plugins/bazaar/bzrannotatejob.h b/plugins/bazaar/bzrannotatejob.h
--- a/plugins/bazaar/bzrannotatejob.h
+++ b/plugins/bazaar/bzrannotatejob.h
@@ -50,7 +50,7 @@
 protected:
     bool doKill() override;
 
-private slots:
+private Q_SLOTS:
     void parseBzrAnnotateOutput(KDevelop::DVcsJob* job);
     void parseNextLine();
     void prepareCommitInfo(std::size_t revision);
diff --git a/plugins/bazaar/copyjob.h b/plugins/bazaar/copyjob.h
--- a/plugins/bazaar/copyjob.h
+++ b/plugins/bazaar/copyjob.h
@@ -49,7 +49,7 @@
 protected:
     bool doKill() override;
 
-private slots:
+private Q_SLOTS:
     void finish(KJob*);
     void addToVcs(KIO::Job* job, const QUrl& from, const QUrl& to, const QDateTime& mtime, bool directory, bool renamed);
 
diff --git a/plugins/bazaar/diffjob.h b/plugins/bazaar/diffjob.h
--- a/plugins/bazaar/diffjob.h
+++ b/plugins/bazaar/diffjob.h
@@ -48,7 +48,7 @@
 protected:
     bool doKill() override;
 
-private slots:
+private Q_SLOTS:
     void prepareResult(KJob*);
 
 private:
diff --git a/plugins/bazaar/tests/test_bazaar.h b/plugins/bazaar/tests/test_bazaar.h
--- a/plugins/bazaar/tests/test_bazaar.h
+++ b/plugins/bazaar/tests/test_bazaar.h
@@ -47,7 +47,7 @@
     void prepareWhoamiInformations();
     void commitFiles();
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
diff --git a/plugins/codeutils/codeutilsplugin.h b/plugins/codeutils/codeutilsplugin.h
--- a/plugins/codeutils/codeutilsplugin.h
+++ b/plugins/codeutils/codeutilsplugin.h
@@ -35,7 +35,7 @@
     explicit CodeUtilsPlugin( QObject *parent, const QVariantList & = QVariantList() );
     ~CodeUtilsPlugin() override;
 
-private slots:
+private Q_SLOTS:
     void documentDeclaration();
 };
 
diff --git a/plugins/contextbrowser/browsemanager.h b/plugins/contextbrowser/browsemanager.h
--- a/plugins/contextbrowser/browsemanager.h
+++ b/plugins/contextbrowser/browsemanager.h
@@ -50,7 +50,7 @@
     ///Called for every added view. Reimplement this to catch them.
     virtual void viewAdded(KTextEditor::View*);
 
-private slots:
+private Q_SLOTS:
     void viewDestroyed(QObject* view);
     void viewCreated(KTextEditor::Document*, KTextEditor::View*);
     void documentCreated( KDevelop::IDocument* document );
@@ -89,10 +89,10 @@
         void startDelayedBrowsing(KTextEditor::View* view);
         void stopDelayedBrowsing();
         void invokeAction(int index);
-    public slots:
+    public Q_SLOTS:
         ///Enabled/disables the browsing mode
         void setBrowsing(bool);
-    private slots:
+    private Q_SLOTS:
         void eventuallyStartDelayedBrowsing();
     private:
         struct JumpLocation
diff --git a/plugins/contextbrowser/contextbrowser.h b/plugins/contextbrowser/contextbrowser.h
--- a/plugins/contextbrowser/contextbrowser.h
+++ b/plugins/contextbrowser/contextbrowser.h
@@ -155,7 +155,7 @@
 
     void colorSetupChanged();
 
-  private slots:
+  private Q_SLOTS:
     // history browsing
     void documentJumpPerformed( KDevelop::IDocument* newDocument,
                                 const KTextEditor::Cursor& newCursor,
diff --git a/plugins/cvs/checkoutdialog.h b/plugins/cvs/checkoutdialog.h
--- a/plugins/cvs/checkoutdialog.h
+++ b/plugins/cvs/checkoutdialog.h
@@ -31,7 +31,7 @@
     explicit CheckoutDialog(CvsPlugin* plugin, QWidget *parent=nullptr);
     ~CheckoutDialog() override;
 
-public slots:
+public Q_SLOTS:
     void accept() override;
     void jobFinished(KJob* job);
 
diff --git a/plugins/cvs/cvsgenericoutputview.h b/plugins/cvs/cvsgenericoutputview.h
--- a/plugins/cvs/cvsgenericoutputview.h
+++ b/plugins/cvs/cvsgenericoutputview.h
@@ -34,7 +34,7 @@
     explicit CvsGenericOutputView(CvsJob* job = nullptr, QWidget* parent = nullptr);
     ~CvsGenericOutputView() override;
 
-public slots:
+public Q_SLOTS:
     void appendText(const QString& text);
     void slotJobFinished(KJob* job);
 };
diff --git a/plugins/cvs/cvsmainview.h b/plugins/cvs/cvsmainview.h
--- a/plugins/cvs/cvsmainview.h
+++ b/plugins/cvs/cvsmainview.h
@@ -39,7 +39,7 @@
     CvsMainView(CvsPlugin *plugin, QWidget* parent);
     ~CvsMainView() override;
 
-public slots:
+public Q_SLOTS:
     /**
      * Inserts @p tag into the QTabWidget and calls it @p label .
      * This slot gets connected to CvsPlugin::addNewTabToMainView().
diff --git a/plugins/cvs/cvsplugin.h b/plugins/cvs/cvsplugin.h
--- a/plugins/cvs/cvsplugin.h
+++ b/plugins/cvs/cvsplugin.h
@@ -102,7 +102,7 @@
 
     const QUrl urlFocusedDocument() const;
     KDevelop::VcsLocationWidget* vcsLocation(QWidget* parent) const override;
-public slots:
+public Q_SLOTS:
     // slots for context menu
     void ctxEdit();
     void ctxUnEdit();
@@ -113,7 +113,7 @@
     void slotCheckout();
     void slotStatus();
 
-signals:
+Q_SIGNALS:
     /**
      * Some actions like commit, add, remove... will connect the job's
      * result() signal to this signal. Anybody, like for instance the
diff --git a/plugins/cvs/editorsview.h b/plugins/cvs/editorsview.h
--- a/plugins/cvs/editorsview.h
+++ b/plugins/cvs/editorsview.h
@@ -60,7 +60,7 @@
     static void parseOutput(const QString& jobOutput,
                             QMultiMap<QString,CvsLocker>& editorsInfo);
 
-private slots:
+private Q_SLOTS:
     /**
      * Connect a job's result() signal to this slot. When called, the output from the job
      * will be passed to the parseOutput() method and any found locker information will be
diff --git a/plugins/cvs/importdialog.h b/plugins/cvs/importdialog.h
--- a/plugins/cvs/importdialog.h
+++ b/plugins/cvs/importdialog.h
@@ -31,7 +31,7 @@
     ImportDialog(CvsPlugin *plugin, const QUrl &url, QWidget* parent=nullptr);
     ~ImportDialog() override;
 
-public slots:
+public Q_SLOTS:
     void accept() override;
     void jobFinished(KJob* job);
 
diff --git a/plugins/cvs/tests/test_cvs.h b/plugins/cvs/tests/test_cvs.h
--- a/plugins/cvs/tests/test_cvs.h
+++ b/plugins/cvs/tests/test_cvs.h
@@ -24,7 +24,7 @@
     void importTestData();
     void checkoutTestData();
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/plugins/documentswitcher/documentswitcherplugin.h b/plugins/documentswitcher/documentswitcherplugin.h
--- a/plugins/documentswitcher/documentswitcherplugin.h
+++ b/plugins/documentswitcher/documentswitcherplugin.h
@@ -45,10 +45,10 @@
     ~DocumentSwitcherPlugin() override;
 
     void unload() override;
-public slots:
+public Q_SLOTS:
     void itemActivated( const QModelIndex& );
     void switchToClicked(const QModelIndex& );
-private slots:
+private Q_SLOTS:
     void addView( Sublime::View* );
     void changeView( Sublime::View* );
     void addMainWindow( Sublime::MainWindow* );
diff --git a/plugins/documentview/kdevdocumentselection.h b/plugins/documentview/kdevdocumentselection.h
--- a/plugins/documentview/kdevdocumentselection.h
+++ b/plugins/documentview/kdevdocumentselection.h
@@ -29,7 +29,7 @@
     explicit KDevDocumentSelection( QAbstractItemModel* model );
     ~KDevDocumentSelection() override;
 
-public slots:
+public Q_SLOTS:
     void select( const QModelIndex & index,
                          QItemSelectionModel::SelectionFlags command ) override;
     void select( const QItemSelection & selection,
diff --git a/plugins/documentview/kdevdocumentview.h b/plugins/documentview/kdevdocumentview.h
--- a/plugins/documentview/kdevdocumentview.h
+++ b/plugins/documentview/kdevdocumentview.h
@@ -50,13 +50,13 @@
 
     KDevDocumentViewPlugin *plugin() const;
 
-signals:
+Q_SIGNALS:
     void activateURL( const QUrl &url );
 
-public slots:
+public Q_SLOTS:
     void opened( KDevelop::IDocument* document );
 
-private slots:
+private Q_SLOTS:
     void activated( KDevelop::IDocument* document );
     void saved( KDevelop::IDocument* document );
     void closed( KDevelop::IDocument* document );
diff --git a/plugins/documentview/settings/preferences.h b/plugins/documentview/settings/preferences.h
--- a/plugins/documentview/settings/preferences.h
+++ b/plugins/documentview/settings/preferences.h
@@ -39,7 +39,7 @@
     virtual void load();
     virtual void defaults();
 
-private slots:
+private Q_SLOTS:
     void slotSettingsChanged();
 
 private:
diff --git a/plugins/execute/nativeappconfig.h b/plugins/execute/nativeappconfig.h
--- a/plugins/execute/nativeappconfig.h
+++ b/plugins/execute/nativeappconfig.h
@@ -38,7 +38,7 @@
     void saveToConfiguration( KConfigGroup cfg, KDevelop::IProject* project = nullptr ) const override;
     QString title() const override;
     QIcon icon() const override;
-private slots:
+private Q_SLOTS:
     void activateDeps( int );
 };
 
@@ -87,7 +87,7 @@
 private:
     QList<KDevelop::LaunchConfigurationPageFactory*> factoryList;
 
-public slots:
+public Q_SLOTS:
     void suggestionTriggered();
 };
 #endif
diff --git a/plugins/executescript/scriptappjob.h b/plugins/executescript/scriptappjob.h
--- a/plugins/executescript/scriptappjob.h
+++ b/plugins/executescript/scriptappjob.h
@@ -43,7 +43,7 @@
     void start() override;
     bool doKill() override;
     KDevelop::OutputModel* model();
-private slots:
+private Q_SLOTS:
     void processError(QProcess::ProcessError);
     void processFinished(int,QProcess::ExitStatus);
 private:
diff --git a/plugins/externalscript/editexternalscript.h b/plugins/externalscript/editexternalscript.h
--- a/plugins/externalscript/editexternalscript.h
+++ b/plugins/externalscript/editexternalscript.h
@@ -36,7 +36,7 @@
   explicit EditExternalScript(ExternalScriptItem* item, QWidget* parent = nullptr);
   ~EditExternalScript() override;
 
-private slots:
+private Q_SLOTS:
   void save();
   void validate();
 
diff --git a/plugins/externalscript/externalscriptjob.h b/plugins/externalscript/externalscriptjob.h
--- a/plugins/externalscript/externalscriptjob.h
+++ b/plugins/externalscript/externalscriptjob.h
@@ -56,7 +56,7 @@
 protected:
   bool doKill() override;
 
-private slots:
+private Q_SLOTS:
   void processError( QProcess::ProcessError );
   void processFinished( int, QProcess::ExitStatus );
 
diff --git a/plugins/externalscript/externalscriptplugin.h b/plugins/externalscript/externalscriptplugin.h
--- a/plugins/externalscript/externalscriptplugin.h
+++ b/plugins/externalscript/externalscriptplugin.h
@@ -70,7 +70,7 @@
 
   void saveItem(const ExternalScriptItem* item);
 
-public slots:
+public Q_SLOTS:
   void executeScriptFromActionData() const;
 
   /**
@@ -83,7 +83,7 @@
    * */
   Q_SCRIPTABLE QString executeCommandSync(QString command, QString workingDirectory) const;
   
-private slots:
+private Q_SLOTS:
   void rowsRemoved( const QModelIndex& parent, int start, int end );
   void rowsInserted( const QModelIndex& parent, int start, int end );
   void executeScriptFromContextMenu() const;
diff --git a/plugins/externalscript/externalscriptview.h b/plugins/externalscript/externalscriptview.h
--- a/plugins/externalscript/externalscriptview.h
+++ b/plugins/externalscript/externalscriptview.h
@@ -45,7 +45,7 @@
   /// @return Item for @p index.
   ExternalScriptItem* itemForIndex(const QModelIndex& index) const;
 
-private slots:
+private Q_SLOTS:
   void contextMenu ( const QPoint& pos );
 
   void addScript();
diff --git a/plugins/filemanager/filemanager.h b/plugins/filemanager/filemanager.h
--- a/plugins/filemanager/filemanager.h
+++ b/plugins/filemanager/filemanager.h
@@ -44,7 +44,7 @@
     KDirOperator* dirOperator() const;
     KDevFileManagerPlugin* plugin() const;
 
-private slots:
+private Q_SLOTS:
     void fileCreated(KJob *job);
     void openFile(const KFileItem&);
     void gotoUrl(const QUrl&);
diff --git a/plugins/filemanager/kdevfilemanagerplugin.h b/plugins/filemanager/kdevfilemanagerplugin.h
--- a/plugins/filemanager/kdevfilemanagerplugin.h
+++ b/plugins/filemanager/kdevfilemanagerplugin.h
@@ -31,7 +31,7 @@
     ~KDevFileManagerPlugin() override;
 
     void unload() override;
-private slots:
+private Q_SLOTS:
     void init();
 
 private:
diff --git a/plugins/filetemplates/filetemplatesplugin.h b/plugins/filetemplates/filetemplatesplugin.h
--- a/plugins/filetemplates/filetemplatesplugin.h
+++ b/plugins/filetemplates/filetemplatesplugin.h
@@ -47,7 +47,7 @@
     KDevelop::TemplatesModel* m_model;
     KDevelop::IToolViewFactory* m_toolView;
 
-public slots:
+public Q_SLOTS:
     void createFromTemplate();
     void previewTemplate();
 };
diff --git a/plugins/filetemplates/templatepreviewtoolview.h b/plugins/filetemplates/templatepreviewtoolview.h
--- a/plugins/filetemplates/templatepreviewtoolview.h
+++ b/plugins/filetemplates/templatepreviewtoolview.h
@@ -56,13 +56,13 @@
     FileTemplatesPlugin* m_plugin;
     KDevelop::TemplateRenderer::EmptyLinesPolicy m_policy;
 
-private slots:
+private Q_SLOTS:
     void sourceTextChanged(const QString& text);
 
 protected:
     void showEvent(QShowEvent*) override;
 
-public slots:
+public Q_SLOTS:
     void documentActivated(KDevelop::IDocument* document);
     void documentChanged(KTextEditor::Document* textDocument);
     void documentClosed(KDevelop::IDocument* document);
diff --git a/plugins/filetemplates/tests/data/testgenerationtest/templates/test_qtestlib/class.h b/plugins/filetemplates/tests/data/testgenerationtest/templates/test_qtestlib/class.h
--- a/plugins/filetemplates/tests/data/testgenerationtest/templates/test_qtestlib/class.h
+++ b/plugins/filetemplates/tests/data/testgenerationtest/templates/test_qtestlib/class.h
@@ -15,7 +15,7 @@
 class {{ name }} : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/plugins/filetemplates/tests/expected/testname.h b/plugins/filetemplates/tests/expected/testname.h
--- a/plugins/filetemplates/tests/expected/testname.h
+++ b/plugins/filetemplates/tests/expected/testname.h
@@ -11,7 +11,7 @@
 class TestName : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/plugins/filetemplates/tests/test_generationtest.h b/plugins/filetemplates/tests/test_generationtest.h
--- a/plugins/filetemplates/tests/test_generationtest.h
+++ b/plugins/filetemplates/tests/test_generationtest.h
@@ -18,7 +18,7 @@
 class TestGenerationTest : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/plugins/genericprojectmanager/test/test_projectload.h b/plugins/genericprojectmanager/test/test_projectload.h
--- a/plugins/genericprojectmanager/test/test_projectload.h
+++ b/plugins/genericprojectmanager/test/test_projectload.h
@@ -31,7 +31,7 @@
 {
 Q_OBJECT
 
-private slots:
+private Q_SLOTS:
   void initTestCase();
   void cleanupTestCase();
   void init();
diff --git a/plugins/git/gitclonejob.h b/plugins/git/gitclonejob.h
--- a/plugins/git/gitclonejob.h
+++ b/plugins/git/gitclonejob.h
@@ -29,7 +29,7 @@
     public:
         GitCloneJob(const QDir& d, KDevelop::IPlugin* parent, KDevelop::OutputJob::OutputJobVerbosity verbosity = KDevelop::OutputJob::Verbose);
 
-    public slots:
+    public Q_SLOTS:
         void processResult();
 
     private:
diff --git a/plugins/git/gitnameemaildialog.h b/plugins/git/gitnameemaildialog.h
--- a/plugins/git/gitnameemaildialog.h
+++ b/plugins/git/gitnameemaildialog.h
@@ -40,7 +40,7 @@
 
     bool isGlobal() const;
 
-private slots:
+private Q_SLOTS:
     void updateUi();
 
 private:
diff --git a/plugins/git/gitplugin.h b/plugins/git/gitplugin.h
--- a/plugins/git/gitplugin.h
+++ b/plugins/git/gitplugin.h
@@ -49,7 +49,7 @@
         JobStatus status() const override { return m_status; }
         KDevelop::IPlugin* vcsPlugin() const override { return m_plugin; }
         
-    public slots:
+    public Q_SLOTS:
         void result(KJob*);
     
     private:
@@ -173,7 +173,7 @@
                          const QStringList &args,
                          KDevelop::OutputJob::OutputJobVerbosity verbosity = KDevelop::OutputJob::Silent);
 
-private slots:
+private Q_SLOTS:
     void parseGitBlameOutput(KDevelop::DVcsJob *job);
     void parseGitLogOutput(KDevelop::DVcsJob *job);
     void parseGitDiffOutput(KDevelop::DVcsJob* job);
@@ -191,7 +191,7 @@
     void fileChanged(const QString& file);
     void delayedBranchChanged();
 
-signals:
+Q_SIGNALS:
     void repositoryBranchChanged(const QUrl& repository);
 
 private:
diff --git a/plugins/git/gitplugincheckinrepositoryjob.h b/plugins/git/gitplugincheckinrepositoryjob.h
--- a/plugins/git/gitplugincheckinrepositoryjob.h
+++ b/plugins/git/gitplugincheckinrepositoryjob.h
@@ -32,7 +32,7 @@
     ~GitPluginCheckInRepositoryJob() override;
     void start() override;
 
-private slots:
+private Q_SLOTS:
     void repositoryQueryFinished(int);
     void processFailed(QProcess::ProcessError);
 
diff --git a/plugins/git/stashmanagerdialog.h b/plugins/git/stashmanagerdialog.h
--- a/plugins/git/stashmanagerdialog.h
+++ b/plugins/git/stashmanagerdialog.h
@@ -37,7 +37,7 @@
         explicit StashManagerDialog(const QDir& stashed, GitPlugin* plugin, QWidget* parent);
         ~StashManagerDialog() override;
         
-    public slots:
+    public Q_SLOTS:
         void showStash();
         void applyClicked();
         void branchClicked();
@@ -61,7 +61,7 @@
     public:
         explicit StashModel(const QDir& dir, GitPlugin* git, QObject* parent = nullptr);
         
-    private slots:
+    private Q_SLOTS:
         void stashListReady(KJob*);
 };
 
diff --git a/plugins/git/stashpatchsource.h b/plugins/git/stashpatchsource.h
--- a/plugins/git/stashpatchsource.h
+++ b/plugins/git/stashpatchsource.h
@@ -47,7 +47,7 @@
     bool canSelectFiles() const override { return true; };
     uint depth() const override { return 1; }
 
-private slots:
+private Q_SLOTS:
     void updatePatchFile(KDevelop::VcsJob* job);
 
 private:
diff --git a/plugins/git/tests/test_git.h b/plugins/git/tests/test_git.h
--- a/plugins/git/tests/test_git.h
+++ b/plugins/git/tests/test_git.h
@@ -43,7 +43,7 @@
     void addFiles();
     void commitFiles();
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
diff --git a/plugins/grepview/grepoutputmodel.h b/plugins/grepview/grepoutputmodel.h
--- a/plugins/grepview/grepoutputmodel.h
+++ b/plugins/grepview/grepoutputmodel.h
@@ -105,7 +105,7 @@
     KDevelop::IStatus *m_savedIStatus;
     bool m_itemsCheckable;
 
-private slots:
+private Q_SLOTS:
     void updateCheckState(QStandardItem*);
 };
 
diff --git a/plugins/grepview/grepoutputview.h b/plugins/grepview/grepoutputview.h
--- a/plugins/grepview/grepoutputview.h
+++ b/plugins/grepview/grepoutputview.h
@@ -82,7 +82,7 @@
     QLabel*  m_statusLabel;
     GrepViewPlugin *m_plugin;
     
-private slots:
+private Q_SLOTS:
     void selectPreviousItem() override;
     void selectNextItem() override;
     void collapseAllItems();
diff --git a/plugins/grepview/tests/test_findreplace.h b/plugins/grepview/tests/test_findreplace.h
--- a/plugins/grepview/tests/test_findreplace.h
+++ b/plugins/grepview/tests/test_findreplace.h
@@ -44,7 +44,7 @@
 private:
     GrepViewPlugin* m_plugin;
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/plugins/konsole/kdevkonsoleview.h b/plugins/konsole/kdevkonsoleview.h
--- a/plugins/konsole/kdevkonsoleview.h
+++ b/plugins/konsole/kdevkonsoleview.h
@@ -25,7 +25,7 @@
     explicit KDevKonsoleView( KDevKonsoleViewPlugin* plugin, QWidget *parent = nullptr );
     ~KDevKonsoleView() override;
 
-public slots:
+public Q_SLOTS:
     void setDirectory( const QUrl &dirUrl );
 
 protected:
diff --git a/plugins/openwith/openwithplugin.h b/plugins/openwith/openwithplugin.h
--- a/plugins/openwith/openwithplugin.h
+++ b/plugins/openwith/openwithplugin.h
@@ -48,7 +48,7 @@
 protected:
     void openFilesInternal( const QList<QUrl>& files ) override;
 
-private slots:
+private Q_SLOTS:
     void open( const QString& storageId );
     void openService( const KService::Ptr& service );
     void openDefault();
diff --git a/plugins/outlineview/outlinemodel.h b/plugins/outlineview/outlinemodel.h
--- a/plugins/outlineview/outlinemodel.h
+++ b/plugins/outlineview/outlinemodel.h
@@ -49,9 +49,9 @@
     bool hasChildren(const QModelIndex& parent = QModelIndex()) const override;
     Qt::ItemFlags flags(const QModelIndex& index) const override;
 
-public slots:
+public Q_SLOTS:
     void activate(const QModelIndex& realIndex);
-private slots:
+private Q_SLOTS:
     void rebuildOutline(KDevelop::IDocument* doc);
 private:
     std::unique_ptr<OutlineNode> m_rootNode;
diff --git a/plugins/outlineview/outlinewidget.h b/plugins/outlineview/outlinewidget.h
--- a/plugins/outlineview/outlinewidget.h
+++ b/plugins/outlineview/outlinewidget.h
@@ -46,7 +46,7 @@
     QAction* m_sortAlphabeticallyAction;
 
     Q_DISABLE_COPY(OutlineWidget)
-public slots:
+public Q_SLOTS:
     void activated(const QModelIndex& index);
     void expandFirstLevel();
 };
diff --git a/plugins/patchreview/CMakeLists.txt b/plugins/patchreview/CMakeLists.txt
--- a/plugins/patchreview/CMakeLists.txt
+++ b/plugins/patchreview/CMakeLists.txt
@@ -11,6 +11,12 @@
 kde_enable_exceptions()
 include_directories(${LIBKOMPAREDIFF2_INCLUDE_DIR})
 
+if(LibKompareDiff2_VERSION VERSION_LESS 5.1)
+    remove_definitions(
+        -DQT_NO_SIGNALS_SLOTS_KEYWORDS
+    )
+endif()
+
 set(patchreview_PART_SRCS
     patchreview.cpp
     patchhighlighter.cpp
diff --git a/plugins/patchreview/localpatchsource.h b/plugins/patchreview/localpatchsource.h
--- a/plugins/patchreview/localpatchsource.h
+++ b/plugins/patchreview/localpatchsource.h
@@ -74,7 +74,7 @@
 public:
     LocalPatchWidget(LocalPatchSource* lpatch, QWidget* parent);
 
-public slots:
+public Q_SLOTS:
     void updatePatchFromEdit();
     void syncPatch();
 
diff --git a/plugins/patchreview/patchhighlighter.h b/plugins/patchreview/patchhighlighter.h
--- a/plugins/patchreview/patchhighlighter.h
+++ b/plugins/patchreview/patchhighlighter.h
@@ -51,7 +51,7 @@
     ~PatchHighlighter() override;
     KDevelop::IDocument* doc();
     QList< KTextEditor::MovingRange* > ranges() const;
-private slots:
+private Q_SLOTS:
     void documentDestroyed();
     void aboutToDeleteMovingInterfaceContent( KTextEditor::Document* );
 private:
@@ -71,7 +71,7 @@
     PatchReviewPlugin* m_plugin;
     Diff2::DiffModel* m_model;
     bool m_applying;
-public slots:
+public Q_SLOTS:
     void markToolTipRequested( KTextEditor::Document*, const KTextEditor::Mark&, QPoint, bool & );
     void showToolTipForMark( QPoint arg1, KTextEditor::MovingRange* arg2);
     bool isRemoval( Diff2::Difference* );
diff --git a/plugins/patchreview/patchreviewtoolview.h b/plugins/patchreview/patchreviewtoolview.h
--- a/plugins/patchreview/patchreviewtoolview.h
+++ b/plugins/patchreview/patchreviewtoolview.h
@@ -43,10 +43,10 @@
     // ensuring that the tabs are sorted correctly
     void open( const QUrl& url, bool activate ) const;
 
-signals:
+Q_SIGNALS:
     void dialogClosed( PatchReviewToolView* );
     void  stateChanged( PatchReviewToolView* );
-private slots:
+private Q_SLOTS:
 
     void startingNewReview();
 
@@ -102,7 +102,7 @@
     class PatchFilesModel* m_fileModel;
     QSortFilterProxyModel* m_fileSortProxyModel;
 
-public slots:
+public Q_SLOTS:
     void documentActivated( KDevelop::IDocument* );
     void customContextMenuRequested(const QPoint& p);
     void testJobResult(KJob* job);
diff --git a/plugins/patchreview/patchreviewtoolview.cpp b/plugins/patchreview/patchreviewtoolview.cpp
--- a/plugins/patchreview/patchreviewtoolview.cpp
+++ b/plugins/patchreview/patchreviewtoolview.cpp
@@ -59,7 +59,7 @@
     PatchFilesModel( QObject *parent, bool allowSelection ) : VcsFileChangesModel( parent, allowSelection ) { };
     enum ItemRoles { HunksNumberRole = LastItemRole+1 };
 
-public slots:
+public Q_SLOTS:
     void updateState( const KDevelop::VcsStatusInfo &status, unsigned hunksNum ) {
         int row = VcsFileChangesModel::updateState( invisibleRootItem(), status );
         if ( row == -1 )
diff --git a/plugins/perforce/perforceplugin.h b/plugins/perforce/perforceplugin.h
--- a/plugins/perforce/perforceplugin.h
+++ b/plugins/perforce/perforceplugin.h
@@ -140,7 +140,7 @@
 //   void ctxLocalRevision();
 //   void ctxImport();
 
-private slots:
+private Q_SLOTS:
     void parseP4StatusOutput(KDevelop::DVcsJob* job);
     void parseP4DiffOutput(KDevelop::DVcsJob* job);
     void parseP4LogOutput(KDevelop::DVcsJob* job);
diff --git a/plugins/perforce/test/test_perforce.h b/plugins/perforce/test/test_perforce.h
--- a/plugins/perforce/test/test_perforce.h
+++ b/plugins/perforce/test/test_perforce.h
@@ -34,7 +34,7 @@
 class PerforcePluginTest : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void init();
     void cleanup();
     void testAdd();
diff --git a/plugins/problemreporter/problemhighlighter.h b/plugins/problemreporter/problemhighlighter.h
--- a/plugins/problemreporter/problemhighlighter.h
+++ b/plugins/problemreporter/problemhighlighter.h
@@ -37,16 +37,16 @@
 
     void setProblems(const QVector<KDevelop::IProblem::Ptr>& problems);
 
-private slots:
+private Q_SLOTS:
     void aboutToRemoveText(const KTextEditor::Range& range);
     void clearProblems();
 
 private:
     QPointer<KTextEditor::Document> m_document;
     QList<KTextEditor::MovingRange*> m_topHLRanges;
     QVector<KDevelop::IProblem::Ptr> m_problems;
 
-public slots:
+public Q_SLOTS:
     void settingsChanged();
 };
 
diff --git a/plugins/problemreporter/problemreporterplugin.h b/plugins/problemreporter/problemreporterplugin.h
--- a/plugins/problemreporter/problemreporterplugin.h
+++ b/plugins/problemreporter/problemreporterplugin.h
@@ -74,7 +74,7 @@
 
     QHash<KDevelop::IndexedString, ProblemHighlighter*> m_highlighters;
     QSet<KDevelop::IndexedString> m_reHighlightNeeded;
-public slots:
+public Q_SLOTS:
     void documentClosed(KDevelop::IDocument*);
 };
 
diff --git a/plugins/problemreporter/problemtreeview.h b/plugins/problemreporter/problemtreeview.h
--- a/plugins/problemreporter/problemtreeview.h
+++ b/plugins/problemreporter/problemtreeview.h
@@ -52,17 +52,17 @@
 
     int setFilter(const QString& filterText);
 
-public slots:
+public Q_SLOTS:
     void openDocumentForCurrentProblem();
 
-signals:
+Q_SIGNALS:
     // Emitted when the model's rows change (added/removed/reset)
     void changed();
 
 protected:
     void showEvent(QShowEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     void itemActivated(const QModelIndex& index);
 
 private:
diff --git a/plugins/problemreporter/tests/test_problemsview.cpp b/plugins/problemreporter/tests/test_problemsview.cpp
--- a/plugins/problemreporter/tests/test_problemsview.cpp
+++ b/plugins/problemreporter/tests/test_problemsview.cpp
@@ -36,7 +36,7 @@
 class TestProblemsView : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/plugins/projectfilter/projectfilterconfigpage.h b/plugins/projectfilter/projectfilterconfigpage.h
--- a/plugins/projectfilter/projectfilterconfigpage.h
+++ b/plugins/projectfilter/projectfilterconfigpage.h
@@ -49,7 +49,7 @@
 protected:
     bool eventFilter(QObject* object, QEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     void add();
     void remove();
     void moveUp();
diff --git a/plugins/projectfilter/projectfilterprovider.h b/plugins/projectfilter/projectfilterprovider.h
--- a/plugins/projectfilter/projectfilterprovider.h
+++ b/plugins/projectfilter/projectfilterprovider.h
@@ -46,13 +46,13 @@
     int perProjectConfigPages() const override;
     ConfigPage* perProjectConfigPage(int number, const ProjectConfigOptions& options, QWidget* parent) override;
 
-signals:
+Q_SIGNALS:
     void filterChanged(KDevelop::IProjectFilterProvider*, KDevelop::IProject*);
 
-public slots:
+public Q_SLOTS:
     void updateProjectFilters(KDevelop::IProject* project);
 
-private slots:
+private Q_SLOTS:
     void projectClosing(KDevelop::IProject*);
     void projectAboutToBeOpened(KDevelop::IProject*);
 
diff --git a/plugins/projectfilter/tests/test_projectfilter.h b/plugins/projectfilter/tests/test_projectfilter.h
--- a/plugins/projectfilter/tests/test_projectfilter.h
+++ b/plugins/projectfilter/tests/test_projectfilter.h
@@ -27,7 +27,7 @@
 class TestProjectFilter : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/plugins/projectmanagerview/projectbuildsetwidget.h b/plugins/projectmanagerview/projectbuildsetwidget.h
--- a/plugins/projectmanagerview/projectbuildsetwidget.h
+++ b/plugins/projectmanagerview/projectbuildsetwidget.h
@@ -43,9 +43,9 @@
     explicit ProjectBuildSetWidget( QWidget* parent = nullptr );
     ~ProjectBuildSetWidget() override;
     void setProjectView( ProjectManagerView* view );
-public slots:
+public Q_SLOTS:
     void selectionChanged();
-private slots:
+private Q_SLOTS:
     void addItems();
     void removeItems();
     void moveUp();
diff --git a/plugins/projectmanagerview/projectmanagerview.h b/plugins/projectmanagerview/projectmanagerview.h
--- a/plugins/projectmanagerview/projectmanagerview.h
+++ b/plugins/projectmanagerview/projectmanagerview.h
@@ -71,7 +71,7 @@
 protected:
     bool eventFilter(QObject* obj, QEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     void selectionChanged();
     void locateCurrentDocument();
     void updateSyncAction();
diff --git a/plugins/projectmanagerview/vcsoverlayproxymodel.h b/plugins/projectmanagerview/vcsoverlayproxymodel.h
--- a/plugins/projectmanagerview/vcsoverlayproxymodel.h
+++ b/plugins/projectmanagerview/vcsoverlayproxymodel.h
@@ -40,7 +40,7 @@
 
         QVariant data(const QModelIndex& proxyIndex, int role = Qt::DisplayRole) const override;
 
-    private slots:
+    private Q_SLOTS:
         void addProject(KDevelop::IProject* p);
         void removeProject(KDevelop::IProject* p);
         void repositoryBranchChanged(const QUrl& url);
diff --git a/plugins/quickopen/expandingtree/expandingwidgetmodel.h b/plugins/quickopen/expandingtree/expandingwidgetmodel.h
--- a/plugins/quickopen/expandingtree/expandingwidgetmodel.h
+++ b/plugins/quickopen/expandingtree/expandingwidgetmodel.h
@@ -123,7 +123,7 @@
 
     ///Returns the match-color for the given index, or zero if match-quality could not be computed.
     uint matchColor(const QModelIndex& index) const;
-public slots:
+public Q_SLOTS:
     ///Place or hides all expanding-widgets to the correct positions. Should be called after the view was scrolled.
     void placeExpandingWidgets();
 protected:
diff --git a/plugins/quickopen/projectfilequickopen.h b/plugins/quickopen/projectfilequickopen.h
--- a/plugins/quickopen/projectfilequickopen.h
+++ b/plugins/quickopen/projectfilequickopen.h
@@ -119,7 +119,7 @@
     ProjectFileDataProvider();
     void reset() override;
     QSet<KDevelop::IndexedString> files() const override;
-private slots:
+private Q_SLOTS:
     void projectClosing(KDevelop::IProject*);
     void projectOpened(KDevelop::IProject*);
     void fileAddedToSet(KDevelop::ProjectFileItem*);
diff --git a/plugins/quickopen/quickopenmodel.h b/plugins/quickopen/quickopenmodel.h
--- a/plugins/quickopen/quickopenmodel.h
+++ b/plugins/quickopen/quickopenmodel.h
@@ -88,9 +88,9 @@
 
     ///This value will be added to the height of all created expanding-widgets
     void setExpandingWidgetHeightIncrease(int pixels);
-public slots:
+public Q_SLOTS:
     void textChanged(const QString& str);
-private slots:
+private Q_SLOTS:
     void destroyed(QObject* obj);
     void resetTimer();
     void restart_internal(bool keepFilterText);
diff --git a/plugins/quickopen/quickopenplugin.h b/plugins/quickopen/quickopenplugin.h
--- a/plugins/quickopen/quickopenplugin.h
+++ b/plugins/quickopen/quickopenplugin.h
@@ -86,7 +86,7 @@
     QuickOpenLineEdit* createQuickOpenLineWidget();
 
     KDevelop::IQuickOpenLine* createQuickOpenLine(const QStringList& scopes, const QStringList& type, QuickOpenType kind) override;
-public slots:
+public Q_SLOTS:
     void quickOpen();
     void quickOpenFile();
     void quickOpenFunction();
@@ -100,7 +100,7 @@
 
     void previousFunction();
     void nextFunction();
-private slots:
+private Q_SLOTS:
     void storeScopes(const QStringList&);
     void storeItems(const QStringList&);
 private:
@@ -149,7 +149,7 @@
         m_defaultText = text;
         setPlaceholderText(m_defaultText);
     }
-private slots:
+private Q_SLOTS:
     void activate();
     void deactivate();
     void checkFocus();
diff --git a/plugins/quickopen/quickopenwidget.h b/plugins/quickopen/quickopenwidget.h
--- a/plugins/quickopen/quickopenwidget.h
+++ b/plugins/quickopen/quickopenwidget.h
@@ -59,11 +59,11 @@
     //Shows OK + Cancel. By default they are hidden
     void showStandardButtons(bool show);
     void showSearchField(bool show);
-signals:
+Q_SIGNALS:
     void scopesChanged(const QStringList& scopes);
     void itemsChanged(const QStringList& scopes);
     void ready();
-private slots:
+private Q_SLOTS:
     void callRowSelected();
 
     void updateTimerInterval(bool cheapFilterChange);
diff --git a/plugins/quickopen/tests/bench_quickopen.h b/plugins/quickopen/tests/bench_quickopen.h
--- a/plugins/quickopen/tests/bench_quickopen.h
+++ b/plugins/quickopen/tests/bench_quickopen.h
@@ -31,7 +31,7 @@
     explicit BenchQuickOpen(QObject* parent = nullptr);
 private:
     void getData();
-private slots:
+private Q_SLOTS:
     void benchProjectFileFilter_addRemoveProject();
     void benchProjectFileFilter_addRemoveProject_data();
     void benchProjectFileFilter_reset();
diff --git a/plugins/quickopen/tests/quickopentestbase.h b/plugins/quickopen/tests/quickopentestbase.h
--- a/plugins/quickopen/tests/quickopentestbase.h
+++ b/plugins/quickopen/tests/quickopentestbase.h
@@ -39,7 +39,7 @@
     Q_OBJECT
 public:
     explicit QuickOpenTestBase(KDevelop::TestCore::Setup setup, QObject* parent = nullptr);
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/plugins/quickopen/tests/test_quickopen.h b/plugins/quickopen/tests/test_quickopen.h
--- a/plugins/quickopen/tests/test_quickopen.h
+++ b/plugins/quickopen/tests/test_quickopen.h
@@ -29,7 +29,7 @@
     Q_OBJECT
 public:
     explicit TestQuickOpen(QObject* parent = nullptr);
-private slots:
+private Q_SLOTS:
     void testSorting();
     void testSorting_data();
     void testAbbreviations();
diff --git a/plugins/standardoutputview/outputwidget.h b/plugins/standardoutputview/outputwidget.h
--- a/plugins/standardoutputview/outputwidget.h
+++ b/plugins/standardoutputview/outputwidget.h
@@ -72,7 +72,7 @@
 Q_SIGNALS:
     void outputRemoved( int, int );
 
-private slots:
+private Q_SLOTS:
     void nextOutput();
     void previousOutput();
     void copySelection();
diff --git a/plugins/standardoutputview/tests/test_standardoutputview.h b/plugins/standardoutputview/tests/test_standardoutputview.h
--- a/plugins/standardoutputview/tests/test_standardoutputview.h
+++ b/plugins/standardoutputview/tests/test_standardoutputview.h
@@ -50,7 +50,7 @@
     int outputId[5];
     static const QString toolviewTitle;
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void testRegisterAndRemoveToolView();
diff --git a/plugins/standardoutputview/toolviewdata.h b/plugins/standardoutputview/toolviewdata.h
--- a/plugins/standardoutputview/toolviewdata.h
+++ b/plugins/standardoutputview/toolviewdata.h
@@ -48,7 +48,7 @@
     int id;
     void setModel( QAbstractItemModel* model );
     void setDelegate( QAbstractItemDelegate* delegate );
-signals:
+Q_SIGNALS:
     void modelChanged( int );
     void delegateChanged( int );
 };
@@ -71,7 +71,7 @@
     int toolViewId;
     KDevelop::IOutputView::Options option;
     QList<QAction*> actionList;
-signals:
+Q_SIGNALS:
     void outputAdded( int );
 };
 
diff --git a/plugins/subversion/svnblamejob.h b/plugins/subversion/svnblamejob.h
--- a/plugins/subversion/svnblamejob.h
+++ b/plugins/subversion/svnblamejob.h
@@ -43,7 +43,7 @@
     void setLocation( const QUrl &location );
     void setEndRevision( const KDevelop::VcsRevision& rev );
     void setStartRevision( const KDevelop::VcsRevision& rev );
-private slots:
+private Q_SLOTS:
     void blameLineReceived( const KDevelop::VcsAnnotationLine& );
 
 private:
diff --git a/plugins/subversion/svnblamejob_p.h b/plugins/subversion/svnblamejob_p.h
--- a/plugins/subversion/svnblamejob_p.h
+++ b/plugins/subversion/svnblamejob_p.h
@@ -44,7 +44,7 @@
     QUrl location() const;
     KDevelop::VcsRevision startRevision() const;
     KDevelop::VcsRevision endRevision() const;
-signals:
+Q_SIGNALS:
     void blameLine( const KDevelop::VcsAnnotationLine& );
 protected:
     void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread* thread) override;
diff --git a/plugins/subversion/svncatjob.h b/plugins/subversion/svncatjob.h
--- a/plugins/subversion/svncatjob.h
+++ b/plugins/subversion/svncatjob.h
@@ -41,7 +41,7 @@
     void setPegRevision( const KDevelop::VcsRevision& );
     void setSrcRevision( const KDevelop::VcsRevision& );
 
-public slots:
+public Q_SLOTS:
     void setContent( const QString& );
 private:
     QString m_content;
diff --git a/plugins/subversion/svncatjob_p.h b/plugins/subversion/svncatjob_p.h
--- a/plugins/subversion/svncatjob_p.h
+++ b/plugins/subversion/svncatjob_p.h
@@ -37,7 +37,7 @@
     KDevelop::VcsRevision srcRevision() const;
     KDevelop::VcsRevision pegRevision() const;
 
-signals:
+Q_SIGNALS:
     void gotContent( const QString& );
 protected:
     void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread* thread) override;
diff --git a/plugins/subversion/svnclient.h b/plugins/subversion/svnclient.h
--- a/plugins/subversion/svnclient.h
+++ b/plugins/subversion/svnclient.h
@@ -57,7 +57,7 @@
 
     void emitLogEventReceived( const KDevelop::VcsEvent& );
 
-signals:
+Q_SIGNALS:
     void logEventReceived( const KDevelop::VcsEvent& );
 private:
     svn::Context* m_ctxt;
diff --git a/plugins/subversion/svndiffjob.h b/plugins/subversion/svndiffjob.h
--- a/plugins/subversion/svndiffjob.h
+++ b/plugins/subversion/svndiffjob.h
@@ -56,7 +56,7 @@
 
     void setDiffType( KDevelop::VcsDiff::Type type );
 
-public slots:
+public Q_SLOTS:
     void setDiff( const QString& );
     void addLeftText( KDevelop::VcsJob* job );
     void removeJob( KJob* job );
diff --git a/plugins/subversion/svndiffjob_p.h b/plugins/subversion/svndiffjob_p.h
--- a/plugins/subversion/svndiffjob_p.h
+++ b/plugins/subversion/svndiffjob_p.h
@@ -49,7 +49,7 @@
     KDevelop::VcsRevision dstRevision() const;
     KDevelop::VcsRevision pegRevision() const;
 
-signals:
+Q_SIGNALS:
     void gotDiff( const QString& );
 protected:
     void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread* thread) override;
diff --git a/plugins/subversion/svninfojob.h b/plugins/subversion/svninfojob.h
--- a/plugins/subversion/svninfojob.h
+++ b/plugins/subversion/svninfojob.h
@@ -76,7 +76,7 @@
     void setLocation( const QUrl &location );
     void setProvideInformation( ProvideInformationType );
     void setProvideRevisionType( KDevelop::VcsRevision::RevisionType );
-public slots:
+public Q_SLOTS:
     void setInfo( const SvnInfoHolder& );
 private:
     SvnInfoHolder m_info;
diff --git a/plugins/subversion/svninfojob_p.h b/plugins/subversion/svninfojob_p.h
--- a/plugins/subversion/svninfojob_p.h
+++ b/plugins/subversion/svninfojob_p.h
@@ -32,7 +32,7 @@
     void setLocation( const QUrl& );
 
     QUrl location() const;
-signals:
+Q_SIGNALS:
     void gotInfo( const SvnInfoHolder& );
 protected:
     void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread* thread) override;
diff --git a/plugins/subversion/svninternaljobbase.h b/plugins/subversion/svninternaljobbase.h
--- a/plugins/subversion/svninternaljobbase.h
+++ b/plugins/subversion/svninternaljobbase.h
@@ -88,7 +88,7 @@
 
     static svn::Revision createSvnCppRevisionFromVcsRevision( const KDevelop::VcsRevision& );
 
-signals:
+Q_SIGNALS:
     void needLogin( const QString& );
     void showNotification( const QString&, const QString& );
     void needCommitMessage();
diff --git a/plugins/subversion/svnjobbase.h b/plugins/subversion/svnjobbase.h
--- a/plugins/subversion/svnjobbase.h
+++ b/plugins/subversion/svnjobbase.h
@@ -43,7 +43,7 @@
     KDevelop::VcsJob::JobStatus status() const override;
     KDevelop::IPlugin* vcsPlugin() const override;
 
-public slots:
+public Q_SLOTS:
     void askForLogin( const QString& );
     void showNotification( const QString&, const QString& );
     void askForCommitMessage();
@@ -53,7 +53,7 @@
     void askForSslClientCert( const QString& );
     void askForSslClientCertPassword( const QString& );
 
-protected slots:
+protected Q_SLOTS:
     void internalJobStarted();
     void internalJobDone();
     void internalJobFailed();
diff --git a/plugins/subversion/svnlogjob.h b/plugins/subversion/svnlogjob.h
--- a/plugins/subversion/svnlogjob.h
+++ b/plugins/subversion/svnlogjob.h
@@ -43,7 +43,7 @@
     void setLimit( int limit );
     void setEndRevision( const KDevelop::VcsRevision& rev );
     void setStartRevision( const KDevelop::VcsRevision& rev );
-private slots:
+private Q_SLOTS:
     void logEventReceived( const KDevelop::VcsEvent& );
 private:
     QList<QVariant> m_eventList;
diff --git a/plugins/subversion/svnlogjob_p.h b/plugins/subversion/svnlogjob_p.h
--- a/plugins/subversion/svnlogjob_p.h
+++ b/plugins/subversion/svnlogjob_p.h
@@ -41,7 +41,7 @@
     KDevelop::VcsRevision startRevision() const;
     KDevelop::VcsRevision endRevision() const;
     int limit() const;
-signals:
+Q_SIGNALS:
     void logEvent( const KDevelop::VcsEvent& );
 protected:
     void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread* thread) override;
diff --git a/plugins/subversion/svnssldialog.h b/plugins/subversion/svnssldialog.h
--- a/plugins/subversion/svnssldialog.h
+++ b/plugins/subversion/svnssldialog.h
@@ -28,7 +28,7 @@
                        const QString& issuerName, const QString& realm,
                        const QStringList& failures );
     bool useTemporarily();
-private slots:
+private Q_SLOTS:
     void buttonClicked(QAbstractButton *button);
 private:
     class SvnSSLTrustDialogPrivate *d;
diff --git a/plugins/subversion/svnstatusjob.h b/plugins/subversion/svnstatusjob.h
--- a/plugins/subversion/svnstatusjob.h
+++ b/plugins/subversion/svnstatusjob.h
@@ -40,7 +40,7 @@
     void setLocations( const QList<QUrl>& locations );
     void setRecursive( bool );
 
-public slots:
+public Q_SLOTS:
     void addToStats( const KDevelop::VcsStatusInfo& );
 private:
     QList<QVariant> m_stats;
diff --git a/plugins/subversion/svnstatusjob_p.h b/plugins/subversion/svnstatusjob_p.h
--- a/plugins/subversion/svnstatusjob_p.h
+++ b/plugins/subversion/svnstatusjob_p.h
@@ -36,7 +36,7 @@
 
     bool recursive() const;
     QList<QUrl> locations() const;
-signals:
+Q_SIGNALS:
     void gotNewStatus( const KDevelop::VcsStatusInfo& );
 protected:
     void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread* thread) override;
diff --git a/plugins/subversion/tests/test_svnimport.h b/plugins/subversion/tests/test_svnimport.h
--- a/plugins/subversion/tests/test_svnimport.h
+++ b/plugins/subversion/tests/test_svnimport.h
@@ -33,7 +33,7 @@
             : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void testBasic();
diff --git a/plugins/subversion/tests/test_svnrecursiveadd.h b/plugins/subversion/tests/test_svnrecursiveadd.h
--- a/plugins/subversion/tests/test_svnrecursiveadd.h
+++ b/plugins/subversion/tests/test_svnrecursiveadd.h
@@ -26,7 +26,7 @@
             : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/plugins/switchtobuddy/switchtobuddyplugin.h b/plugins/switchtobuddy/switchtobuddyplugin.h
--- a/plugins/switchtobuddy/switchtobuddyplugin.h
+++ b/plugins/switchtobuddy/switchtobuddyplugin.h
@@ -55,7 +55,7 @@
     KDevelop::ContextMenuExtension contextMenuExtension(KDevelop::Context* context) override;
     void createActionsForMainWindow(Sublime::MainWindow* window, QString& xmlFile, KActionCollection& actions) override;
 
-private slots:
+private Q_SLOTS:
     /**
      * Context menu slot which switches to the QUrl provided
      * in the data part of the sending QAction.
diff --git a/plugins/testview/testview.h b/plugins/testview/testview.h
--- a/plugins/testview/testview.h
+++ b/plugins/testview/testview.h
@@ -40,7 +40,7 @@
     explicit TestView(TestViewPlugin* plugin, QWidget* parent = nullptr);
     ~TestView() override;
 
-public slots:
+public Q_SLOTS:
     void runSelectedTests();
     void showSource();
 
diff --git a/plugins/testview/testviewplugin.h b/plugins/testview/testviewplugin.h
--- a/plugins/testview/testviewplugin.h
+++ b/plugins/testview/testviewplugin.h
@@ -37,7 +37,7 @@
 private:
     TestToolViewFactory* m_viewFactory;
 
-private slots:
+private Q_SLOTS:
     void runAllTests();
     void stopRunningTests();
     void jobStateChanged();
diff --git a/plugins/vcschangesview/vcschangesview.h b/plugins/vcschangesview/vcschangesview.h
--- a/plugins/vcschangesview/vcschangesview.h
+++ b/plugins/vcschangesview/vcschangesview.h
@@ -36,12 +36,12 @@
         
         void setModel(QAbstractItemModel* model) override;
         
-    public slots:
+    public Q_SLOTS:
         void popupContextMenu( const QPoint &pos );
         void selectCurrentDocument();
         void openSelected(const QModelIndex& idx);
         
-    signals:
+    Q_SIGNALS:
         void reload(const QList<KDevelop::IProject*>& p);
         void reload(const QList<QUrl>& p);
 };
diff --git a/plugins/vcschangesview/vcschangesviewplugin.h b/plugins/vcschangesview/vcschangesviewplugin.h
--- a/plugins/vcschangesview/vcschangesviewplugin.h
+++ b/plugins/vcschangesview/vcschangesviewplugin.h
@@ -39,7 +39,7 @@
         VcsProjectIntegrationPlugin(QObject *parent, const QVariantList & args);
         KDevelop::ProjectChangesModel* model();
         
-    private slots:
+    private Q_SLOTS:
         void activated(const QModelIndex& idx);
         
     private:
diff --git a/plugins/welcomepage/sessionsmodel.h b/plugins/welcomepage/sessionsmodel.h
--- a/plugins/welcomepage/sessionsmodel.h
+++ b/plugins/welcomepage/sessionsmodel.h
@@ -36,7 +36,7 @@
     private:
         KDevelop::SessionInfos m_sessions;
 
-    private slots:
+    private Q_SLOTS:
         void sessionDeleted(const QString& id);
 };
 
diff --git a/plugins/welcomepage/uihelper.h b/plugins/welcomepage/uihelper.h
--- a/plugins/welcomepage/uihelper.h
+++ b/plugins/welcomepage/uihelper.h
@@ -29,7 +29,7 @@
     public:
         explicit UiHelper(QObject* parent);
         
-    public slots:
+    public Q_SLOTS:
         QAction* retrieveMenuAction(const QString& name);
         void showMenu(const QString& name);
         void setArea(const QString& name);
diff --git a/plugins/welcomepage/welcomepageview.h b/plugins/welcomepage/welcomepageview.h
--- a/plugins/welcomepage/welcomepageview.h
+++ b/plugins/welcomepage/welcomepageview.h
@@ -35,7 +35,7 @@
 public:
     explicit WelcomePageWidget(const QList< KDevelop::IProject* >& projects, QWidget* parent = nullptr);
 
-public slots:
+public Q_SLOTS:
     void areaChanged(Sublime::Area* a);
 };
 
diff --git a/project/filemanagerlistjob.h b/project/filemanagerlistjob.h
--- a/project/filemanagerlistjob.h
+++ b/project/filemanagerlistjob.h
@@ -48,12 +48,12 @@
     void abort();
     void start() override;
 
-signals:
+Q_SIGNALS:
     void entries(FileManagerListJob* job, ProjectFolderItem* baseItem,
                  const KIO::UDSEntryList& entries);
     void nextJob();
 
-private slots:
+private Q_SLOTS:
     void slotEntries(KIO::Job* job, const KIO::UDSEntryList& entriesIn );
     void slotResult(KJob* job) override;
     void handleResults(const KIO::UDSEntryList& entries);
diff --git a/project/projectbuildsetmodel.h b/project/projectbuildsetmodel.h
--- a/project/projectbuildsetmodel.h
+++ b/project/projectbuildsetmodel.h
@@ -72,7 +72,7 @@
     void moveRowsToTop( int row, int count );
     void moveRowsToBottom( int row, int count );
     QList<BuildItem> items();
-public slots:
+public Q_SLOTS:
     void saveToProject( KDevelop::IProject* ) const;
     void loadFromProject( KDevelop::IProject* );
     void projectClosed( KDevelop::IProject* );
diff --git a/project/projectchangesmodel.h b/project/projectchangesmodel.h
--- a/project/projectchangesmodel.h
+++ b/project/projectchangesmodel.h
@@ -42,7 +42,7 @@
 
         void changes(KDevelop::IProject* project, const QList<QUrl>& urls, KDevelop::IBasicVersionControl::RecursionMode mode);
         
-    public slots:
+    public Q_SLOTS:
         void reloadAll();
         void reload(const QList<KDevelop::IProject*>& p);
         void reload(const QList<QUrl>& p);
diff --git a/project/projectitemlineedit.h b/project/projectitemlineedit.h
--- a/project/projectitemlineedit.h
+++ b/project/projectitemlineedit.h
@@ -68,10 +68,10 @@
     
     void setSuggestion(KDevelop::IProject* project);
 
-public slots:
+public Q_SLOTS:
     bool selectItemDialog();
     
-private slots:
+private Q_SLOTS:
     void showCtxMenu(const QPoint& p);
     
 private:
diff --git a/project/tests/projectmodelperformancetest.h b/project/tests/projectmodelperformancetest.h
--- a/project/tests/projectmodelperformancetest.h
+++ b/project/tests/projectmodelperformancetest.h
@@ -36,7 +36,7 @@
 public:
     explicit ProjectModelPerformanceTest(QWidget* parent = nullptr);
     ~ProjectModelPerformanceTest() override;
-private slots:
+private Q_SLOTS:
     void init();
     void addSmallTree();
     void addBigTree();
diff --git a/project/tests/test_projectmodel.h b/project/tests/test_projectmodel.h
--- a/project/tests/test_projectmodel.h
+++ b/project/tests/test_projectmodel.h
@@ -34,7 +34,7 @@
 class TestProjectModel : public QObject
 {
 Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void init();
     void cleanupTestCase();
diff --git a/serialization/tests/bench_itemrepository.h b/serialization/tests/bench_itemrepository.h
--- a/serialization/tests/bench_itemrepository.h
+++ b/serialization/tests/bench_itemrepository.h
@@ -27,7 +27,7 @@
 class TestItemRepository : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/serialization/tests/test_indexedstring.h b/serialization/tests/test_indexedstring.h
--- a/serialization/tests/test_indexedstring.h
+++ b/serialization/tests/test_indexedstring.h
@@ -27,7 +27,7 @@
 class TestIndexedString : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/serialization/tests/test_itemrepository.cpp b/serialization/tests/test_itemrepository.cpp
--- a/serialization/tests/test_itemrepository.cpp
+++ b/serialization/tests/test_itemrepository.cpp
@@ -97,7 +97,7 @@
 ///@todo More consistency and lost-space tests, especially about monster-buckets. Make sure their space is re-claimed
 class TestItemRepository : public QObject {
   Q_OBJECT
-  private slots:
+  private Q_SLOTS:
     void initTestCase() {
       KDevelop::AutoTestShell::init();
       KDevelop::TestCore* core = new KDevelop::TestCore();
diff --git a/serialization/tests/test_itemrepositoryregistry_automatic.cpp b/serialization/tests/test_itemrepositoryregistry_automatic.cpp
--- a/serialization/tests/test_itemrepositoryregistry_automatic.cpp
+++ b/serialization/tests/test_itemrepositoryregistry_automatic.cpp
@@ -16,7 +16,7 @@
       KDevelop::TestCore::shutdown();
     }
 
-  private slots:
+  private Q_SLOTS:
     void initTestCase() {
       KDevelop::AutoTestShell::init();
     }
diff --git a/serialization/tests/test_itemrepositoryregistry_deferred.cpp b/serialization/tests/test_itemrepositoryregistry_deferred.cpp
--- a/serialization/tests/test_itemrepositoryregistry_deferred.cpp
+++ b/serialization/tests/test_itemrepositoryregistry_deferred.cpp
@@ -16,7 +16,7 @@
       KDevelop::TestCore::shutdown();
     }
 
-  private slots:
+  private Q_SLOTS:
     void initTestCase() {
       KDevelop::AutoTestShell::init();
     }
diff --git a/shell/areadisplay.h b/shell/areadisplay.h
--- a/shell/areadisplay.h
+++ b/shell/areadisplay.h
@@ -50,7 +50,7 @@
 protected:
     bool eventFilter(QObject* obj, QEvent* event) override;
 
-private slots:
+private Q_SLOTS:
     void newArea(Sublime::Area* area);
     void backToCode();
 
diff --git a/shell/checkerstatus.h b/shell/checkerstatus.h
--- a/shell/checkerstatus.h
+++ b/shell/checkerstatus.h
@@ -81,7 +81,7 @@
     /// Stops status / progress reporting
     void stop();
 
-signals:
+Q_SIGNALS:
     void clearMessage(KDevelop::IStatus*) override;
     void showMessage(KDevelop::IStatus*, const QString &message, int timeout = 0) override;
     void showErrorMessage(const QString & message, int timeout = 0) override;
diff --git a/shell/core.h b/shell/core.h
--- a/shell/core.h
+++ b/shell/core.h
@@ -116,7 +116,7 @@
 
     Core::Setup setupFlags() const;
 
-public slots:
+public Q_SLOTS:
     void shutdown();
 
 protected:
diff --git a/shell/documentationcontroller.h b/shell/documentationcontroller.h
--- a/shell/documentationcontroller.h
+++ b/shell/documentationcontroller.h
@@ -47,10 +47,10 @@
     void showDocumentation(const IDocumentation::Ptr& doc) override;
     ContextMenuExtension contextMenuExtension( Context* context );
 
-public slots:
+public Q_SLOTS:
     void changedDocumentationProviders() override;
 
-private slots:
+private Q_SLOTS:
     void doShowDocumentation();
 
 private:
diff --git a/shell/environmentconfigurebutton.h b/shell/environmentconfigurebutton.h
--- a/shell/environmentconfigurebutton.h
+++ b/shell/environmentconfigurebutton.h
@@ -44,7 +44,7 @@
 
     void setSelectionWidget(EnvironmentSelectionWidget* widget);
 
-signals:
+Q_SIGNALS:
     /**
      * Gets emitted whenever the dialog was acceppted
      * and the env settings might have changed.
diff --git a/shell/ktexteditorpluginintegration.h b/shell/ktexteditorpluginintegration.h
--- a/shell/ktexteditorpluginintegration.h
+++ b/shell/ktexteditorpluginintegration.h
@@ -48,7 +48,7 @@
     explicit Application(QObject *parent = nullptr);
     ~Application() override;
 
-public slots:
+public Q_SLOTS:
     KTextEditor::MainWindow *activeMainWindow() const;
     QList<KTextEditor::MainWindow *> mainWindows() const;
 
@@ -64,7 +64,7 @@
     explicit MainWindow(KDevelop::MainWindow *mainWindow);
     ~MainWindow() override;
 
-public slots:
+public Q_SLOTS:
     QWidget *createToolView(KTextEditor::Plugin *plugin, const QString &identifier,
                             KTextEditor::MainWindow::ToolViewPosition pos,
                             const QIcon &icon, const QString &text);
diff --git a/shell/launchconfiguration.h b/shell/launchconfiguration.h
--- a/shell/launchconfiguration.h
+++ b/shell/launchconfiguration.h
@@ -87,7 +87,7 @@
     
     KConfigGroup config() override;
     
-signals:
+Q_SIGNALS:
     void nameChanged( LaunchConfiguration* );
     void typeChanged( LaunchConfigurationType* );
 private:
diff --git a/shell/launchconfigurationdialog.h b/shell/launchconfigurationdialog.h
--- a/shell/launchconfigurationdialog.h
+++ b/shell/launchconfigurationdialog.h
@@ -125,7 +125,7 @@
     explicit LaunchConfigPagesContainer( const QList<LaunchConfigurationPageFactory*> &, QWidget* parent = nullptr );
     void setLaunchConfiguration( LaunchConfiguration* );
     void save();
-signals:
+Q_SIGNALS:
     void changed();
 private:
     LaunchConfiguration* config;
@@ -139,7 +139,7 @@
     explicit LaunchConfigurationDialog(QWidget* parent = nullptr );
     QSize sizeHint() const override;
 
-private slots:
+private Q_SLOTS:
     void deleteConfiguration();
     void createConfiguration();
     void addConfiguration(KDevelop::ILaunchConfiguration*);
diff --git a/shell/openprojectdialog.h b/shell/openprojectdialog.h
--- a/shell/openprojectdialog.h
+++ b/shell/openprojectdialog.h
@@ -56,7 +56,7 @@
 
     QStringList projectManagerForFile(const QString& file) const;
 
-private slots:
+private Q_SLOTS:
     void validateSourcePage( bool );
     void validateOpenUrl( const QUrl& );
     void validateProjectName( const QString& );
diff --git a/shell/openprojectpage.h b/shell/openprojectpage.h
--- a/shell/openprojectpage.h
+++ b/shell/openprojectpage.h
@@ -28,14 +28,14 @@
         QWidget* parent = nullptr );
     void setUrl(const QUrl& url);
 
-signals:
+Q_SIGNALS:
     void urlSelected(const QUrl&);
     void accepted();
 
 protected:
     void showEvent(QShowEvent*) override;
 
-private slots:
+private Q_SLOTS:
     void highlightFile(const QUrl&);
     void opsEntered(const QUrl& item);
     void comboTextChanged(const QString&);
diff --git a/shell/problemmodel.h b/shell/problemmodel.h
--- a/shell/problemmodel.h
+++ b/shell/problemmodel.h
@@ -148,7 +148,7 @@
     /// Set the "Force Full Update" action tooltip
     void setFullUpdateTooltip(const QString& tooltip);
 
-signals:
+Q_SIGNALS:
     /// Emitted when the stored problems are changed with addProblem(), setProblems() and
     /// clearProblems() methods. This signal emitted only when internal problems storage is
     /// really changed: for example, it is not emitted when we call clearProblems() method
@@ -159,7 +159,7 @@
     /// This signal emitted only when tooltip is really changed.
     void fullUpdateTooltipChanged();
 
-public slots:
+public Q_SLOTS:
     /// Show imports
     void setShowImports(bool showImports);
 
@@ -180,11 +180,11 @@
      */
     virtual void forceFullUpdate(){}
 
-protected slots:
+protected Q_SLOTS:
     /// Triggered when problems change
     virtual void onProblemsChanged(){}
 
-private slots:
+private Q_SLOTS:
     /// Triggered when the current document changes
     virtual void setCurrentDocument(IDocument* doc);
 
diff --git a/shell/problemmodelset.h b/shell/problemmodelset.h
--- a/shell/problemmodelset.h
+++ b/shell/problemmodelset.h
@@ -77,7 +77,7 @@
     /// Retrieves a list of models stored
     QVector<ModelData> models() const;
 
-signals:
+Q_SIGNALS:
     /// Emitted when a new model is added
     void added(const ModelData &model);
 
diff --git a/shell/problemstore.h b/shell/problemstore.h
--- a/shell/problemstore.h
+++ b/shell/problemstore.h
@@ -130,7 +130,7 @@
     /// Retrives the path of the current document
     const KDevelop::IndexedString& currentDocument() const;
 
-signals:
+Q_SIGNALS:
     /// Emitted when any store setting (grouping, scope, severity, document) is changed
     void changed();
 
@@ -145,7 +145,7 @@
     /// Emitted once the problemlist has been rebuilt
     void endRebuild();
 
-private slots:
+private Q_SLOTS:
     /// Triggered when the watched document set changes. E.g.:document closed, new one added, etc
     virtual void onDocumentSetChanged();
 
diff --git a/shell/project.h b/shell/project.h
--- a/shell/project.h
+++ b/shell/project.h
@@ -125,7 +125,7 @@
 
     void setReloadJob(KJob* job) override;
 
-signals:
+Q_SIGNALS:
     /**
      * Internal signal to make IProjectController::projectAboutToOpen useful.
      */
diff --git a/shell/projectinfopage.h b/shell/projectinfopage.h
--- a/shell/projectinfopage.h
+++ b/shell/projectinfopage.h
@@ -36,10 +36,10 @@
     ~ProjectInfoPage() override;
     void setProjectName( const QString& );
     void populateProjectFileCombo( const QVector<ProjectFileChoice>& choices );
-signals:
+Q_SIGNALS:
     void projectNameChanged( const QString& );
     void projectManagerChanged( const QString& pluginId, const QString & fileName);
-private slots:
+private Q_SLOTS:
     void changeProjectManager( int );
 private:
     Ui::ProjectInfoPage* page_ui;
diff --git a/shell/projectsourcepage.h b/shell/projectsourcepage.h
--- a/shell/projectsourcepage.h
+++ b/shell/projectsourcepage.h
@@ -35,7 +35,7 @@
 
         QUrl workingDir() const;
         
-    private slots:
+    private Q_SLOTS:
         void setSourceIndex(int index);
         void checkoutVcsProject();
         void projectReceived(KJob* job);
@@ -45,7 +45,7 @@
         void locationChanged();
         void projectChanged(const QString& name);
         
-    signals:
+    Q_SIGNALS:
         void isCorrect(bool);
         
     private:
diff --git a/shell/sessioncontroller.cpp b/shell/sessioncontroller.cpp
--- a/shell/sessioncontroller.cpp
+++ b/shell/sessioncontroller.cpp
@@ -242,7 +242,7 @@
         return q->sessionDirectory( activeSession->id().toString() );
     }
 
-private slots:
+private Q_SLOTS:
     void sessionUpdated( KDevelop::ISession* s )
     {
         sessionActions[static_cast<Session*>( s )]->setText( KStringHandler::rsqueeze(s->description()) );
diff --git a/shell/settings/editstyledialog.h b/shell/settings/editstyledialog.h
--- a/shell/settings/editstyledialog.h
+++ b/shell/settings/editstyledialog.h
@@ -55,7 +55,7 @@
 protected:
     void init();
 
-public slots:
+public Q_SLOTS:
     void updatePreviewText(const QString &text);
 
 private:
diff --git a/shell/settings/projectpreferences.h b/shell/settings/projectpreferences.h
--- a/shell/settings/projectpreferences.h
+++ b/shell/settings/projectpreferences.h
@@ -44,7 +44,7 @@
 
     void apply() override;
 
-private slots:
+private Q_SLOTS:
     void slotSettingsChanged();
 
 private:
diff --git a/shell/settings/sourceformattersettings.h b/shell/settings/sourceformattersettings.h
--- a/shell/settings/sourceformattersettings.h
+++ b/shell/settings/sourceformattersettings.h
@@ -67,11 +67,11 @@
     QString fullName() const override;
     QIcon icon() const override;
 
-public slots:
+public Q_SLOTS:
     void reset() override;
     void apply() override;
     void defaults() override;
-private slots:
+private Q_SLOTS:
     void deleteStyle();
     void editStyle();
     void newStyle();
diff --git a/shell/settings/templatepage.h b/shell/settings/templatepage.h
--- a/shell/settings/templatepage.h
+++ b/shell/settings/templatepage.h
@@ -41,7 +41,7 @@
     explicit TemplatePage(KDevelop::ITemplateProvider* provider, QWidget* parent = nullptr);
     ~TemplatePage() override;
 
-private slots:
+private Q_SLOTS:
     void loadFromFile();
     void getMoreTemplates();
     void shareTemplates();
diff --git a/shell/tests/test_checkerstatus.cpp b/shell/tests/test_checkerstatus.cpp
--- a/shell/tests/test_checkerstatus.cpp
+++ b/shell/tests/test_checkerstatus.cpp
@@ -32,7 +32,7 @@
 class TestCheckerStatus : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/shell/tests/test_detectedproblem.cpp b/shell/tests/test_detectedproblem.cpp
--- a/shell/tests/test_detectedproblem.cpp
+++ b/shell/tests/test_detectedproblem.cpp
@@ -32,7 +32,7 @@
 class TestDetectedProblem : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/shell/tests/test_documentcontroller.h b/shell/tests/test_documentcontroller.h
--- a/shell/tests/test_documentcontroller.h
+++ b/shell/tests/test_documentcontroller.h
@@ -37,7 +37,7 @@
 class TestDocumentController : public QObject
 {
     Q_OBJECT
-private slots :
+private Q_SLOTS:
     void initTestCase();
     void init();
     void cleanup();
diff --git a/shell/tests/test_filteredproblemstore.cpp b/shell/tests/test_filteredproblemstore.cpp
--- a/shell/tests/test_filteredproblemstore.cpp
+++ b/shell/tests/test_filteredproblemstore.cpp
@@ -47,7 +47,7 @@
 class TestFilteredProblemStore : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/shell/tests/test_ktexteditorpluginintegration.h b/shell/tests/test_ktexteditorpluginintegration.h
--- a/shell/tests/test_ktexteditorpluginintegration.h
+++ b/shell/tests/test_ktexteditorpluginintegration.h
@@ -27,7 +27,7 @@
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/shell/tests/test_plugincontroller.h b/shell/tests/test_plugincontroller.h
--- a/shell/tests/test_plugincontroller.h
+++ b/shell/tests/test_plugincontroller.h
@@ -32,7 +32,7 @@
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
diff --git a/shell/tests/test_problemmodel.cpp b/shell/tests/test_problemmodel.cpp
--- a/shell/tests/test_problemmodel.cpp
+++ b/shell/tests/test_problemmodel.cpp
@@ -42,7 +42,7 @@
 class TestProblemModel : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/shell/tests/test_problemmodelset.cpp b/shell/tests/test_problemmodelset.cpp
--- a/shell/tests/test_problemmodelset.cpp
+++ b/shell/tests/test_problemmodelset.cpp
@@ -56,7 +56,7 @@
 class TestProblemModelSet : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/shell/tests/test_problemstore.cpp b/shell/tests/test_problemstore.cpp
--- a/shell/tests/test_problemstore.cpp
+++ b/shell/tests/test_problemstore.cpp
@@ -33,7 +33,7 @@
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/shell/tests/test_problemstorenode.cpp b/shell/tests/test_problemstorenode.cpp
--- a/shell/tests/test_problemstorenode.cpp
+++ b/shell/tests/test_problemstorenode.cpp
@@ -26,7 +26,7 @@
 class TestProblemStoreNode : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/shell/tests/test_projectcontroller.h b/shell/tests/test_projectcontroller.h
--- a/shell/tests/test_projectcontroller.h
+++ b/shell/tests/test_projectcontroller.h
@@ -38,7 +38,7 @@
 class TestProjectController : public QObject
 {
 Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
diff --git a/shell/tests/test_projectcontroller.cpp b/shell/tests/test_projectcontroller.cpp
--- a/shell/tests/test_projectcontroller.cpp
+++ b/shell/tests/test_projectcontroller.cpp
@@ -53,7 +53,7 @@
     ~DialogProviderFake() override {}
     bool m_reopen;
 
-public slots:
+public Q_SLOTS:
     QUrl askProjectConfigLocation(bool /*fetch*/, const QUrl& /*startUrl*/,
                                   const QUrl& /*repoUrl*/, IPlugin* /*plugin*/) override
     { return QUrl(); }
diff --git a/shell/tests/test_sessioncontroller.h b/shell/tests/test_sessioncontroller.h
--- a/shell/tests/test_sessioncontroller.h
+++ b/shell/tests/test_sessioncontroller.h
@@ -32,7 +32,7 @@
 class TestSessionController : public QObject
 {
 Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void init();
     void cleanupTestCase();
diff --git a/shell/tests/test_shellbuddy.h b/shell/tests/test_shellbuddy.h
--- a/shell/tests/test_shellbuddy.h
+++ b/shell/tests/test_shellbuddy.h
@@ -32,7 +32,7 @@
 
 class TestShellBuddy: public QObject {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/shell/tests/test_shelldocumentoperation.h b/shell/tests/test_shelldocumentoperation.h
--- a/shell/tests/test_shelldocumentoperation.h
+++ b/shell/tests/test_shelldocumentoperation.h
@@ -23,7 +23,7 @@
 
 class TestShellDocumentOperation: public QObject {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/shell/tests/test_testcontroller.h b/shell/tests/test_testcontroller.h
--- a/shell/tests/test_testcontroller.h
+++ b/shell/tests/test_testcontroller.h
@@ -34,7 +34,7 @@
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
 
     void addSuite();
diff --git a/shell/tests/test_uicontroller.h b/shell/tests/test_uicontroller.h
--- a/shell/tests/test_uicontroller.h
+++ b/shell/tests/test_uicontroller.h
@@ -27,7 +27,7 @@
 class TestUiController : public QObject {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/shell/watcheddocumentset.h b/shell/watcheddocumentset.h
--- a/shell/watcheddocumentset.h
+++ b/shell/watcheddocumentset.h
@@ -58,7 +58,7 @@
     virtual void setCurrentDocument(const IndexedString& url);
     virtual ProblemScope getScope() const = 0;
 
-signals:
+Q_SIGNALS:
     void changed();
 
 protected:
@@ -88,7 +88,7 @@
     explicit OpenDocumentSet(QObject* parent);
     ProblemScope getScope() const override;
 
-private slots:
+private Q_SLOTS:
     void documentClosed(IDocument* doc);
     void documentCreated(IDocument* doc);
 };
@@ -106,7 +106,7 @@
 protected:
     void trackProjectFiles(const IProject* project);
 
-protected slots:
+protected Q_SLOTS:
     void fileAdded(ProjectFileItem*);
     void fileRemoved(ProjectFileItem* file);
     void fileRenamed(const Path& oldFile, ProjectFileItem* newFile);
diff --git a/shell/workingsetcontroller.h b/shell/workingsetcontroller.h
--- a/shell/workingsetcontroller.h
+++ b/shell/workingsetcontroller.h
@@ -82,7 +82,7 @@
     // Emitted after a working-set in a main-window was switched
     void workingSetSwitched();
 
-private slots:
+private Q_SLOTS:
     void areaCreated(Sublime::Area* area);
 
     void nextDocument();
diff --git a/shell/workingsets/closedworkingsetswidget.h b/shell/workingsets/closedworkingsetswidget.h
--- a/shell/workingsets/closedworkingsetswidget.h
+++ b/shell/workingsets/closedworkingsetswidget.h
@@ -51,7 +51,7 @@
 public:
     explicit ClosedWorkingSetsWidget(MainWindow* window);
 
-private slots:
+private Q_SLOTS:
     void areaChanged(Sublime::Area* area);
     void changedWorkingSet(Sublime::Area* area, const QString& from, const QString& to);
     void addWorkingSet(WorkingSet* set);
diff --git a/shell/workingsets/workingset.h b/shell/workingsets/workingset.h
--- a/shell/workingsets/workingset.h
+++ b/shell/workingsets/workingset.h
@@ -103,11 +103,11 @@
 
     void deleteSet(bool force, bool silent = false);
 
-private slots:
+private Q_SLOTS:
     void areaViewAdded(Sublime::AreaIndex* /*index*/, Sublime::View* /*view*/);
     void areaViewRemoved(Sublime::AreaIndex* /*index*/, Sublime::View* /*view*/);
 
-signals:
+Q_SIGNALS:
     void setChangedSignificantly();
     void aboutToRemove(WorkingSet*);
 
diff --git a/shell/workingsets/workingsettoolbutton.h b/shell/workingsets/workingsettoolbutton.h
--- a/shell/workingsets/workingsettoolbutton.h
+++ b/shell/workingsets/workingsettoolbutton.h
@@ -42,7 +42,7 @@
     WorkingSet* workingSet() const;
     void setWorkingSet(WorkingSet* set);
 
-public slots:
+public Q_SLOTS:
     void closeSet(bool ask = false);
     void loadSet();
     void duplicateSet();
diff --git a/shell/workingsets/workingsettooltipwidget.h b/shell/workingsets/workingsettooltipwidget.h
--- a/shell/workingsets/workingsettooltipwidget.h
+++ b/shell/workingsets/workingsettooltipwidget.h
@@ -42,7 +42,7 @@
 Q_SIGNALS:
     void shouldClose();
 
-public slots:
+public Q_SLOTS:
     void buttonClicked(bool);
     void updateFileButtons();
     void labelClicked();
diff --git a/shell/workingsets/workingsetwidget.h b/shell/workingsets/workingsetwidget.h
--- a/shell/workingsets/workingsetwidget.h
+++ b/shell/workingsets/workingsetwidget.h
@@ -44,7 +44,7 @@
     explicit WorkingSetWidget(Sublime::Area* area, QWidget* parent = nullptr);
     void setVisible( bool visible ) override;
 
-private slots:
+private Q_SLOTS:
     void changingWorkingSet(Sublime::Area* area, const QString& from, const QString& to);
     void setChangedSignificantly();
 
diff --git a/sublime/examples/example1main.h b/sublime/examples/example1main.h
--- a/sublime/examples/example1main.h
+++ b/sublime/examples/example1main.h
@@ -31,11 +31,11 @@
 public:
     Example1Main();
 
-public slots:
+public Q_SLOTS:
     void selectArea1();
     void selectArea2();
 
-private slots:
+private Q_SLOTS:
     void updateTitle(Sublime::Area *area);
 
 private:
diff --git a/sublime/examples/example2main.h b/sublime/examples/example2main.h
--- a/sublime/examples/example2main.h
+++ b/sublime/examples/example2main.h
@@ -27,7 +27,7 @@
 public:
     explicit Example2Main(Sublime::Controller *controller, Qt::WindowFlags flags = KDE_DEFAULT_WINDOWFLAGS);
 
-public slots:
+public Q_SLOTS:
     void splitVertical();
     void splitHorizontal();
     void close();
diff --git a/sublime/idealbuttonbarwidget.h b/sublime/idealbuttonbarwidget.h
--- a/sublime/idealbuttonbarwidget.h
+++ b/sublime/idealbuttonbarwidget.h
@@ -74,7 +74,7 @@
 
     bool isLocked();
 
-signals:
+Q_SIGNALS:
     void emptyChanged();
 
 private:
diff --git a/sublime/idealdockwidget.h b/sublime/idealdockwidget.h
--- a/sublime/idealdockwidget.h
+++ b/sublime/idealdockwidget.h
@@ -44,7 +44,7 @@
     Qt::DockWidgetArea dockWidgetArea() const;
     void setDockWidgetArea(Qt::DockWidgetArea dockingArea);
 
-public slots:
+public Q_SLOTS:
     /// The IdealToolButton also connects to this slot to show the same context menu.
     void contextMenuRequested(const QPoint &point);
 
diff --git a/sublime/mainwindow_p.h b/sublime/mainwindow_p.h
--- a/sublime/mainwindow_p.h
+++ b/sublime/mainwindow_p.h
@@ -101,7 +101,7 @@
     bool eventFilter(QObject* obj, QEvent* event) override;
     void disableConcentrationMode();
 
-public slots:
+public Q_SLOTS:
     void toggleDocksShown();
 
     void viewAdded(Sublime::AreaIndex *index, Sublime::View *view);
@@ -114,7 +114,7 @@
 
     void setTabBarLeftCornerWidget(QWidget* widget);
 
-private slots:
+private Q_SLOTS:
     void switchToArea(QAction *action);
     void updateAreaSwitcher(Sublime::Area *area);
     void slotDockShown(Sublime::View*, Sublime::Position, bool);
diff --git a/sublime/mainwindow_p.cpp b/sublime/mainwindow_p.cpp
--- a/sublime/mainwindow_p.cpp
+++ b/sublime/mainwindow_p.cpp
@@ -63,7 +63,7 @@
             }
         }
 
-    private slots:
+    private Q_SLOTS:
         void updateVisibilty()
         {
             setVisible(!m_buttons->isEmpty());
diff --git a/sublime/tests/test_aggregatemodel.h b/sublime/tests/test_aggregatemodel.h
--- a/sublime/tests/test_aggregatemodel.h
+++ b/sublime/tests/test_aggregatemodel.h
@@ -25,7 +25,7 @@
 
 class TestAggregateModel: public QObject {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void modelAggregationInASingleView();
 
 private:
diff --git a/sublime/tests/test_areaoperation.h b/sublime/tests/test_areaoperation.h
--- a/sublime/tests/test_areaoperation.h
+++ b/sublime/tests/test_areaoperation.h
@@ -30,7 +30,7 @@
 
 class TestAreaOperation: public QObject {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void init();
     void cleanup();
 
diff --git a/sublime/tests/test_areawalker.h b/sublime/tests/test_areawalker.h
--- a/sublime/tests/test_areawalker.h
+++ b/sublime/tests/test_areawalker.h
@@ -22,7 +22,7 @@
 
 class TestAreaWalker: public QObject {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void viewWalkerModes();
     void toolViewWalkerModes();
 };
diff --git a/sublime/tests/test_controller.h b/sublime/tests/test_controller.h
--- a/sublime/tests/test_controller.h
+++ b/sublime/tests/test_controller.h
@@ -23,7 +23,7 @@
 
 class TestController: public QObject {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void documentDeletion();
     void areaDeletion();
     void namedAreas();
diff --git a/sublime/tests/test_document.h b/sublime/tests/test_document.h
--- a/sublime/tests/test_document.h
+++ b/sublime/tests/test_document.h
@@ -23,7 +23,7 @@
 
 class TestDocument: public QObject {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void viewDeletion();
 };
 
diff --git a/sublime/tests/test_toolviewtoolbar.h b/sublime/tests/test_toolviewtoolbar.h
--- a/sublime/tests/test_toolviewtoolbar.h
+++ b/sublime/tests/test_toolviewtoolbar.h
@@ -34,7 +34,7 @@
 class TestToolViewToolBar : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void init();
     void cleanup();
 
diff --git a/sublime/tests/test_view.h b/sublime/tests/test_view.h
--- a/sublime/tests/test_view.h
+++ b/sublime/tests/test_view.h
@@ -23,7 +23,7 @@
 
 class TestView: public QObject {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void widgetDeletion();
     void viewReimplementation();
 };
diff --git a/sublime/tests/test_viewactivation.h b/sublime/tests/test_viewactivation.h
--- a/sublime/tests/test_viewactivation.h
+++ b/sublime/tests/test_viewactivation.h
@@ -30,7 +30,7 @@
 
 class TestViewActivation: public QObject {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void init();
     void cleanup();
diff --git a/util/duchainify/main.h b/util/duchainify/main.h
--- a/util/duchainify/main.h
+++ b/util/duchainify/main.h
@@ -41,7 +41,7 @@
         QCommandLineParser* m_args;
         QAtomicInt m_allFilesAdded;
 
-    public slots:
+    public Q_SLOTS:
         // delay init into event loop so the DUChain can always shutdown gracefully
         void init();
         void updateReady(KDevelop::IndexedString url, KDevelop::ReferencedTopDUContext topContext);
diff --git a/util/environmentselectionwidget.h b/util/environmentselectionwidget.h
--- a/util/environmentselectionwidget.h
+++ b/util/environmentselectionwidget.h
@@ -70,7 +70,7 @@
      */
     EnvironmentProfileList environmentProfiles() const;
 
-public slots:
+public Q_SLOTS:
     /**
      * Makes the widget re-read its environment group list.
      */
diff --git a/util/multilevellistview.h b/util/multilevellistview.h
--- a/util/multilevellistview.h
+++ b/util/multilevellistview.h
@@ -113,7 +113,7 @@
      * is used and only leafs are selectable in the view for that model.
      */
     void setLastModelsFilterBehavior(KSelectionProxyModel::FilterBehavior filter);
-signals:
+Q_SIGNALS:
     /**
      * Notified that the current index has changed from @p previous to @p current
      *
@@ -124,7 +124,7 @@
      */
     void currentIndexChanged(const QModelIndex& current, const QModelIndex& previous);
 
-public slots:
+public Q_SLOTS:
     /**
      * Sets the root index of the entire view to @p index.
      *
diff --git a/util/tests/test_embeddedfreetree.cpp b/util/tests/test_embeddedfreetree.cpp
--- a/util/tests/test_embeddedfreetree.cpp
+++ b/util/tests/test_embeddedfreetree.cpp
@@ -322,7 +322,7 @@
 
 class TestEmbeddedFreeTree : public QObject {
   Q_OBJECT
-  private slots:
+  private Q_SLOTS:
     void initTestCase() {
         KDevelop::AutoTestShell::init();
         KDevelop::TestCore::initialize(KDevelop::Core::NoUi);
diff --git a/util/tests/test_executecompositejob.h b/util/tests/test_executecompositejob.h
--- a/util/tests/test_executecompositejob.h
+++ b/util/tests/test_executecompositejob.h
@@ -40,14 +40,14 @@
         emitResult();
     }
 
-signals:
+Q_SIGNALS:
     void started(KJob* job);
 };
 
 class TestExecuteCompositeJob : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void runOneJob();
     void runTwoJobs();
 };
diff --git a/util/tests/test_foregroundlock.h b/util/tests/test_foregroundlock.h
--- a/util/tests/test_foregroundlock.h
+++ b/util/tests/test_foregroundlock.h
@@ -25,7 +25,7 @@
 class TestForegroundLock : public QObject {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void testTryLock_data();
     void testTryLock();
 };
diff --git a/util/tests/test_kdevformatsource.h b/util/tests/test_kdevformatsource.h
--- a/util/tests/test_kdevformatsource.h
+++ b/util/tests/test_kdevformatsource.h
@@ -33,7 +33,7 @@
 class TestKdevFormatSource: public QObject {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void testNotFound();
     void testNotFound_data();
 
diff --git a/util/tests/test_kdevvarlengtharray.cpp b/util/tests/test_kdevvarlengtharray.cpp
--- a/util/tests/test_kdevvarlengtharray.cpp
+++ b/util/tests/test_kdevvarlengtharray.cpp
@@ -40,7 +40,7 @@
 class TestKDevVarLengthArray : public QObject {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     /**
      * Make sure that valgrind does not report any warnings here
      * about uninitialized member variables.
diff --git a/util/tests/test_path.h b/util/tests/test_path.h
--- a/util/tests/test_path.h
+++ b/util/tests/test_path.h
@@ -27,7 +27,7 @@
 class TestPath : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/vcs/dvcs/tests/test_dvcsjob.h b/vcs/dvcs/tests/test_dvcsjob.h
--- a/vcs/dvcs/tests/test_dvcsjob.h
+++ b/vcs/dvcs/tests/test_dvcsjob.h
@@ -27,7 +27,7 @@
 {
     Q_OBJECT
 
-    private slots:
+    private Q_SLOTS:
         void initTestCase();
         void cleanupTestCase();
         void testJob();
diff --git a/vcs/dvcs/ui/branchmanager.h b/vcs/dvcs/ui/branchmanager.h
--- a/vcs/dvcs/ui/branchmanager.h
+++ b/vcs/dvcs/ui/branchmanager.h
@@ -40,10 +40,10 @@
     BranchManager(const QString& repository, KDevelop::DistributedVersionControlPlugin* executor, QWidget *parent = nullptr);
     ~BranchManager() override;
 
-signals:
+Q_SIGNALS:
     void checkedOut(KJob*);
 
-private slots:
+private Q_SLOTS:
     void createBranch();
     void deleteBranch();
     void renameBranch();
diff --git a/vcs/interfaces/icontentawareversioncontrol.h b/vcs/interfaces/icontentawareversioncontrol.h
--- a/vcs/interfaces/icontentawareversioncontrol.h
+++ b/vcs/interfaces/icontentawareversioncontrol.h
@@ -40,11 +40,11 @@
 
     KTextEditor::Document* document() const;
 
-public slots:
+public Q_SLOTS:
     /// Abort this request.
     void abort();
 
-signals:
+Q_SIGNALS:
     void finished(bool canRecreate);
 
 protected:
diff --git a/vcs/models/brancheslistmodel.h b/vcs/models/brancheslistmodel.h
--- a/vcs/models/brancheslistmodel.h
+++ b/vcs/models/brancheslistmodel.h
@@ -59,10 +59,10 @@
         KDevelop::IProject* project() const;
         void setProject(KDevelop::IProject* p);
 
-    public slots:
+    public Q_SLOTS:
         void resetCurrent();
 
-    signals:
+    Q_SIGNALS:
         void currentBranchChanged();
 
     private:
diff --git a/vcs/models/tests/test_models.h b/vcs/models/tests/test_models.h
--- a/vcs/models/tests/test_models.h
+++ b/vcs/models/tests/test_models.h
@@ -27,7 +27,7 @@
 class TestModels : public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 
diff --git a/vcs/models/vcseventmodel.h b/vcs/models/vcseventmodel.h
--- a/vcs/models/vcseventmodel.h
+++ b/vcs/models/vcseventmodel.h
@@ -84,7 +84,7 @@
     void fetchMore(const QModelIndex& parent) override;
     bool canFetchMore(const QModelIndex& parent) const override;
 
-private slots:
+private Q_SLOTS:
     void jobReceivedResults( KJob* job );
 
 private:
diff --git a/vcs/models/vcsfilechangesmodel.h b/vcs/models/vcsfilechangesmodel.h
--- a/vcs/models/vcsfilechangesmodel.h
+++ b/vcs/models/vcsfilechangesmodel.h
@@ -109,7 +109,7 @@
 
     bool removeUrl(const QUrl& url);
 
-public slots:
+public Q_SLOTS:
     /**
      * Used to post update of status of some file. Any status except UpToDate
      * and Unknown will update (or add) item representation.
diff --git a/vcs/widgets/standardvcslocationwidget.h b/vcs/widgets/standardvcslocationwidget.h
--- a/vcs/widgets/standardvcslocationwidget.h
+++ b/vcs/widgets/standardvcslocationwidget.h
@@ -41,7 +41,7 @@
         void setLocation(const QUrl& remoteLocation) override;
         void setUrl(const QUrl& url);
 
-    public slots:
+    public Q_SLOTS:
         void textChanged(const QString& str);
         
     private:
diff --git a/vcs/widgets/vcscommitdialog.h b/vcs/widgets/vcscommitdialog.h
--- a/vcs/widgets/vcscommitdialog.h
+++ b/vcs/widgets/vcscommitdialog.h
@@ -33,7 +33,7 @@
     void setRecursive( bool );
     bool recursive() const;
 
-private slots:
+private Q_SLOTS:
     void ok();
     void cancel();
 
diff --git a/vcs/widgets/vcsdiffpatchsources.h b/vcs/widgets/vcsdiffpatchsources.h
--- a/vcs/widgets/vcsdiffpatchsources.h
+++ b/vcs/widgets/vcsdiffpatchsources.h
@@ -124,7 +124,7 @@
     QPointer<KTextEdit> m_commitMessageEdit;
     KDevelop::IBasicVersionControl* m_vcs;
     KComboBox* m_oldMessages;
-public slots:
+public Q_SLOTS:
     void addMessageToHistory(const QString& message);
     void oldMessageChanged(QString);
     void jobFinished(KJob*);
diff --git a/vcs/widgets/vcslocationwidget.h b/vcs/widgets/vcslocationwidget.h
--- a/vcs/widgets/vcslocationwidget.h
+++ b/vcs/widgets/vcslocationwidget.h
@@ -57,7 +57,7 @@
          */
         virtual void setLocation(const QUrl& remoteLocation) = 0;
 
-    signals:
+    Q_SIGNALS:
         void changed();
 };