From e25e77c3d8bfd0f33aeea2484d714ade6a65a664 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Fri, 27 Nov 2009 11:55:49 +1000 Subject: Symbian fixes. --- examples/declarative/loader/loader.pro | 2 +- examples/declarative/loader/qmlfolderlistmodel.h | 2 +- src/declarative/qml/qml.h | 2 +- src/s60installs/s60installs.pro | 4 ---- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/examples/declarative/loader/loader.pro b/examples/declarative/loader/loader.pro index 9ee0933..84b2d21 100644 --- a/examples/declarative/loader/loader.pro +++ b/examples/declarative/loader/loader.pro @@ -12,7 +12,7 @@ INSTALLS += target sources symbian { # TARGET.UID3 = include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - TARGET.EPOCHEAPSIZE = 100000 20000000 + TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h LIBS += -lesock -lconnmon -linsock TARGET.CAPABILITY = NetworkServices diff --git a/examples/declarative/loader/qmlfolderlistmodel.h b/examples/declarative/loader/qmlfolderlistmodel.h index f4fa9ed..1cd881f 100644 --- a/examples/declarative/loader/qmlfolderlistmodel.h +++ b/examples/declarative/loader/qmlfolderlistmodel.h @@ -43,7 +43,7 @@ #define QMLFOLDERLISTMODEL_H #include -#include +#include class QmlContext; class QModelIndex; diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h index 2c03aad..323525b 100644 --- a/src/declarative/qml/qml.h +++ b/src/declarative/qml/qml.h @@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE #define QML_DEFINE_INTERFACE(INTERFACE) \ static int defineInterface##INTERFACE = qmlRegisterInterface(#INTERFACE); -#define QML_DEFINE_EXTENDED_TYPE(URI, VERSION_MAJ, VERS, NAME, TYPE, EXTENSION) \ +#define QML_DEFINE_EXTENDED_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE, EXTENSION) \ static int registerExtended##TYPE = qmlRegisterExtendedType(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE); #define QML_DEFINE_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE) \ diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 3fade73..2d9c489 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -109,10 +109,6 @@ symbian: { qtlibraries.sources += QtWebKit.dll } - contains(QT_CONFIG, declarative): { - qtlibraries.sources += QtDeclarative.dll - } - graphicssystems_plugins.path = c:$$QT_PLUGINS_BASE_DIR/graphicssystems contains(QT_CONFIG, openvg) { qtlibraries.sources += QtOpenVG.dll -- cgit v0.12 From e745245bd86333b0512f50728b80c4610a081a44 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Fri, 27 Nov 2009 13:47:03 +1000 Subject: Some fixes for positionViewAtIndex(). --- src/declarative/graphicsitems/qmlgraphicslistview.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/declarative/graphicsitems/qmlgraphicslistview.cpp b/src/declarative/graphicsitems/qmlgraphicslistview.cpp index 0224465..7d0b99a 100644 --- a/src/declarative/graphicsitems/qmlgraphicslistview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicslistview.cpp @@ -1716,15 +1716,14 @@ void QmlGraphicsListView::decrementCurrentIndex() void QmlGraphicsListView::positionViewAtIndex(int index) { Q_D(QmlGraphicsListView); - if (index < 0 || index >= d->model->count()) + if (!d->isValid() || index < 0 || index >= d->model->count()) return; + qreal maxExtent = d->orient == QmlGraphicsListView::Vertical ? -maxYExtent() : -maxXExtent(); FxListItem *item = d->visibleItem(index); if (item) { // Already created - just move to top of view - int pos = item->position(); - if (item->position() > -maxYExtent()) - pos = -maxYExtent(); + int pos = qMin(item->position(), maxExtent); d->setPosition(pos); } else { int pos = d->positionAt(index); @@ -1734,8 +1733,9 @@ void QmlGraphicsListView::positionViewAtIndex(int index) d->visiblePos = pos; d->visibleIndex = index; d->setPosition(pos); - if (d->position() > -maxYExtent()) - d->setPosition(-maxYExtent()); + // setPosition() will cause refill. Adjust if we have moved beyond range. + if (d->position() > maxExtent) + d->setPosition(maxExtent); // now release the reference to all the old visible items. for (int i = 0; i < oldVisible.count(); ++i) d->releaseItem(oldVisible.at(i)); -- cgit v0.12