| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Needed for the BB10 Cascades profiling. There are more reasons for
introducing this patch:
1) Cascades do not use QtGui library for QML rendering. It has its own
paint engine with client-server architecture. Profiler traces are sent
asynchronously from non Qt renderer thread to the Qt client.
The QPerformanceTimer has to be patched too, cause we need to know time
difference between tracing zero time and some time in past,
see: qint64 elapsedToAbsoluteTime(qint64 absoluteMonotonicTimeNs) const
2) Since we need more sophisticated trace engine in cascades, this patch
allows explicitly assign custom class derived from QDeclaraqtiveDebugtrace
to the trace framework.
If no custom instance is assigned, the default QDeclarativeDebugTrace
instance is created implicitly on first trace request.
Using custom trace instance which is not part of Qt
(it is part of libbbcascades) allows us to implement all Cascades trace
special needs in libbbcascades and not to carry Qt with the platform
specific code.
3) The NO_CUSTOM_DECLARATIVE_DEBUG_TRACE_INSTANCE macro is introduced to
allow custom trace engine only on the bleckberry platform,
see declarative.pro.
If this macro is defined Qt compiles from its original code.
4) Possibility of custom QDeclaraqtiveDebugTrace instance might be usable
for other projects which needs to extends somehow default Qt trace
functionality.
5) Patch is not intended to be applied to Qt Quick 2, since declarative
debugging infrastructure is changed there.
(cherry picked from commit f13b52f25c1e0bc26dcf3ea304b3495f7d5cd370)
Change-Id: I199211c1de66e930e252e8c033503d7f4940565f
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Updated service to include parent ids. Since this
will break client compatibility, the service
has been renamed to 'DeclarativeDebugger' from
'QDeclarativeEngine'. This is effectively a backport
of the 'QmlDebugger' service from Qt5.
Change-Id: Ic3000712d986e19bdf89417e9c4c23229d56f9dc
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Enable the use of the QML debugger without QtGUI
Based on Qt5's 9a096d9e.
Change-Id: If97502bc5367e0faadfaf3bbe70b0c89ef2c75c2
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-22512
Change-Id: I6894259faa3af6171a3f5313357d222e45b48af3
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Although "Qml debugging is enabled. Only use this in a safe environment!"
is a warning, using qWarning() for it let every app crash that is run with
QT_FATAL_WARNINGS. Fix that by using qDebug() for the updates that
happen during 'normal' operation.
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Change-Id: Ie37a35ca27ec6e507f7de140484ca8cf96410be2
|
|
|
|
|
|
|
|
| |
Use the stream operator instead of toAscii().constData(), or qPrintable.
Also use QString::fromLatin1() instead of QString::fromAscii().
Task-number: QTBUG-22860
Change-Id: Iabe37778f0fd50ca450f0504939441c633d6354e
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The pluginloader is instantiated on heap with server as its parent
so that the connection plugin instance remains loaded in memory.
This prevents the plugin loader in QDeclarativeInspectorService
to accidentally un-load the plugin while it's in use.
Change-Id: I11c82ce595a336ba0fd1b243d23cb497fe355147
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In case a service is waiting for messages via waitForMessage, deliver
all arriving messages to the service directly, not only the first one.
In the case of QDeclarativeDebugJS::watchExpressions() test case,
the first message is actually WATCH_EXPRESSIONS , followed by
BREAKPOINTS. However, the second BREAKPOINTS command wasn't
delivered directly, but queued in the main event loop. As soon as
waitForMessage() was returning, QJSDebugClient was just calling
waitForMessage() anew (because BREAKPOINTS wasn't delivered yet),
blocking the main event loop from being run.
Reviewed-by: Aurindam Jana
|
|
|
|
|
|
|
|
| |
Change-Id: I0c289bdf555aa317dc12c5dbcff0168ebcc7bd50
Reviewed-on: http://codereview.qt.nokia.com/3935
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
(cherrypicked from a07f68eff5ac4696a551f083d186a685f7ef043d)
|
|
|
|
|
|
|
|
|
|
| |
And fix the file names/location, too
Change-Id: If2d5ec0896332896ad11af748ec8f75c39e1555c
Reviewed-on: http://codereview.qt.nokia.com/3890
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
(cherrypicked from 8804ec49bda8672c5700ab843f2958c3d2bd8e41)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Apps don't have to (directly or indirectly) include qdeclarative.h.
Instead, move the static instance to qdeclarativeengine.h, and
qdeclarativeview.h (which instantiates it's own engine).
Change-Id: I8b3e63ad4f134969734a2cc712395145d90e0dfa
Reviewed-on: http://codereview.qt.nokia.com/3941
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
(cherrypicked from commit 6cb39fb829b78b5f6e9751283c7cd50400821e2a)
|
|
|
|
|
|
| |
This got disabled ages ago, but we never cleaned up the sources.
Change-Id: I69e7e5a431e2092ef925e48f81a306a3d316d2c7
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Check that the topmost stack entry is a user defined ScriptFunction.
This avoids hitting the anonymous functions used for bindings, e.g.
onClicked: Qt.quit()
leads to script code
(function onClicked() { Qt.quit(); })
which will be hit twice for the debugger: Once for the function call
itself, then for the execution of Qt.quit().
Change-Id: Id431cacaef84172dc3474018cdf61f3dcc05cf93
|
|
|
|
|
|
|
| |
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
|