summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xdemos/declarative/samegame/content/samegame.js1
-rw-r--r--demos/declarative/twitter/content/HomeTitleBar.qml1
-rw-r--r--doc/src/declarative/globalobject.qdoc10
-rw-r--r--examples/declarative/loader/loader.pro2
-rw-r--r--examples/declarative/tutorials/helloworld/tutorial3.qml2
-rwxr-xr-xexamples/declarative/tutorials/samegame/samegame4/content/samegame.js1
-rw-r--r--src/declarative/graphicsitems/qmlgraphicslistview.cpp12
-rw-r--r--src/declarative/qml/qml.h2
-rw-r--r--src/declarative/qml/qmlxmlhttprequest.cpp14
-rw-r--r--src/s60installs/s60installs.pro4
10 files changed, 21 insertions, 28 deletions
diff --git a/demos/declarative/samegame/content/samegame.js b/demos/declarative/samegame/content/samegame.js
index 3598c26..8651c84 100755
--- a/demos/declarative/samegame/content/samegame.js
+++ b/demos/declarative/samegame/content/samegame.js
@@ -235,6 +235,7 @@ function sendHighScore(name) {
var postData = "name="+name+"&score="+gameCanvas.score
+"&gridSize="+maxX+"x"+maxY +"&time="+Math.floor(timer/1000);
postman.open("POST", scoresURL, true);
+ postman.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
postman.onreadystatechange = function() {
if (postman.readyState == postman.DONE) {
dialog.show("Your score has been uploaded.");
diff --git a/demos/declarative/twitter/content/HomeTitleBar.qml b/demos/declarative/twitter/content/HomeTitleBar.qml
index e5bdb85..c48befd 100644
--- a/demos/declarative/twitter/content/HomeTitleBar.qml
+++ b/demos/declarative/twitter/content/HomeTitleBar.qml
@@ -24,6 +24,7 @@ Item {
titleBar.update();
}
}
+ postman.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
postman.send(postData);
editor.text = ""
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index 3eadec2..2bed1c1 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -42,17 +42,9 @@
/*!
\page qmlglobalobject.html
\title QML Global Object
-Contains all the properties of the ECMAScript global object, plus:
-\list
-\o Qt
-\o createQmlObject
-\o createComponent
-\o XMLHttpRequest
-\o openDatabase
-\endlist
+Contains all the properties of the ECMAScript global object, plus:
-Contents:
\tableofcontents
\section1 Qt Object
diff --git a/examples/declarative/loader/loader.pro b/examples/declarative/loader/loader.pro
index 0ad71f7..edd6267 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/tutorials/helloworld/tutorial3.qml b/examples/declarative/tutorials/helloworld/tutorial3.qml
index 52c3fe8..0f27f86 100644
--- a/examples/declarative/tutorials/helloworld/tutorial3.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial3.qml
@@ -29,7 +29,7 @@ Rectangle {
from: ""; to: "down"; reversible: true
ParallelAnimation {
NumberAnimation { matchProperties: "y,rotation"; duration: 500; easing: "easeInOutQuad" }
- ColorAnimation { property: "color"; duration: 500 }
+ ColorAnimation { duration: 500 }
}
}
//![3]
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
index b833385..2a0d718 100755
--- a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
+++ b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js
@@ -238,6 +238,7 @@ function sendHighScore(name) {
var postData = "name="+name+"&score="+gameCanvas.score
+"&gridSize="+maxX+"x"+maxY +"&time="+Math.floor(timer/1000);
postman.open("POST", scoresURL, true);
+ postman.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
postman.onreadystatechange = function() {
if (postman.readyState == postman.DONE) {
dialog.show("Your score has been uploaded.");
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));
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>(#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<TYPE,EXTENSION>(#URI, VERSION_MAJ, VERSION_MIN, #NAME, #TYPE);
#define QML_DEFINE_TYPE(URI, VERSION_MAJ, VERSION_MIN, NAME, TYPE) \
diff --git a/src/declarative/qml/qmlxmlhttprequest.cpp b/src/declarative/qml/qmlxmlhttprequest.cpp
index 642c6de..216db6e 100644
--- a/src/declarative/qml/qmlxmlhttprequest.cpp
+++ b/src/declarative/qml/qmlxmlhttprequest.cpp
@@ -1208,14 +1208,16 @@ void QmlXMLHttpRequest::error(QNetworkReply::NetworkError error)
m_request = QNetworkRequest();
destroyNetwork();
- if (error != QNetworkReply::ContentAccessDenied &&
- error != QNetworkReply::ContentOperationNotPermittedError &&
- error != QNetworkReply::ContentNotFoundError) {
- m_errorFlag = true;
- } else {
+ if (error == QNetworkReply::ContentAccessDenied ||
+ error == QNetworkReply::ContentOperationNotPermittedError ||
+ error == QNetworkReply::ContentNotFoundError ||
+ error == QNetworkReply::AuthenticationRequiredError ||
+ error == QNetworkReply::ContentReSendError) {
m_state = Loading;
dispatchCallback();
- }
+ } else {
+ m_errorFlag = true;
+ }
m_state = Done;
dispatchCallback();
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
generated by cgit v0.12 at 2025-02-15 15:41:49 (GMT)