diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 11:49:43 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 11:49:47 +0100 |
| commit | 63f24f6ba8417e90294a1a90d01a3c3de80b7af4 (patch) | |
| tree | 27b5788a3e7c1e94b484e642142b1be8ff8da318 /src/corelib/kernel/qobject.h | |
| parent | ae2359d49e171c61450b17b1eb0e0dd7a20c7ca4 (diff) | |
| parent | 05659223bf02c8bac0463fe1e7a9364ef5677b75 (diff) | |
Merge branch 'stable' into dev
Change-Id: I7f0dab6bdb1f3cc1d3e6c30166ff6db9dfae37e9
Diffstat (limited to 'src/corelib/kernel/qobject.h')
| -rw-r--r-- | src/corelib/kernel/qobject.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index 36aded2cdb..faf3e2c09e 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -125,7 +125,7 @@ public: virtual bool event(QEvent *); virtual bool eventFilter(QObject *, QEvent *); -#ifdef qdoc +#ifdef Q_QDOC static QString tr(const char *sourceText, const char *comment = 0, int n = -1); static QString trUtf8(const char *sourceText, const char *comment = 0, int n = -1); virtual const QMetaObject *metaObject() const; @@ -367,7 +367,7 @@ public: Q_SIGNALS: void destroyed(QObject * = 0); void objectNameChanged(const QString &objectName -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); @@ -438,7 +438,7 @@ public: }; #endif -#ifdef qdoc +#ifdef Q_QDOC T qFindChild(const QObject *o, const QString &name = QString()); QList<T> qFindChildren(const QObject *oobj, const QString &name = QString()); QList<T> qFindChildren(const QObject *o, const QRegExp &re); |