diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-14 22:00:12 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-14 22:00:12 (GMT) |
| commit | ca7a96943c122b8371caf98dc92f7e6644de1814 (patch) | |
| tree | 4aaed5a7e0401455090ea0d92dd1ff26d86f09f7 /src | |
| parent | f103ad276181090da8c70bd29f4474ea7657e03f (diff) | |
| parent | 9358d77fc1de64d2a8a06bfa4095dcde9f9b009b (diff) | |
| download | Qt-ca7a96943c122b8371caf98dc92f7e6644de1814.zip Qt-ca7a96943c122b8371caf98dc92f7e6644de1814.tar.gz Qt-ca7a96943c122b8371caf98dc92f7e6644de1814.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput.cpp | 1 | ||||
| -rw-r--r-- | src/gui/s60framework/qs60mainapplication.cpp | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index 637dd77..0903427 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -1464,6 +1464,7 @@ void QDeclarativeTextInputPrivate::init() void QDeclarativeTextInput::cursorPosChanged() { Q_D(QDeclarativeTextInput); + d->updateHorizontalScroll(); updateRect();//TODO: Only update rect between pos's updateMicroFocus(); emit cursorPositionChanged(); diff --git a/src/gui/s60framework/qs60mainapplication.cpp b/src/gui/s60framework/qs60mainapplication.cpp index 74432af..24d2496 100644 --- a/src/gui/s60framework/qs60mainapplication.cpp +++ b/src/gui/s60framework/qs60mainapplication.cpp @@ -47,6 +47,9 @@ #include "qs60mainapplication.h" #include <bautils.h> #include <coemain.h> +#ifndef Q_WS_S60 +# include <eikserverapp.h> +#endif QT_BEGIN_NAMESPACE @@ -152,7 +155,11 @@ CDictionaryStore *QS60MainApplication::OpenIniFileLC(RFs &aFs) const */ void QS60MainApplication::NewAppServerL(CApaAppServer *&aAppServer) { +#ifdef Q_WS_S60 QS60MainApplicationBase::NewAppServerL(aAppServer); +#else + aAppServer = new(ELeave) CEikAppServer; +#endif } QT_END_NAMESPACE |