| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Add messages to track the lines of JavaScript that are executed.
Patch done by Janne Virranmaki <ext-janne.1.virranmaki@nokia.com>
Reviewed-by: kkoehne
|
|
|
|
|
| |
Change-Id: I3797567f22f61abf59ec5332ebc74b3fa37ede93
Reviewed-by: kkoehne
|
|
|
|
|
|
|
| |
Make sure no packets get 'lost' when they're arriving in one go through
the TCP/IP socket.
Reviewed-by: Christiaan Janssen
|
|
|
|
|
| |
Change-Id: I5cb0e53ceab136bfe7c53a3d6c51c8865b76761b
Reviewed-by: kkoehne
|
|
|
|
|
|
| |
Fixes regression introduced in a59261454071
Reviewed-by: Christiaan Janssen
|
|
|
|
|
|
|
| |
If the debugger is launched in blocking mode the service will be enabled
from the start.
Reviewed-by: Thorbjorn Lindeijer
|
|
|
|
|
|
|
|
|
|
|
| |
Mainly since it's a good idea to prefix the plugin on Symbian, and at
the same time it's now consistency called 'inspector' rather than
'observer'.
Symbian .def files will need to be updated.
Change-Id: I43071331c8002f8844efd14105d01c730d97e946
Reviewed-by: Kai Koehne
|
|
|
|
|
|
|
| |
Reviewed-by: Kai Koehne
(reapplied commit 89d9b83aa26db4f528250c3fe4716b81955c6929 from qtcreator)
Change-Id: I4cbfba2e854dd98a4e1012c71c40520f57fa9664
|
|
|
|
|
|
|
| |
Reviewed-by: Kai Koehne
(reapplied commit fea13a449c59690ae7b7f43aa64f50c0a290a2cf from qtcreator)
Change-Id: I0c78188994029b2ac7daa3d59182566c5ec6c8b5
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| | |
Conflicts:
src/declarative/debugger/qdeclarativedebugserver.cpp
src/plugins/qmltooling/qmltooling.pro
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
don't crash in QProcessEnvironment::systemEnvironment()
qmake: Introduce new template type
no environment on WinCE
fix Widestring vs. Ansi mixup
fix potential crash in QProcessEnvironment::systemEnvironment() on windows
Fix compilation with QT_NO_*
fix build on symbian
skip widget when its focusPolicy is Qt::ClickFocus in TabOrderEditor
fix build on mac
make QProcessEnvironment on Unix cache converted values
make QProcessEnvironment::systemEnvironment() encoding-safe
make QProcessEnvironment on Unix cache converted variable names
move key/value converters to the private class
make QProcessEnvironment on Windows preserve variable name case
split QProcessEnvironmentPrivate::Unit into Key and Value
remove unused functions
minor optimization: use QList::reserve()
use the Hash typedef
Changelog: Qt Designer 4.8
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 1206
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QmlViewer: Translate UI
Fix insert and scroll to bottom case
QDeclarativeDebug: Fix test case
QDeclarativeDebug: Handle case where client with ongoing queries is deleted
Remove compile warning
Fix QUnifiedTimer bug
Stop the animation driver when there are no more animations.
Optimization and benchmark for setting object properties from QML.
Add Constant and Final flags to QMetaObjectBuilder
Fixed QML TextEdit docs
Make -no-opengl exist on other platforms
Only ask for name when the user goes on the high score list.
|
| | | |
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/plugins/qmltooling/qmldbg_ost/qostdevice.h
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Add missing space to make the warning align with the others. Fix is needed
to let QtCreator detect the warning programatically.
Reviewed-by: Tom Sutcliffe
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/global/qnamespace.h
src/gui/text/qtextcontrol.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Symbian.
Task-number: QTBUG-18764
Reviewed-by: kkoehne
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Michael Brasser
(cherry picked from commit 8765bdaebf5db409dc2121bce3b9838f3663bd7e)
|
| | | |
| | | |
| | | |
| | | | |
This should have been part of 35faeb205843c4f0b921d2b878d2d24962c64664
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This code was previously developed as part of Qt Creator in
share/qtcreator/qml/qmljsdebugger/
Moving it into Qt will allow us to simplify the setup required before
you can debug QML applications.
To avoid adding too much weight to the QtDeclarative module, a
declarativeobserver plugin was introduced that contains the
QDeclarativeViewObserver and related classes. The
QDeclarativeObserverService is just a stub service that loads this
plugin once a QML debugging client connects. The plugin implements the
QDeclarativeObserverInterface
A QJSDebugService was separated out of QJSDebuggerAgent, so
that the service can be active while the agent is instantiated lazily.
Each QDeclarativeEngine adds itself to the QJSDebugService. Currently
only the first one is used when instantiating the agent.
QDeclarativeObserverService is hooked into QDeclarativeView, with the
view registering itself to the service, allowing the
QDeclarativeViewObserver to be created for the view once somebody
connects to the service. Again, only the first view is used at the
moment.
Change-Id: Ib50579c6d24361c2b39528e5556410d3446c2e90
Reviewed-by: Martin Jones
Reviewed-by: Michael Brasser
|
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | | |
This is necessary since some services may like to send a message back
immediately when its state changes to enabled.
Reviewed-by: Kai Koehne
|
|\ \ \
| |/ / |
|
| |\ \
| | |/
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/text/qfontengine_mac.mm
tests/auto/qdiriterator/tst_qdiriterator.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Print a warning if the user passes -qmljsdebugger on command line, but
Qt is configured with -no-declarative-debug
Change-Id: I72c9ffad9631ffe8582c13e3a4e798b102d0efad
Reviewed-by: Christiaan Janssen
|
|/ /
| |
| |
| |
| | |
Change-Id: I4be7080af1e7e8a834b927b6c6fc211db8bd90c0
Reviewed-by: Aaron Kennedy
|
| |
| |
| |
| |
| | |
Reviewed-by: Trust Me
(cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/text/qfontengine_mac.mm
src/opengl/qpixmapdata_gl.cpp
src/opengl/qwindowsurface_gl.cpp
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/eabi/QtOpenGLu.def
tests/auto/qtextlayout/tst_qtextlayout.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Allow applications to link against the QDeclarativeDebugService API.
This is needed for on-device debugging of QML. (The removal of
the symbols was a regression in 4.7.2).
Task-number: QTBUG-17503
Reviewed-by: Tom Sutcliffe
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/features/symbian/symbian_building.prf
mkspecs/symbian-gcce/qmake.conf
src/corelib/global/qnamespace.h
src/corelib/global/qnamespace.qdoc
src/plugins/plugins.pro
tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On Windows, qmake places the tcpserver.dll in a 'plugins\qmlreleaseging'
folder, which broke remote debugging of QtDeclarative completely. New name
'qmltooling' while being not so specific, avoids the use of 'debug' in the folder name.
Task-number: QTBUG-17360
Reviewed-by: Martin Jones
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/declarative/samegame/SamegameCore/samegame.js
mkspecs/features/symbian/default_post.prf
src/declarative/qml/qdeclarativeengine.cpp
src/gui/text/qtextdocumentlayout.cpp
src/plugins/plugins.pro
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/s60installs.pro
tests/auto/declarative/declarative.pro
tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
tests/auto/declarative/qmlvisual/qmlvisual.pro
|
| | |
|
| | |
|
| | |
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Make sure that e.g. QtCreator compiled with 4.7 can debug a program
compiled with 4.8.
Reviewed-by: Christiaan Janssen
|
| | |
| | |
| | |
| | | |
Got added in 5336e1838a95d97.
|
| | |
| | |
| | |
| | | |
Reviewed-by: Christiaan Janssen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Move socket handling code out of QDeclarativeDebugServer into a
QDeclarativeDebugServer(Tcp)Connection class.
Reviewed-by: Christiaan Janssen
|
| | |
| | |
| | |
| | |
| | | |
Move QDeclarativeDebugServer class into it's own files and make the classes
less interdependent.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
'client' points to the QDeclarativeDebugConnection object, so better
name it 'connection' then.
Reviewed-by: Christiaan Janssen
|
| |\ \ |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Tracing for compile time, signal handlers, and deferred
creation.
|
| | | | |
|
| | | | |
|