| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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 :)
|
| |
|
|
|
|
| |
the engine until a debug client has connected. This makes for easier
debugging from Qt Creator when debugging C++ and QML together and when
debugging an application that has multiple engines.
|
| |
|
|
| |
to QDeclarativeXXX.
|
| |
|
|
| |
QDeclarativeXXX.
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/linux-g++-x11egl/qplatformdefs.h
src/declarative/qml/qmldom.h
src/declarative/util/qmlview.cpp
src/declarative/util/qmlview.h
tools/qdoc3/cppcodemarker.cpp
tools/qmldebugger/standalone/canvasframerate.cpp
tools/qmldebugger/standalone/engine.cpp
tools/qmldebugger/standalone/expressionquerywidget.cpp
tools/qmldebugger/standalone/expressionquerywidget.h
tools/qmldebugger/standalone/objectpropertiesview.cpp
tools/qmldebugger/standalone/objectpropertiesview.h
tools/qmldebugger/standalone/objecttree.cpp
tools/qmldebugger/standalone/qmldebugger.cpp
tools/qmldebugger/standalone/watchtable.cpp
tools/qmldebugger/standalone/watchtable.h
|
| | |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |\ \ |
|
| | |/ |
|
| |/
|
|
| |
is started. Also fix some memory leaks.
|
| | |
|
| |\ |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Tests would crash with `QThread: Destroyed while thread is still
running' one in a billion runs, since wait() was not called on the
test thread.
Reviewed-by: leo
|
| |/
|
|
| |
get test results with -xml mode.
|
| |
|
|
| |
Was causing some test failures on Windows.
|
| | |
|
| |
|
|
|
| |
Makes it possible to request many files with unique names, but serve
a single file.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
