diff options
Diffstat (limited to 'src/declarative/graphicsitems')
3 files changed, 1 insertions, 15 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp index 96f8a82b..30c91246 100644 --- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp +++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp @@ -655,10 +655,7 @@ void QDeclarativeMouseArea::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) void QDeclarativeMouseArea::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { bool acceptsContextMenuButton; -#if defined(Q_OS_SYMBIAN) - // In Symbian a Long Tap on the screen will trigger. See QSymbianControl::HandleLongTapEventL(). - acceptsContextMenuButton = acceptedButtons() & Qt::LeftButton; -#elif defined(Q_WS_WINCE) +#if defined(Q_WS_WINCE) // ### WinCE can trigger context menu event with a gesture in the left button or a // click with the right button. Since we have no way here to differentiate them when // event happens, accepting either of the them will block the event. diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h index f73413b6..abc382cf 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h @@ -76,11 +76,6 @@ public: mouseSelectionMode(QDeclarativeTextEdit::SelectCharacters), selectByMouse(false), canPaste(false), yoff(0) { -#ifdef Q_OS_SYMBIAN - if (QSysInfo::symbianVersion() >= QSysInfo::SV_SF_1) { - showInputPanelOnFocus = false; - } -#endif } void init(); diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h index f91ed5af..375f4dcd 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h @@ -79,12 +79,6 @@ public: autoScroll(true), selectByMouse(false), canPaste(false), hAlignImplicit(true), selectPressed(false) { -#ifdef Q_OS_SYMBIAN - if (QSysInfo::symbianVersion() >= QSysInfo::SV_SF_1) { - showInputPanelOnFocus = false; - } -#endif - } ~QDeclarativeTextInputPrivate() |