| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Enable the remote debugging of QDeclarativeEngines only after
QDeclarativeDebugHelper::enableDebugging()
has been called.
Approved by 4.7 Program Team.
Reviewed-by: Alessandro Portale
Task-number: QTBUG-13762
(cherry picked from commit b2016bbfc9c7389e7b64451417395ceba96af21f)
Conflicts:
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/eabi/QtDeclarativeu.def
|
| |
|
|
|
|
|
|
|
|
| |
Fixes regression caused by optimization added in commit
35a51442ed21f58c06b21293eeb56e843251ee82.
Task-number: QTBUG-14239
Reviewed-by: Martin Jones
|
|
|
|
|
|
|
|
| |
Always flush sockets after sending data, and make autotests more robust
by using busy wait.
Reviewed-by: Christiaan Janssen
(cherry picked from commit cfe198948f1e4867918176df38b3e0b49757a4b8)
|
|
|
|
|
|
|
|
|
|
| |
When statusChanged() is called during handsake state() was not the same
as the argument passed. Fix this by setting gotHello = true _before_
notifying the clients.
Reviewed-by: Christiaan Janssen
Task-number: QTBUG-14087
(cherry picked from commit a1f050fe4217d3a642ab7f4df8e50c21aa51689c)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The protocol so far was client->server only. That is, there was no
sane way for a client to check whether a plugin on the server (service)
was available or not. E.g. calling Client::setEnabled(true) 'succeeded',
without a check whether there is actually a service to talk to.
The new protocol replaces this shortcoming by a service discovery
mechanism: Both client & service announce their available plugins at
handshake time, and later on if there are changes. The status is
reflected in Client::status() and Service::Status() , which are either
NotConnected - no network connection, or not registered properly
Unavailable - TCP/IP connection works, but no plugin with the same
name on the other side
Enabled - You can connect to plugin on other side
The status changes happen automatically (no setEnabled() anymore).
Furthermore a version ID was added to the handshake, so that we can
extend the protocol further in the future :)
(cherry picked from commit fd9771c29d401d88779ab7c5d7715c9ca41dd723)
|
|
|
|
|
| |
Task-number: QTBUG-13799
(cherry picked from commit f7a439a0a00b0bdd6ebeff8bfd5ee2285eab1398)
|
|
|
|
|
| |
Task-number: QTBUG-13799
(cherry picked from commit 1f43e68c4ca5b28444b046deff1658b1b4b1923d)
|
|
|
|
|
|
| |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
(cherry picked from commit 6f35701275ab0cd80daec45b3407725b10571693)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
(cherry picked from commit 49452ad6b22e080b1dfdfde38c21c48bb910a1ae)
Conflicts:
tests/auto/declarative/qdeclarativeconnection/data/error-object.qml
tests/auto/declarative/qdeclarativeconnection/data/error-property.qml
tests/auto/declarative/qdeclarativeconnection/data/error-property2.qml
tests/auto/declarative/qdeclarativeconnection/data/error-syntax.qml
tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
tests/auto/declarative/qdeclarativeqt/data/quit.qml
tests/auto/declarative/qdeclarativeview/data/error1.qml
|
|
|
|
|
| |
Task-number: QTBUG-13799
(cherry picked from commit 746954581f06e0bca98f25eb95dca09c663d47bf)
|
|
|
|
|
|
|
| |
Although it's a private header we use qdeclarativedebugservice_p.h in
creator / qmljsdebugger library. Working with a copy of the header in
the autotest hopefully catches some bc breakages.
(cherry picked from commit 31dcf2b4028b1f76301fc69fccff0a9474a0a135)
|
|
|
|
|
| |
Task-number: QTBUG-13893
(cherry picked from commit 085a121cb1ebba38d62c924500dbc71806b29b3c)
|
|
|
|
|
|
|
|
|
|
|
| |
Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator
accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a
private header, where we nevertheless can make some BC checks/guarantees.
Aaron Kennedy agreed with the idea.
Task-number: QTCREATORBUG-2179
(cherry picked from commit c1a7deedf1628e0dd3a5fbf92d97c4151d17fb5a)
|
|
|
|
|
|
|
|
|
|
|
| |
Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator
accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a
private header, where we nevertheless can make some BC checks/guarantees.
Aaron Kennedy agreed with the idea.
Task-number: QTCREATORBUG-2179
(cherry picked from commit 63c4c0449361ced03838e51d18e1113740f27fa9)
|
|
|
|
| |
(cherry picked from commit eef26bc8521da62db0dced6796eceb7c27f64160)
|
|
|
|
|
|
| |
Task-number: QTBUG-13754
Reviewed-by: Martin Jones
(cherry picked from commit 46e49547f8e4614cd504b0af0d52d4e2768b57c3)
|
|
|
|
|
|
|
|
|
|
|
| |
The environment variables do not work for Symbian devices, so
without this change, QML debugging cannot be done on them.
In addition, configure now contains an option to disable qml
debugging entirely, due to it being a major security risk.
Reviewed-by: kkoehne
(cherry picked from commit a9e5329168cd9113bf41293c05193d8b099494c6)
|
|
|
|
| |
(cherry picked from commit af29c555a29ebcdb1d962176912478212c9c7e65)
|
|
|
|
|
|
|
|
|
|
|
|
| |
that the view is updated (currently the model data changes but the
view does not). In flat-model mode, get() now returns a
QScriptClass-type object so that changes to the returned object are
received, and for nested-model mode, the fix adds a
QDeclarativeOpenMetaObject subclass and ModelNode::listIndex so that
itemsChanged() can be emitted when the node data changes.
Task-number: QTBUG-12363
(cherry picked from commit c2bbef949126826f0330c69dff1a8c96919f69a5)
|
|
|
|
|
|
|
|
|
| |
Check that we no longer hold a reference to the item before setting
onPath to false.
Task-number: QTBUG-13689
Reviewed-by: Michael Brasser
(cherry picked from commit 7e6b2b2b95bc1db77544b898ec45ea4a2683e435)
|
|
|
|
|
|
|
|
|
| |
Models with a single role also have a modelData property added. These
role names both ended up in a hash, resulting in only one or the other
updating. Now we handle modelData specially.
Task-number: QTBUG-13664
Reviewed-by: Michael Brasser
|
| |
|
|
|
|
|
|
| |
to the base state.
Task-number: QTBUG-11834
|
|
|
|
| |
See 6454f4db1697af1d36ad4c0ea83ccd0bb490fd39
|
|
|
|
|
|
|
| |
The two are equivalent, but flip doesn't work in ParentChange.
Task-number: QTBUG-13554
Reviewed-by: Michael Brasser
|
|
|
|
|
| |
Task-number: QTBUG-12250
Reviewed-by: Michael Brasser
|
|
|
|
| |
Task-number: QTBUG-13543
|
| |
|
| |
|
|\ |
|
| |
| |
| |
| |
| | |
Task-number:
Reviewed-by: Michael Brasser
|
|/
|
|
|
|
|
|
|
| |
The SmoothedAnimation visual test was misleading, and has been expanded
to include more common use cases. The property documentation was also
slightly extended. This should help solve the confusion in the related
task.
Task-number: QTBUG-12114
|
|
|
|
|
|
|
|
|
|
| |
Calling prepareGeometryChange in a paint event is a bad idea and was
causing jerky scrolling. There is no longer any need for the removed
code since we don't use imgCache.size() to determine boundingRect()
anymore.
Task-number: QTBUG-13453
Reviewed-by: Joona Petrell
|
|
|
|
|
|
|
| |
When rewinding, don't reapply bindings, only values. This is consistent
with how we handle rewinding other property bindings.
Task-number: QTBUG-13398
|
|
|
|
|
|
|
| |
Ensure the offset is adjusted to account for the new or removed items.
Also minor optimizations to delegate updates.
Task-number: QTBUG-13416
|
|
|
|
| |
Task-number: QTBUG-12664
|
| |
|
|
|
|
| |
QTBUG-11853
|
|
|
|
| |
QTBUG-13374
|
|
|
|
| |
QTBUG-13047
|
|
|
|
| |
QTBUG-13345
|
|
|
|
| |
QTBUG-12837
|
|
|
|
| |
QTBUG-12601
|
|
|
|
| |
QTBUG-13045
|
|
|
|
| |
QTBUG-13043
|
|
|
|
| |
QTBUG-13114
|
|\ |
|
| |
| |
| |
| |
| |
| | |
This will have to go in 4.8.
This reverts commit 3928cb20ecc63ed21cdb122388b200c9ab8e7cad.
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-7300
Reviewed-by: Aaron Kennedy
|