| 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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The qml debugging enabler in QtDeclarative made any Qt app crash
which used QDeclarative. Reason was that QtDeclarative.dll tried
to directly access (private) writable static data from QtGui.dll.
This patch adds an accessor function for the data to QtGui, and
the crash is gone.
Done-by: Kai Koehne
Reviewed-by: Kai Koehne
(cherry picked from commit 2362d8b1e9fa86da1d3cc5dbb7d4467ec12311e1)
Conflicts:
src/declarative/debugger/qdeclarativedebugservice.cpp
|
| |
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
| |
(cherry picked from commit 9caae83e1f2b9c56ee86b8523391e6a83ea724c5)
|
|
|
|
|
| |
Reviewed-by: Christiaan Janssen
(cherry picked from commit 30959e88498b2c8591145e30c8b497a76c12d8f6)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
| |
(cherry picked from commit b750bb085029117497d26a24dcd590fbe34fe281)
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
| |
Without this, QML Inspector in Qt Creator gets no error message for
failed connections, which can lead to confusion.
Reviewed-by: ogoffart
|
|
|
|
| |
Reviewed-by: Lasse Holmstedt
|
|
|
|
|
|
|
|
|
| |
object.
Streaming all the properties is too slow, and we do not need them
in the debugger of creator.
Reviewed-by: Lasse Holmstedt
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Else, we can have deadlock in the javascript debugger, which may
start an event loop.
If the javascript execution result from some network command, the
further network command are not processed more
(the ones that exist the javascript debugger event loop)
Having a QueuedConnection there means the network events will not
be blocked by a rentrency in the event loop
Reviewed-by: Lasse Holmstedt
|
|
|
|
| |
QTBUG-11938 and QTBUG-10801
|
|
|
|
|
|
|
|
| |
CanvasFrameRate
This silents a lot of warnings in creator.
Reviewed-by: Aaron Kennedy
|
|
|
|
| |
Reviewed-by: Aaron Kennedy
|
|
|
|
| |
QTBUG-11933
|
|
|
|
|
|
|
| |
The new message currently enables resetting bindings, literal values and
signal handlers (onX: {...}) through the debugger.
Reviewed-by: Roberto Raggi
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
Always use private/. The WinSCW compiler doesn't search the current
directory, for whatever reason.
|
| |
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
- include headers from own directory with ""
- include headers from own project without private/
- sort includes from most specific to most generic
- make headers self-contained
- some whitespace unification
no attempt was made at making the qt includes consistent regarding the
use of module names and forwarding headers.
no attempt was made at sorting includes.
|
| |
|
|
|
|
| |
It seems we're going to have to so a syncqt/configure in Qt modules.
|
|
|
|
| |
May help modularization (syncqt and configure are Qt-specific).
|
| |
|
|
|
|
| |
and (QmlDebugQuery::State) parameters.
|
| |
|
| |
|
| |
|
| |
|
|\
| |
| |
| | |
into kinetic-declarativeui
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/debugger/qmldebug.cpp
src/declarative/fx/qmlgraphicsimagebase_p.h
src/declarative/util/qmlanimation.h
src/declarative/util/qmlstate.h
src/declarative/util/qmltimer.cpp
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|