From dedea5ea196281e50f7dc92eff16ebd018a65bb8 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Thu, 7 Jan 2010 13:53:48 +0100
Subject: [PATCH] Move Q_DECLARE_OPERATORS_FOR_FLAGS out of namespaces.
If this macro is used inside a namespace, it hides global operators.
Reviewed-by: hjk
---
src/plugins/cpptools/searchsymbols.h | 3 +--
src/plugins/qt4projectmanager/qtversionmanager.h | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/plugins/cpptools/searchsymbols.h b/src/plugins/cpptools/searchsymbols.h
index 69df0bdc672..e98e5acc200 100644
--- a/src/plugins/cpptools/searchsymbols.h
+++ b/src/plugins/cpptools/searchsymbols.h
@@ -134,11 +134,10 @@ private:
bool separateScope;
};
-Q_DECLARE_OPERATORS_FOR_FLAGS(SearchSymbols::SymbolTypes)
-
} // namespace Internal
} // namespace CppTools
+Q_DECLARE_OPERATORS_FOR_FLAGS(CppTools::Internal::SearchSymbols::SymbolTypes)
Q_DECLARE_METATYPE(CppTools::Internal::ModelItemInfo)
#endif // SEARCHSYMBOLS_H
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h
index ec49b3d7929..ea09da8adfe 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.h
+++ b/src/plugins/qt4projectmanager/qtversionmanager.h
@@ -179,8 +179,6 @@ private:
mutable QString m_linguistCommand;
};
-Q_DECLARE_OPERATORS_FOR_FLAGS(QtVersion::QmakeBuildConfigs)
-
struct QMakeAssignment
{
QString variable;
@@ -255,4 +253,6 @@ private:
} // namespace Qt4ProjectManager
+Q_DECLARE_OPERATORS_FOR_FLAGS(Qt4ProjectManager::QtVersion::QmakeBuildConfigs)
+
#endif // QTVERSIONMANAGER_H
--
GitLab