From 38e8f6df7844adae0b443f56bd7380395c5afd78 Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Thu, 12 Jul 2012 02:49:47 +0900 Subject: remove QT_NO_SIGNALMAPPER from features QSignalMapper is a small and extremely low-level interface. Change-Id: I7e799673c6fe559178739fbc58385141ae3f0789 Reviewed-by: Oswald Buddenhagen --- src/corelib/global/qfeatures.h | 3 --- src/corelib/global/qfeatures.txt | 7 ------- src/corelib/kernel/qsignalmapper.cpp | 3 --- src/corelib/kernel/qsignalmapper.h | 3 --- 4 files changed, 16 deletions(-) diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index c51b090a6c..0f8f2b89d3 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -175,9 +175,6 @@ // QShortcut //#define QT_NO_SHORTCUT -// QSignalMapper -//#define QT_NO_SIGNALMAPPER - // QSizeGrip //#define QT_NO_SIZEGRIP diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index f0b3e4e071..1a721e78b0 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -520,13 +520,6 @@ Requires: Name: Status Tip SeeAlso: ??? -Feature: SIGNALMAPPER -Description: Supports bundling of signals from identifiable senders. -Section: Widgets -Requires: -Name: QSignalMapper -SeeAlso: ??? - Feature: WHATSTHIS Description: Supports displaying "What's this" help. Section: Widgets diff --git a/src/corelib/kernel/qsignalmapper.cpp b/src/corelib/kernel/qsignalmapper.cpp index c668047bd2..1feac89175 100644 --- a/src/corelib/kernel/qsignalmapper.cpp +++ b/src/corelib/kernel/qsignalmapper.cpp @@ -40,7 +40,6 @@ ****************************************************************************/ #include "qsignalmapper.h" -#ifndef QT_NO_SIGNALMAPPER #include "qhash.h" #include "qobject_p.h" @@ -305,5 +304,3 @@ QT_END_NAMESPACE #include "moc_qsignalmapper.cpp" -#endif // QT_NO_SIGNALMAPPER - diff --git a/src/corelib/kernel/qsignalmapper.h b/src/corelib/kernel/qsignalmapper.h index f4e7879697..14eacfe6a8 100644 --- a/src/corelib/kernel/qsignalmapper.h +++ b/src/corelib/kernel/qsignalmapper.h @@ -48,8 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE - -#ifndef QT_NO_SIGNALMAPPER class QSignalMapperPrivate; class Q_CORE_EXPORT QSignalMapper : public QObject @@ -85,7 +83,6 @@ private: Q_DISABLE_COPY(QSignalMapper) Q_PRIVATE_SLOT(d_func(), void _q_senderDestroyed()) }; -#endif // QT_NO_SIGNALMAPPER QT_END_NAMESPACE -- cgit v1.2.3