summaryrefslogtreecommitdiffstats
path: root/src/plugins/qmltooling
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersAkseli Salovaara2015-03-3144-573/+573
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Updated year in copyright headerKai Koehne2014-03-2644-44/+44
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1344-44/+44
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2944-1057/+1057
| | | | | | | | 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>
* Update contact information in license headers.Sergio Ahumada2012-08-0144-88/+88
| | | | | | | | | | | | | - 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>
* Fixed qmldbg_inspector build for WEC7.jaanttil2012-02-061-0/+4
| | | | | | | | | | WEC7 does not have std::floor, define it in qfunctions_wince.h and include qfunctions_wince.h to qmldbg_inspector in WinCE environments. Task-number: QTBUG-22510 Change-Id: I801d908bf1a70203619e3af9262d7ffcb8ccb1bb Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1144-44/+44
| | | | | | | | | 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>
* Declarative: Use qDebug() for debugger status updatesKai Koehne2011-11-281-1/+1
| | | | | | | | | | 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
* QmlInspector: Fix moc errorKai Koehne2011-08-111-1/+0
| | | | | | | Fix regression introduced in 857c7072320339a6ff1. Change-Id: Ie08e8cd75055081976059a3af60b2c60a52260ee Reviewed-by: TrustMe
* QmlInspector: Fix compile for QT_NO_CURSORKai Koehne2011-08-103-0/+6
| | | | Change-Id: I0686ba006e6ab42dbd08cda6d36874d1c99009fe
* QmlInspector: Remove unused toolbarKai Koehne2011-08-1025-135/+1
| | | | | | This got disabled ages ago, but we never cleaned up the sources. Change-Id: I69e7e5a431e2092ef925e48f81a306a3d316d2c7
* QmlInspector: Some code cleanupsThorbjørn Lindeijer2011-06-237-51/+11
| | | | | | | | | | | | | * Inlined empty method implementations * Removed unused QDeclarativeViewInspectorPrivate::cursosPos * Small simplification in setting shortcuts * Prefer const & for QList parameter (cherry picked from commit df1835f06c99d95a6f35ab84abc5fa7950cb5fe7 in Qt 5 / QtDeclarative, to make synchronizing future changes easier) Change-Id: Ib543c8433380e82f2fdf096d0962682595d7e2bf Reviewed-by: Kai Koehne
* QmlInspector: Some cleanup in the Color Picker toolThorbjørn Lindeijer2011-06-232-44/+10
| | | | | | | | | | Also, the tool now picks a color on press rather than on release. (cherry picked from commit e045046c694ea98c5f3b651c99e1cb9eed2e045c in Qt 5 / QtDeclarative, to make synchronizing future changes easier) Change-Id: I068801ff969c9eadd538dd93b92916677b2c97ca Reviewed-by: Kai Koehne
* QmlInspector: Unified mouse and keyboard event handlingThorbjørn Lindeijer2011-06-2310-180/+320
| | | | | | | | | | | | | | | Introduced a common AbstractTool interface so that the AbstractViewInspector can forward mouse and keyboard events and also implement the keys to switch tools. The AbstractLiveEditTool still exists as the base class for all QDeclarativeView based tools. (cherry picked from commit 0f2e1526068ed11bb981357fdeb406f5c804717b in Qt 5 / QtDeclarative, to make synchronizing future changes easier) Change-Id: Idf9f29d2ea111a6fef7145890a190f5cd22a8b8c Reviewed-by: Kai Koehne
* QmlInspector: Removed private header postfix and Qt namespaceThorbjørn Lindeijer2011-06-2337-401/+302
| | | | | | | | | | | | | | | Renamed the headers back to normal since they are not included in a Qt library. Also took the classes out of the Qt namespace and back into the QmlJSDebugger namespace. This is mainly to make it easier again to port changes back into the version of the inspector shipped with Qt Creator. (cherry picked from commit febfd367f8483ef6cae31b89b04422e0058e5ae7 in Qt 5 / QtDeclarative, to make synchronizing future changes easier) Change-Id: I74acdbe7e5493c8b5d34b34ad9070c424128754e Reviewed-by: Kai Koehne
* QmlInspector: Share code between QGV/SG based QML debuggingThorbjørn Lindeijer2011-06-238-595/+732
| | | | | | | | | | | | | | | Introduced AbstractViewInspector, which forms the base class for QDeclarativeViewInspector and SGViewInspector and is where common code, like handling the protocol is placed. Some virtual and pure virtual functions exist which the subclasses will override or implement for QDeclarativeView/QSGView specific stuff. (cherry picked from commit 092c7fb12d32b3d1cd933707bf9e55156e2ae306 in Qt 5 / QtDeclarative, to make synchronizing future changes easier) Change-Id: Iff0e655538bb3753507fa76be378f3dbd68988fc Reviewed-by: Kai Koehne
* QDeclarativeDebug: Fix cases where multiple packets arrive in one goKai Koehne2011-06-201-7/+14
| | | | | | | Make sure no packets get 'lost' when they're arriving in one go through the TCP/IP socket. Reviewed-by: Christiaan Janssen
* DeclarativeObserver: Don't fade in the highlight edgeThorbjørn Lindeijer2011-05-302-58/+10
| | | | | | | It feels more responsive when the highlight is immediately visible. Change-Id: Ie3dd0693ecc38f33b001c86970b220b45b37fdfc Reviewed-by: Kai Koehne
* Renamed declarativeobserver plugin to qmldbg_inspectorThorbjørn Lindeijer2011-05-3057-264/+264
| | | | | | | | | | | 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
* DeclarativeObserver: Fixed duplicates in item selectionThorbjørn Lindeijer2011-05-251-2/+2
| | | | | | | | | | | Only add items to the current selection that aren't already part of it. Also removed checking item for null, since it doesn't make sense to include null pointers in the list of items to select. Task-number: QTCREATORBUG-3426 Change-Id: I5a365570f87f72665b3382d05ca9937f56e8956b Reviewed-by: Christiaan Janssen
* DeclarativeObserver: Removed the SubcomponentEditorToolThorbjørn Lindeijer2011-05-2411-697/+17
| | | | | | | | | | | | | This tool made selecting items in your QML app more complicated than necessary. Now, left-click will always just select the top-most item under the mouse and right-click will allow you to select any of the items below. Also, the highlighted bounding rect now always applies to just one item, instead of also including the children bounding rect. Reviewed-by: Kai Koehne Change-Id: I17b5ab397d951fd68711590469ca6e723a9cb0e6
* Merge remote-tracking branch 'qt/4.8' into master-qml-teamKai Koehne2011-05-2445-637/+1395
|\
| * Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1342-714/+714
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
| * QmlDebug: Fix QmlOstPlugin compilation failureKai Koehne2011-05-121-2/+2
| | | | | | | | | | | | Fix signature of waitForMessage. Reviewed-by: Tom Sutcliffe
| * QmlDebug: Fix QmlOstPlugin compilation failureTom Sutcliffe2011-05-114-2/+51
| | | | | | | | | | | | | | Implement waitForMessage()/waitForReadyRead functionality required by bde58ad1e7d2b38d. Reviewed-by: kkoehne
| * Merge remote branch 'qt/4.8' into master-qml-stagingKai Koehne2011-05-1010-7/+703
| |\ | | | | | | | | | | | | | | | Conflicts: src/declarative/debugger/qdeclarativedebugserver.cpp src/plugins/qmltooling/qmltooling.pro
| | * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-211-1/+1
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_ost/qostdevice.h
| | | * Fix Symbian/Linux compilation breakage in plugins/qmltoolingKai Koehne2011-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | use QIODevice header file instead of (wrongly capitablized) QIODevice.h Reviewed-by: Tom Sutcliffe Task-number: QTBUG-18869
| | * | Fix compilation with symbian-armccOlivier Goffart2011-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | the case of the headers matter if you compile on linux Reviewed-by: Marius Storm-Olsen
| | * | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-1810-7/+703
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * QmlDebug: Fix license headers in new ost pluginKai Koehne2011-04-155-65/+65
| | | | | | | | | | | | | | | | Reviewed-by: Trust-me
| | | * Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on ↵Tom Sutcliffe2011-04-147-0/+692
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian. Task-number: QTBUG-18764 Reviewed-by: kkoehne
| | | * QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'Kai Koehne2011-04-144-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the name less ambiguous, especially on Symbian were all .dlls end up in sys\bin. Reviewed-by: Pawel Polanski
| | | * QDeclarativeDebug: Don't crash when connection is closedKai Koehne2011-04-141-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Enable performance monitoring at application startup.Kai Koehne2011-05-102-1/+14
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Michael Brasser (cherry picked from commit 8765bdaebf5db409dc2121bce3b9838f3663bd7e)
* | | | Pass QList as const reference when possibleThorbjørn Lindeijer2011-05-173-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids some reference counting. Reviewed-by: Kai Koehne Change-Id: I4de83aa4df6833fa2287ac1854bbb0052d15cee9
* | | | Fixed crashes in Observer mode related to infinite bounding rectsThorbjørn Lindeijer2011-05-173-67/+38
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Fixed license headerThorbjørn Lindeijer2011-05-051-8/+16
| | | | | | | | | | | | File added in 35faeb205843c4f0b921d2b878d2d24962c64664
* | | Fixed compile on WindowsThorbjørn Lindeijer2011-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Moved the QML Observer Service and related functionality into QtThorbjørn Lindeijer2011-05-0461-2/+6417
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Update copyright year to 2011.Rohan McGovern2011-03-102-2/+2
|/ | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
* Rename 'plugins\qmldebugging' (work around qmake issues)Kai Koehne2011-02-114-0/+279
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
generated by cgit v0.12 at 2024-11-02 11:26:27 (GMT)