summaryrefslogtreecommitdiffstats
path: root/src/declarative/debugger
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-1914-14/+14
| |\
| * | QDeclarativeDebug: Hardcode version when serializing Qt typesKai Koehne2011-01-111-0/+1
| | | | | | | | | | | | | | | | | | | | | Make sure that e.g. QtCreator compiled with 4.7 can debug a program compiled with 4.8. Reviewed-by: Christiaan Janssen
| * | QDeclarativeDebug: Remove unused fileKai Koehne2010-12-212-1/+0
| | | | | | | | | | | | Got added in 5336e1838a95d97.
| * | QDeclarativeDebug: Move Tcp server to separate pluginKai Koehne2010-12-177-264/+54
| | | | | | | | | | | | Reviewed-by: Christiaan Janssen
| * | QDeclarativeDebug: Move networking code out of QDeclarativeDebugServerKai Koehne2010-12-179-95/+383
| | | | | | | | | | | | | | | | | | | | | Move socket handling code out of QDeclarativeDebugServer into a QDeclarativeDebugServer(Tcp)Connection class. Reviewed-by: Christiaan Janssen
| * | QDeclarativeDebug: Decouple QDDServer, QDDService classesKai Koehne2010-12-175-311/+541
| | | | | | | | | | | | | | | Move QDeclarativeDebugServer class into it's own files and make the classes less interdependent.
| * | QDeclarativeDebug: Rename member variableKai Koehne2010-12-171-18/+18
| | | | | | | | | | | | | | | | | | | | | 'client' points to the QDeclarativeDebugConnection object, so better name it 'connection' then. Reviewed-by: Christiaan Janssen
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2010-12-011-3/+5
| |\ \
| * | | Add additional trace range data.Michael Brasser2010-11-192-0/+17
| | | |
| * | | Make deferred tracing less expensive (real-time cost is the same)Michael Brasser2010-11-192-29/+47
| | | |
| * | | Support directly setting string range data.Michael Brasser2010-11-192-6/+6
| | | |
| * | | Add additional tracing.Michael Brasser2010-11-191-1/+2
| | | | | | | | | | | | | | | | | | | | Tracing for compile time, signal handlers, and deferred creation.
| * | | Add support for a record-then-send debug process.Michael Brasser2010-11-192-9/+53
| | | |
| * | | Use high performance timer for profiling. Add binding profile info.Michael Brasser2010-11-191-2/+3
| | | |
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1714-14/+14
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * | | Update copyright year to 2011.Jason McDonald2011-01-1014-14/+14
| | |/ | |/| | | | | | | Reviewed-by: Trust Me
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-3/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure qmake/generators/win32/msbuild_objectmodel.cpp src/gui/image/qpnghandler.cpp src/network/access/qnetworkaccessdatabackend.cpp src/opengl/qgl_x11egl.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * | Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3aFriedemann Kleint2010-11-261-1/+1
| | |
| * | Declarative: Fix compiler warnings (Linux/g++)Friedemann Kleint2010-11-261-3/+5
| |/ | | | | | | Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-123-1/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
| * Export QDeclarativeDebugHelper on Symbian for QTBUG-13762Joona Petrell2010-11-081-1/+1
| | | | | | | | | | Reviewed-by: Martin Jones Task-number: QTBUG-13762
| * Qml Debugging: Only enable if explicitly requestedKai Koehne2010-11-023-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-301-6/+6
|\ \ | |/
| * Do not crash on SymbianAlessandro Portale2010-10-281-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Conflicts: src/declarative/debugger/qdeclarativedebugservice.cpp
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-271-1/+1
|\ \ | |/
| * Fix bug in QML debug client installationAaron Kennedy2010-10-271-1/+1
| | | | | | | | | | Allow QML debug clients to be installed between the connection being established and the hello message being received.
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-256-22/+34
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Don't export QtDeclarative symbols needed by QtCreator on SymbianJoona Petrell2010-10-196-22/+34
| | | | | | | | | | Task-number: QTBUG-14041 Reviewed-by: Aaron Kennedy
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-051-2/+2
|\ \ | |/
| * QmlDebugService: Fix compiler warning about cast from asciiKai Koehne2010-10-011-2/+2
| |
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-047-113/+311
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * QDeclarativeDebug: Make autotests more robustKai Koehne2010-09-302-0/+4
| | | | | | | | | | | | | | Always flush sockets after sending data, and make autotests more robust by using busy wait. Reviewed-by: Christiaan Janssen
| * QDeclarativeDebugClient: Make sure status is consistentKai Koehne2010-09-301-2/+1
| | | | | | | | | | | | | | | | | | 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
| * QDeclarativeDebugClient: Fix gcc warningKai Koehne2010-09-281-1/+1
| |
| * QmlDebugService: Check that there is a receiver before sending messagesKai Koehne2010-09-281-2/+4
| | | | | | | | Reviewed-by: Christiaan Janssen
| * Make QmlDebug protocol more robustKai Koehne2010-09-287-111/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 :)
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-284-3/+137
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| * Move includes after copyright blockMartin Jones2010-09-221-5/+2
| |
| * Mitigate private header problems in QtCreator by adding semi-private APIKai Koehne2010-09-222-0/+98
| | | | | | | | | | | | | | | | | | | | 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
| * Mitigate private header problems in QtCreator by adding semi-private APIKai Koehne2010-09-224-3/+42
| | | | | | | | | | | | | | | | | | | | 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
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-11/+30
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * Make qml debugging work with command line argumentsLasse Holmstedt2010-09-171-11/+30
| | | | | | | | | | | | | | | | | | | | 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
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-101-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * QDeclarativeDebug: Destroy incoming connections if already connectedLasse Holmstedt2010-08-271-0/+2
| | | | | | | | | | | | | | Without this, QML Inspector in Qt Creator gets no error message for failed connections, which can lead to confusion. Reviewed-by: ogoffart
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-252-2/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp src/opengl/opengl.pro src/opengl/qgl_p.h src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/assistant/tools/assistant/openpageswidget.h
| * QDeclarativeDebug: send a message when new object are addedOlivier Goffart2010-08-242-0/+5
| | | | | | | | Reviewed-by: Lasse Holmstedt
| * QtDeclarative debugging: Add an option not to stream the properties of an ↵Olivier Goffart2010-08-161-2/+2
| | | | | | | | | | | | | | | | | | object. Streaming all the properties is too slow, and we do not need them in the debugger of creator. Reviewed-by: Lasse Holmstedt
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| * QDeclarativeDebug: use QueuedConnection in the packet protocolOlivier Goffart2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fixed spelling mistakes in documented functions, classes, etc. Part of ↵Jerome Pasion2010-07-291-1/+1
| | | | | | | | QTBUG-11938 and QTBUG-10801