diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2012-09-21 11:37:31 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-25 00:08:16 +0200 |
| commit | ba2c485c55eb2d0bf4c2478f604f51840908d30a (patch) | |
| tree | 73fb3de563b1949d88e262d595219ccda22eed10 /src | |
| parent | 6ddef0007ae557d9be3e577fb8397654482ac7f3 (diff) | |
Ignore the QT_NAMESPACE for moc runs
Moc should not see a defined QT_NAMESPACE, to
keep the names of all symbols consistent with
an un-namespaced Qt.
Change-Id: Ia72afabaa0820b02a0863148510122ce942a5082
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 06e490ada3..60b90dc70f 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -79,7 +79,7 @@ #include <algorithm> -#ifndef QT_NAMESPACE /* user namespace */ +#if !defined(QT_NAMESPACE) || defined(Q_MOC_RUN) /* user namespace */ # define QT_PREPEND_NAMESPACE(name) ::name # define QT_USE_NAMESPACE |