Qml Debugging: Only enable if explicitly requested v4.7.1
authorJason McDonald <jason.mcdonald@nokia.com>
Wed, 3 Nov 2010 01:24:52 +0000 (11:24 +1000)
committerJason McDonald <jason.mcdonald@nokia.com>
Wed, 3 Nov 2010 01:24:52 +0000 (11:24 +1000)
commit1b3f43c997b00d6b0d435ed8be08596c913a0189
tree26b8c4adaf5f07d1a67f838f4053fb2b0ba466bc
parent8250d455d8d85c5fe0c819f997ba0902315bfce4
Qml Debugging: Only enable if explicitly requested

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
12 files changed:
src/declarative/debugger/qdeclarativedebughelper.cpp
src/declarative/debugger/qdeclarativedebughelper_p.h
src/declarative/debugger/qdeclarativedebugservice.cpp
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/qml/qdeclarativeengine_p.h
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/eabi/QtDeclarativeu.def
tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h
tests/auto/declarative/qdeclarativedebughelper/tst_qdeclarativedebughelper.cpp
tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp