forked from qt-creator/qt-creator
Move Q_DECLARE_OPERATORS_FOR_FLAGS out of namespaces.
If this macro is used inside a namespace, it hides global operators. Reviewed-by: hjk
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user