summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qfeatures.h
diff options
context:
space:
mode:
authorIvan Komissarov <ABBAPOH@gmail.com>2012-07-07 01:19:46 +0400
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-24 10:55:17 +0200
commitf3a723f2ec3a4fc59df21164f9ec2eaf1e50abc8 (patch)
tree2ae7def39715607b4d0c2b4469be324bb15b8dad /src/corelib/global/qfeatures.h
parent75abfa89821e0c64022d90bba227b947947169d4 (diff)
Add QKeySequenceEdit
Change-Id: I497309d3e6cbf38b298afb5ff3cb1ed6a0e82000 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/global/qfeatures.h')
-rw-r--r--src/corelib/global/qfeatures.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index 2cadea59c1..ba84dd109e 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -115,6 +115,9 @@
// Image Text
//#define QT_NO_IMAGE_TEXT
+// QKeySequenceEdit
+//#define QT_NO_KEYSEQUENCEEDIT
+
// QLCDNumber
//#define QT_NO_LCDNUMBER
@@ -306,6 +309,11 @@
#define QT_NO_IMAGEFORMATPLUGIN
#endif
+// QKeySequenceEdit
+#if !defined(QT_NO_KEYSEQUENCEEDIT) && (defined(QT_NO_SHORTCUT))
+#define QT_NO_KEYSEQUENCEEDIT
+#endif
+
// QLocalServer
#if !defined(QT_NO_LOCALSERVER) && (defined(QT_NO_TEMPORARYFILE))
#define QT_NO_LOCALSERVER