summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2009-10-19 07:43:36 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2009-10-29 16:00:09 (GMT)
commit7246b5a5942049b485bfdefbe133d7bb12165301 (patch)
treed062a4672abdfc64395fea69fc11eb2f3b942fa5 /src/gui
parent7c1122b79df61668525b63670c03c5da7e44ac9c (diff)
downloadQt-7246b5a5942049b485bfdefbe133d7bb12165301.zip
Qt-7246b5a5942049b485bfdefbe133d7bb12165301.tar.gz
Qt-7246b5a5942049b485bfdefbe133d7bb12165301.tar.bz2
Fix QT_NO_ACTION dependencies
Reviewed-by: tom
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qsoftkeymanager.cpp3
-rw-r--r--src/gui/kernel/qsoftkeymanager_p.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp
index 75c321e..5249dab 100644
--- a/src/gui/kernel/qsoftkeymanager.cpp
+++ b/src/gui/kernel/qsoftkeymanager.cpp
@@ -48,6 +48,7 @@
#include "private/qsoftkeymanager_p.h"
#include "private/qobject_p.h"
+#ifndef QT_NO_SOFTKEYMANAGER
QT_BEGIN_NAMESPACE
#ifdef Q_WS_S60
@@ -277,4 +278,4 @@ void QSoftKeyManagerPrivate::updateSoftKeys_sys(const QList<QAction*> &)
#endif
QT_END_NAMESPACE
-
+#endif //QT_NO_SOFTKEYMANAGER
diff --git a/src/gui/kernel/qsoftkeymanager_p.h b/src/gui/kernel/qsoftkeymanager_p.h
index b455445..62d872f 100644
--- a/src/gui/kernel/qsoftkeymanager_p.h
+++ b/src/gui/kernel/qsoftkeymanager_p.h
@@ -58,6 +58,7 @@
QT_BEGIN_HEADER
+#ifndef QT_NO_SOFTKEYMANAGER
QT_BEGIN_NAMESPACE
class QSoftKeyManagerPrivate;
@@ -100,6 +101,7 @@ private Q_SLOTS:
};
QT_END_NAMESPACE
+#endif //QT_NO_SOFTKEYMANAGER
QT_END_HEADER