Skip to content
Snippets Groups Projects
Commit dedea5ea authored by ck's avatar ck
Browse files

Move Q_DECLARE_OPERATORS_FOR_FLAGS out of namespaces.

If this macro is used inside a namespace, it hides global operators.

Reviewed-by: hjk
parent 9a0baca9
No related branches found
No related tags found
No related merge requests found
...@@ -134,11 +134,10 @@ private: ...@@ -134,11 +134,10 @@ private:
bool separateScope; bool separateScope;
}; };
Q_DECLARE_OPERATORS_FOR_FLAGS(SearchSymbols::SymbolTypes)
} // namespace Internal } // namespace Internal
} // namespace CppTools } // namespace CppTools
Q_DECLARE_OPERATORS_FOR_FLAGS(CppTools::Internal::SearchSymbols::SymbolTypes)
Q_DECLARE_METATYPE(CppTools::Internal::ModelItemInfo) Q_DECLARE_METATYPE(CppTools::Internal::ModelItemInfo)
#endif // SEARCHSYMBOLS_H #endif // SEARCHSYMBOLS_H
...@@ -179,8 +179,6 @@ private: ...@@ -179,8 +179,6 @@ private:
mutable QString m_linguistCommand; mutable QString m_linguistCommand;
}; };
Q_DECLARE_OPERATORS_FOR_FLAGS(QtVersion::QmakeBuildConfigs)
struct QMakeAssignment struct QMakeAssignment
{ {
QString variable; QString variable;
...@@ -255,4 +253,6 @@ private: ...@@ -255,4 +253,6 @@ private:
} // namespace Qt4ProjectManager } // namespace Qt4ProjectManager
Q_DECLARE_OPERATORS_FOR_FLAGS(Qt4ProjectManager::QtVersion::QmakeBuildConfigs)
#endif // QTVERSIONMANAGER_H #endif // QTVERSIONMANAGER_H
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment