diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-04-17 10:38:24 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-17 10:38:24 +0200 |
| commit | 16b53b2f0e3f8f64a59c465493a6209eb7f9ab47 (patch) | |
| tree | bbb63401eb3c56c32ad9bd9be66bae8d3590de6b /src/corelib/kernel/qobjectdefs.h | |
| parent | 2c13dc7482690756280cfefe8515eb809b069721 (diff) | |
| parent | 9bd032355163d92cda5e7e59ecd21214b131f187 (diff) | |
Merge "Merge remote-tracking branch 'origin/master' into api_changes" into refs/staging/api_changes
Diffstat (limited to 'src/corelib/kernel/qobjectdefs.h')
| -rw-r--r-- | src/corelib/kernel/qobjectdefs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index 5ad070d3b1..9bcb8b9211 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -465,7 +465,7 @@ public: Connection(); Connection(const Connection &other); Connection &operator=(const Connection &other); -#ifdef qdoc +#ifdef Q_QDOC operator bool() const; #else typedef void *Connection::*RestrictedBool; |