diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-05-15 08:57:53 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2019-05-15 07:36:48 +0000 |
| commit | 075d674c5a81e7f201f9aa3d16a3d171f34537d2 (patch) | |
| tree | 159f2d4f94e58aa8af0d62519407bfd787e16264 | |
| parent | 8a716ef12a97e25d936bfef089535771ded8974b (diff) | |
Core/Qmake: Move Q_DECLARE_OPERATORS_FOR_FLAGS outside the namespace
Change-Id: I9f956faa71dcb8d5acf2c50711a33813a091903c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | src/plugins/coreplugin/iversioncontrol.h | 4 | ||||
| -rw-r--r-- | src/plugins/qmakeprojectmanager/addlibrarywizard.h | 4 | ||||
| -rw-r--r-- | 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 cdb780f7fc..9a5ef2e783 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 196d31885c..ad2372f007 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 7d3dca765d..31467c0e66 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) |