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/widgets/kernel/qlayout.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/widgets/kernel/qlayout.h')
| -rw-r--r-- | src/widgets/kernel/qlayout.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index 5d14aae58b..65fccb13fa 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -79,12 +79,6 @@ public: SetFixedSize, SetMaximumSize, SetMinAndMaxSize -#if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN) - , Auto = SetDefaultConstraint, - FreeResize = SetNoConstraint, - Minimum = SetMinimumSize, - Fixed = SetFixedSize -#endif }; QLayout(QWidget *parent); @@ -173,12 +167,10 @@ private: //### support old includes -#if 1 //def QT3_SUPPORT QT_BEGIN_INCLUDE_NAMESPACE #include <QtWidgets/qboxlayout.h> #include <QtWidgets/qgridlayout.h> QT_END_INCLUDE_NAMESPACE -#endif QT_END_NAMESPACE |