Core: Remove duplicate QtPrivate namespace
The logging category macro already puts the logging category into the QtPrivate namespace. There is no need to wrap it into another QtPrivate namespace. Fixes: QTBUG-132111 Change-Id: I99a7aa16662e3515c5f96d6736d47c1d0e45034c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 4f05eac0a88959ff0faa4d6b194d9dd8eeb3f4b6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
a2b68996b2
commit
a256dba802
@ -370,9 +370,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters)
|
||||
\sa QT_DISABLE_DEPRECATED_UP_TO, QT_NO_KEYWORDS, QT_VERSION_CHECK
|
||||
*/
|
||||
|
||||
namespace QtPrivate {
|
||||
Q_LOGGING_CATEGORY(lcNativeInterface, "qt.nativeinterface")
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
|
@ -20,9 +20,7 @@
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
namespace QtPrivate {
|
||||
QT_DECLARE_EXPORTED_QT_LOGGING_CATEGORY(lcNativeInterface, Q_CORE_EXPORT)
|
||||
}
|
||||
|
||||
// Provides a definition for the interface destructor
|
||||
#define QT_DEFINE_NATIVE_INTERFACE_2(Namespace, InterfaceClass) \
|
||||
@ -35,7 +33,6 @@ QT_DECLARE_EXPORTED_QT_LOGGING_CATEGORY(lcNativeInterface, Q_CORE_EXPORT)
|
||||
|
||||
#define QT_NATIVE_INTERFACE_RETURN_IF(NativeInterface, baseType) \
|
||||
{ \
|
||||
using QtPrivate::lcNativeInterface; \
|
||||
using QNativeInterface::Private::TypeInfo; \
|
||||
qCDebug(lcNativeInterface, "Comparing requested interface name %s with available %s", \
|
||||
name, TypeInfo<NativeInterface>::name()); \
|
||||
|
Loading…
x
Reference in New Issue
Block a user