From 075d674c5a81e7f201f9aa3d16a3d171f34537d2 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Wed, 15 May 2019 08:57:53 +0300
Subject: [PATCH] Core/Qmake: Move Q_DECLARE_OPERATORS_FOR_FLAGS outside the
 namespace

Change-Id: I9f956faa71dcb8d5acf2c50711a33813a091903c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/coreplugin/iversioncontrol.h           | 4 ++--
 src/plugins/qmakeprojectmanager/addlibrarywizard.h | 4 ++--
 src/shared/proparser/prowriter.h                   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/coreplugin/iversioncontrol.h b/src/plugins/coreplugin/iversioncontrol.h
index cdb780f7fc4..9a5ef2e7836 100644
--- a/src/plugins/coreplugin/iversioncontrol.h
+++ b/src/plugins/coreplugin/iversioncontrol.h
@@ -226,10 +226,10 @@ private:
     TopicCache *m_topicCache;
 };
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(Core::IVersionControl::SettingsFlags)
-
 } // namespace Core
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(Core::IVersionControl::SettingsFlags)
+
 #if defined(WITH_TESTS)
 
 #include <QSet>
diff --git a/src/plugins/qmakeprojectmanager/addlibrarywizard.h b/src/plugins/qmakeprojectmanager/addlibrarywizard.h
index 196d31885c9..ad2372f0072 100644
--- a/src/plugins/qmakeprojectmanager/addlibrarywizard.h
+++ b/src/plugins/qmakeprojectmanager/addlibrarywizard.h
@@ -92,8 +92,6 @@ private:
     QString m_proFile;
 };
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(AddLibraryWizard::Platforms)
-
 class LibraryTypePage : public QWizardPage
 {
     Q_OBJECT
@@ -139,3 +137,5 @@ private:
 
 } // namespace Internal
 } // namespace QmakeProjectManager
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QmakeProjectManager::Internal::AddLibraryWizard::Platforms)
diff --git a/src/shared/proparser/prowriter.h b/src/shared/proparser/prowriter.h
index 7d3dca765d9..31467c0e661 100644
--- a/src/shared/proparser/prowriter.h
+++ b/src/shared/proparser/prowriter.h
@@ -66,7 +66,7 @@ private:
     static QString compileScope(const QString &scope);
 };
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(ProWriter::PutFlags)
-
 } // namespace Internal
 } // namespace QmakeProjectManager
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(QmakeProjectManager::Internal::ProWriter::PutFlags)