summaryrefslogtreecommitdiffstats
path: root/dist/changes-4.5.2
Commit message (Expand)AuthorAgeFilesLines
* Update URL's to use new domain.Jason McDonald2009-08-121-2/+2
* Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-06-191-0/+4
* Backported WebKit SVG revisions (r43590, r43795) from the trunkSimon Hausmann2009-06-161-0/+1
* Doc: My review of earlier changes plus some minor adjustments and fixes.David Boddie2009-06-121-116/+116
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Geir Vattekar2009-06-121-0/+7
|\
| * Changes for 4.5.2Leonardo Sobral Cunha2009-06-121-0/+7
* | Doc: Work on the 4.5.2 changes file.Geir Vattekar2009-06-121-152/+124
|/
* More entries for the change logJens Bache-Wiig2009-06-081-0/+12
* My changes for 4.5.2Jarek Kobus2009-06-081-0/+4
* Fixed typos.Trond Kjernåsen2009-06-051-2/+2
* My 4.5.2 changes.Trond Kjernåsen2009-06-051-1/+43
* My changes for 4.5.2.jasplin2009-06-051-0/+18
* My changes for 4.5.2Thomas Hartmann2009-06-051-1/+3
* My changelog for 4.5.2Alexis Menard2009-06-051-0/+11
* my public task ...Oswald Buddenhagen2009-06-041-0/+3
* Add my changelog for 4.5.2Thiago Macieira2009-06-041-0/+9
* BT: Fixes Crash when deleting a QProgressBar which has been styled with QMoti...Olivier Goffart2009-06-041-0/+3
* More changes for 4.5.2João Abecasis2009-06-031-0/+1
* My changes for 4.5.2João Abecasis2009-06-031-0/+17
* Update my changelog for 4.5.2Olivier Goffart2009-06-021-0/+39
* my changes for 4.5.2Joerg Bornemann2009-06-021-0/+1
* My Changelog for 4.5.2Peter Hartmann2009-06-021-0/+10
* Changelog for 4.5.2Denis Dzyubenko2009-06-021-0/+5
* My 4.5.2 changes for the changelog.Samuel Rødal2009-06-021-1/+25
* My changes for Qt 4.5.2.Norwegian Rock Cat2009-06-021-0/+18
* Changes for DirectFBAnders Bakken2009-05-281-0/+20
* Updates QtWebKit sections in changes-4.5.2 after commit 0babd12e.Ariya Hidayat2009-05-221-2/+2
* Updated WebKit from /home/ariya/dev/webkit/qtwebkit-4.5 to origin/qtwebkit-4....Ariya Hidayat2009-05-191-1/+1
* Mentioned the new fancy browser example in the changes-4.5.2.Ariya Hidayat2009-05-191-0/+2
* Update QtWebKit changes for the next patch release.Ariya Hidayat2009-05-181-0/+10
* Wrote Designer/uic changelog for 4.5.2.Friedemann Kleint2009-05-181-2/+13
* Create the placeholder changes file for Qt 4.5.2.Jason McDonald2009-04-271-0/+123
generated by cgit v0.12 at 2024-09-25 06:41:56 (GMT)
changed, 600 insertions, 355 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index bc9b6fd..d2897eb 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -1941,12 +1941,12 @@ void QDeclarativeTextInput::selectionChanged()
void QDeclarativeTextInput::q_textChanged()
{
Q_D(QDeclarativeTextInput);
+ emit textChanged();
+ emit displayTextChanged();
updateSize();
d->determineHorizontalAlignment();
d->updateHorizontalScroll();
updateMicroFocus();
- emit textChanged();
- emit displayTextChanged();
if(hasAcceptableInput() != d->oldValidity){
d->oldValidity = hasAcceptableInput();
emit acceptableInputChanged();
diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index ca3bc37..689cd00 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -243,12 +243,13 @@ QDeclarativeBinding::createBinding(Identifier id, QObject *obj, QDeclarativeCont
if (id < 0)
return 0;
+ Q_ASSERT(ctxt);
QDeclarativeContextData *ctxtdata = QDeclarativeContextData::get(ctxt);
- QDeclarativeEnginePrivate *engine = QDeclarativeEnginePrivate::get(qmlEngine(obj));
+ QDeclarativeEnginePrivate *engine = QDeclarativeEnginePrivate::get(ctxtdata->engine);
QDeclarativeCompiledData *cdata = 0;
QDeclarativeTypeData *typeData = 0;
- if (engine && ctxtdata && !ctxtdata->url.isEmpty()) {
+ if (!ctxtdata->url.isEmpty()) {
typeData = engine->typeLoader.get(ctxtdata->url);
cdata = typeData->compiledData();
}
diff --git a/src/gui/graphicsview/qgraphicslayout.cpp b/src/gui/graphicsview/qgraphicslayout.cpp
index 76d2d04..6fbe849 100644
--- a/src/gui/graphicsview/qgraphicslayout.cpp
+++ b/src/gui/graphicsview/qgraphicslayout.cpp
@@ -269,18 +269,8 @@ void QGraphicsLayout::activate()
return;
Q_ASSERT(!parentItem->isLayout());
- if (QGraphicsLayout::instantInvalidatePropagation()) {
- QGraphicsWidget *parentWidget = static_cast<QGraphicsWidget*>(parentItem);
- if (!parentWidget->parentLayoutItem()) {
- // we've reached the topmost widget, resize it
- bool wasResized = parentWidget->testAttribute(Qt::WA_Resized);
- parentWidget->resize(parentWidget->size());
- parentWidget->setAttribute(Qt::WA_Resized, wasResized);
- }
-
- setGeometry(parentItem->contentsRect()); // relayout children
- } else {
- setGeometry(parentItem->contentsRect()); // relayout children
+ setGeometry(parentItem->contentsRect()); // relayout children
+ if (!QGraphicsLayout::instantInvalidatePropagation()) {
parentLayoutItem()->updateGeometry();
}
}
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp
index 804394a..965b1b34 100644
--- a/src/gui/graphicsview/qgraphicswidget.cpp
+++ b/src/gui/graphicsview/qgraphicswidget.cpp
@@ -347,11 +347,10 @@ void QGraphicsWidget::setGeometry(const QRectF &rect)
{
QGraphicsWidgetPrivate *wd = QGraphicsWidget::d_func();
QGraphicsLayoutItemPrivate *d = QGraphicsLayoutItem::d_ptr.data();
- QRectF newGeom;
+ QRectF newGeom = rect;
QPointF oldPos = d->geom.topLeft();
if (!wd->inSetPos) {
setAttribute(Qt::WA_Resized);
- newGeom = rect;
newGeom.setSize(rect.size().expandedTo(effectiveSizeHint(Qt::MinimumSize))
.boundedTo(effectiveSizeHint(Qt::MaximumSize)));
@@ -405,14 +404,7 @@ void QGraphicsWidget::setGeometry(const QRectF &rect)
emit widthChanged();
if (oldSize.height() != newGeom.size().height())
emit heightChanged();
- QGraphicsLayout *lay = wd->layout;
- if (QGraphicsLayout::instantInvalidatePropagation()) {
- if (!lay || lay->isActivated()) {
- QApplication::sendEvent(this, &re);
- }
- } else {
- QApplication::sendEvent(this, &re);
- }
+ QApplication::sendEvent(this, &re);
}
}
@@ -1091,8 +1083,11 @@ void QGraphicsWidget::updateGeometry()
* When the event is received, it will start flowing all the way down to the leaf
* widgets in one go. This will make a relayout flicker-free.
*/
- if (QGraphicsLayout::instantInvalidatePropagation())
- QApplication::postEvent(static_cast<QGraphicsWidget *>(this), new QEvent(QEvent::LayoutRequest));
+ if (QGraphicsLayout::instantInvalidatePropagation()) {
+ Q_D(QGraphicsWidget);
+ ++d->refCountInvokeRelayout;
+ QMetaObject::invokeMethod(this, "_q_relayout", Qt::QueuedConnection);
+ }
}
if (!QGraphicsLayout::instantInvalidatePropagation()) {
bool wasResized = testAttribute(Qt::WA_Resized);
diff --git a/src/gui/graphicsview/qgraphicswidget.h b/src/gui/graphicsview/qgraphicswidget.h