| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QDeclarativeDebug: Fix autotest
Pass QList as const reference when possible
Fixed crashes in Observer mode related to infinite bounding rects
Doc
QmlDirParser: Fix typeInfo accessor.
|
| | |\ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Avoids some reference counting.
Reviewed-by: Kai Koehne
Change-Id: I4de83aa4df6833fa2287ac1854bbb0052d15cee9
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Bug fixed by avoiding uniting or subtracting QPolygonF with potentially
infinite coordinates.
The LiveSelectionIndicator now uses a QGraphicsRectItem rather than a
QGraphicsPolygonItem and displays only the boundaries of selected
objects, not including their children.
The SubcomponentMaskLayerItem now works with rectangles and uses a
QRegion to determine the area around the current context, converting
this to a polygon only as a last step.
Reviewed-by: Kai Koehne
Task-number: QTCREATORBUG-4559
Change-Id: I266f5387fa67017fc50215282a95b4ee6498be6d
|
| |/ /
| |
| |
| |
| |
| |
| | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| | |
| |
| |
| |
| |
| | |
Fix signature of waitForMessage.
Reviewed-by: Tom Sutcliffe
|
| | |
| |
| |
| |
| |
| |
| | |
Implement waitForMessage()/waitForReadyRead functionality required
by bde58ad1e7d2b38d.
Reviewed-by: kkoehne
|
| |\ \
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/declarative/debugger/qdeclarativedebugserver.cpp
src/plugins/qmltooling/qmltooling.pro
|
| | |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/plugins/qmltooling/qmldbg_ost/qostdevice.h
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
use QIODevice header file instead of (wrongly capitablized) QIODevice.h
Reviewed-by: Tom Sutcliffe
Task-number: QTBUG-18869
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
the case of the headers matter if you compile on linux
Reviewed-by: Marius Storm-Olsen
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust-me
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Symbian.
Task-number: QTBUG-18764
Reviewed-by: kkoehne
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Make the name less ambiguous, especially on Symbian were all .dlls end
up in sys\bin.
Reviewed-by: Pawel Polanski
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Protocol might still be in the process of processing messages when
disconnect() is called (e.g. due to an invalid package). Therefore delay
it's deletion until the next event loop runs.
Reviewed-by: Christiaan Janssen
Task-number: QTBUG-18771
|
| | |_|/
|/| |
| | |
| | |
| | | |
Reviewed-by: Michael Brasser
(cherry picked from commit 8765bdaebf5db409dc2121bce3b9838f3663bd7e)
|
| | | |
| | |
| | |
| | | |
File added in 35faeb205843c4f0b921d2b878d2d24962c64664
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This compiled fine on Linux, but on Windows the project root is not
automatically included in the INCLUDEPATH. Use the correct relative path
to make the include work.
Problem introduced with 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
|
| |/
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
|
|
|
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
|
