diff options
| author | Tobias Hunger <tobias.hunger@gmx.de> | 2011-09-15 11:29:34 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-15 18:34:49 +0200 |
| commit | 1416f4c595d6078c08f93483695e0b64c7fbb2a7 (patch) | |
| tree | f77cb64a738d7b0d5f32f780e97c4b6f9a146739 /src | |
| parent | 80d406ce39d23ec6c859b9aa427dee8d0d3c9d50 (diff) | |
Fix warning when building objects with a Q_OBJECT macro
Do not trigger a self-assign warning when running into code containing
a Q_OBJECT macro. Currently this happens a lot e.g. when using clang
to build code using Qt.
Change-Id: I68995624b18406f337318599e463f36f87486e66
Reviewed-on: http://codereview.qt-project.org/4960
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src')
| -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 705956869d..48d05cec46 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -135,7 +135,7 @@ class QString; /* tmake ignore Q_OBJECT */ #define Q_OBJECT_CHECK \ template <typename T> inline void qt_check_for_QOBJECT_macro(const T &_q_argument) const \ - { int i = qYouForgotTheQ_OBJECT_Macro(this, &_q_argument); i = i; } + { int i = qYouForgotTheQ_OBJECT_Macro(this, &_q_argument); i = i + 1; } template <typename T> inline int qYouForgotTheQ_OBJECT_Macro(T, T) { return 0; } |