diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-09-28 22:20:06 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-03 05:59:07 +0200 |
commit | 3fd9398052d2b483d2830c3661ceed26e551fa49 (patch) | |
tree | 9eeca582e2c749aca76c3df38ffb1043344a70c6 /src/corelib/global/qglobal.h | |
parent | 302b3c7d073d1bccd4468c990510697b77b2ece9 (diff) |
Remove the remaining traces of QT3_SUPPORT
The only place that now still knows about it is moc,
so it can still parse old headers.
Change-Id: Iafec080f99c67560974e9ebc0cbfb27d9a4b2d6f
Reviewed-on: http://codereview.qt-project.org/5755
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/corelib/global/qglobal.h')
-rw-r--r-- | src/corelib/global/qglobal.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 6fb71fc0c6..2d2db2440d 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1078,11 +1078,7 @@ redefine to built-in booleans to make autotests work properly */ /* moc compats (signals/slots) */ #ifndef QT_MOC_COMPAT -# if defined(QT3_SUPPORT) -# define QT_MOC_COMPAT QT3_SUPPORT -# else -# define QT_MOC_COMPAT -# endif +# define QT_MOC_COMPAT #else # undef QT_MOC_COMPAT # define QT_MOC_COMPAT |