From 56bbf3c2d5b31142e5a1b872a0118479edcf874b Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Thu, 5 Sep 2013 14:36:04 +0200 Subject: QMetaMethod and QDBusMetaObject: Give public access to signal methods To be consistent with signals which are public since Qt5. Change-Id: I633077e37d0851b118c22da0681e8b8b1892ddbb Reviewed-by: Olivier Goffart --- src/corelib/kernel/qmetaobjectbuilder.cpp | 5 ++--- src/dbus/qdbusmetaobject.cpp | 2 +- src/tools/moc/moc.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index 4c727f9d3d..ac57454169 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -510,7 +510,7 @@ QMetaMethodBuilder QMetaObjectBuilder::addSignal(const QByteArray& signature) { int index = d->methods.size(); d->methods.append(QMetaMethodBuilderPrivate - (QMetaMethod::Signal, signature, QByteArray("void"), QMetaMethod::Protected)); + (QMetaMethod::Signal, signature, QByteArray("void"), QMetaMethod::Public)); return QMetaMethodBuilder(this, index); } @@ -2005,8 +2005,7 @@ void QMetaMethodBuilder::setTag(const QByteArray& value) /*! Returns the access specification of this method (private, protected, or public). The default value is QMetaMethod::Public for methods, - slots, and constructors. The default value is QMetaMethod::Protected - for signals. + slots, signals and constructors. \sa setAccess() */ diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index 127cf6658c..51c0b27668 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -348,7 +348,7 @@ void QDBusMetaObjectGenerator::parseSignals() prototype.append(')'); // meta method flags - mm.flags = AccessProtected | MethodSignal | MethodScriptable; + mm.flags = AccessPublic | MethodSignal | MethodScriptable; // add signals_.insert(QMetaObject::normalizedSignature(prototype), mm); diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index fd1d2155fc..648723ebc1 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -988,7 +988,7 @@ void Moc::parseSignals(ClassDef *def) prev(); } FunctionDef funcDef; - funcDef.access = FunctionDef::Protected; + funcDef.access = FunctionDef::Public; parseFunction(&funcDef); if (funcDef.isVirtual) warning("Signals cannot be declared virtual"); -- cgit v1.2.3