summaryrefslogtreecommitdiffstats
path: root/src/declarative/debugger
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersAntti Kokko2015-02-2328-196/+196
| | | | | | | | | 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: I9e68d256991ef7325c29c38ce9c007506ce6b150 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-2528-532/+308
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I736aeb1a53f8aac59e8df360447864fea64d3dee Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* whitespace fixesOswald Buddenhagen2014-02-207-41/+41
| | | | | | | | remove trailing spaces & expand tabs Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Debugger: Fix debugging with newer Qt Creator'sv5.2.0-rc1Kai Koehne2013-11-111-1/+6
| | | | | | | | | | | | | Make sure we advertise the QDataStream version, so that Qt Creator doesn't fall back to Qt_4.7. This is the minimal change necessary to achieve this. QtQml does actually consider the maximum data version announced on the client side, but that would require bigger changes in this module ... Task-number: QTCREATORBUG-10694 Change-Id: I1f0f005429e4d2736dc8661dd8c0d869279f856e Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* Move debugger plugins into separate qml1tooling directoryKai Koehne2013-05-222-2/+2
| | | | | | | | | | Separate the QML 1 and QML 2 debugger plugins. This helps avoid a nasty crash in libgobject when (uneccessarily) loading and unloading the wrong plugins. Task-number: QTCREATORBUG-9232 Change-Id: I0bce7b364fcce983ccaa531d9008609ff08bb77f Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* Fix warnings for QtQuick1Thiago Macieira2013-04-021-0/+1
| | | | | | | qpacketprotocol.cpp:299:12: error: variable "writeBytes" set but not used [-Werror=unused-but-set-variable] Change-Id: I04a33119b30669dda688591aee60dcb2b7bbd41b Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix warning about uninitialized variable (CLANG).Friedemann Kleint2013-03-061-1/+1
| | | | | Change-Id: I7fd31373b4d08130c1fb44bb5b203331313558c3 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-2815-60/+0
| | | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Ic5b55b26967d65b3f11cac6fc3963f33ec6051a4 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1028-28/+28
| | | | | | Change-Id: I0281c3f6c10bb7c57f0e470306f38e96badf997b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Remove QPerformanceTimer now that QElapsedTimer contains the necessary bitsRobin Burchell2013-01-092-10/+10
| | | | | | | | | | | QPerformanceTimer was a copy of QElapsedTimer with some additional functionality which has since been subsumed into QElapsedTimer, so remove the forked code. (backport of cd6ebb4912a5d96c788ea0c838d8a1a06ff4029e from qtdeclarative) Change-Id: Ife1dac4d6c46404b43253680819da21350c65569 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* EngineDebug: Updated and renamed serviceAurindam Jana2012-12-014-72/+96
| | | | | | | | | | | 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: I7e3c9b9c321278dd24bd17ae2efdc690307cba8a Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Change the header message: this is now the QtDeclarative moduleThiago Macieira2012-10-1928-28/+28
| | | | | Change-Id: I18a370a58494049939d035f1c3528406f3f7645f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Rename the QtQuick1 module back to QtDeclarativeFriedemann Kleint2012-10-1716-45/+45
| | | | | | | | | | | | | | | | | Matches the name that this code used to have in Qt 4. - Adapt library, change import path to 'QtDeclarative'. - Update the tests and examples to match the new library name. - Rename qtquick1global{_p}.h to qtdeclarativeglobal.h. - Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like it was in Qt 4 and matching the library name again. This also changes the include guards in qtdeclarativeglobal{,_p}.h. - Fix occurrence of quick_debug in tools/qml/qml.pro. Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QDeclarativeTrace patch for a custom trace instanceFrantisek Vacek2012-09-282-1/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 QPerformanceTimer::elapsed(qint64 to_monotonic_time_ns) 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. Change-Id: I199211c1de66e930e252e8c033503d7f4940565f Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2428-673/+673
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I11a957e35758e821269478ebc91e87f0f5ebc4d5 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Do not assume ordering of resources declared for the default propertyMatthew Vogt2012-08-032-0/+17
| | | | | | | | | The order in which resources declared in QML are placed into the default property is not defined, and should not be relied upon. Task-number: QTBUG-26702 Change-Id: I5023b8dad89513cde69852e0c3a910477f60888e Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Rename qmldbg_tcp plugin to avoid conflict with qtdeclarative's copyKent Hansen2012-06-281-1/+1
| | | | | | | | | | ... and compile the plugin regardless of whether qtdeclarative has been qmake'd. Change-Id: I704214e07a92eff6630d94858eb6898a399d6fa2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Include <QDataStream> properly where QDataStream is usedThiago Macieira2012-06-192-0/+2
| | | | | | | | | | | And add the missing forward-declaration to QMetaObject in one place. I guess no one noticed that QObject was actually fully-declared, despite the existing forward declaration. This was caused by qpair.h including qdatastream.h, which includes qiodevice.h, then qobject.h, then qobjectdefs.h. Change-Id: Idd3aef1acecf0c045a63c154c3ce2d7835afa71b Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QtQuick1: Fix warnings about QWeakPointer usage.Friedemann Kleint2012-06-132-3/+4
| | | | | | | | - Use getPointer to get a weak pointer for the binding. - Change QWeakPointer<QObject> to a QPointer. Change-Id: I6c362a51c398f73817b5f4545d21f4845d625e13 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Don't use the deprecated value 0x100 for QUrlThiago Macieira2012-04-201-2/+2
| | | | | | | QUrl::toString is enough Change-Id: I02ff012dd3f36681e2040181e6775df4ca0c1003 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Adapt to Qt5 meta-object changesKent Hansen2012-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | QMetaMethod::signature() has been renamed to methodSignature(), and returns a QByteArray, not const char *. Thew new function QMetaMethod::isValid() should be used to check whether a method is valid (it's a lot cheaper than calling signature()). Also use the new QMetaObject::checkConnectArgs() overload that takes QMetaMethods, not strings, as arguments. Further improvements can be made by using the new functions QMetaMethod::name(), parameterCount() and parameterTypes(), but that will be done in separate commits. Change-Id: I3e4cfbdc7799d8bce747ef37f07d0d097370e409 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix compilation and tests after qtbase/api_changes mergeKent Hansen2012-04-181-2/+2
| | | | | | | | Adapt to QUrl changes, based on how qtdeclarative was adapted in commit 2d393ae042d5badf0862c0f95122f9662042f2a9. Change-Id: I9d1fddf4bbc6d86ac206dca4ac929d180ec12efa Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Define Q_QUICK1_EXPORT independentlyMatthew Vogt2012-02-2712-42/+41
| | | | | | | | | | | | Define Q_QUICK1_EXPORT and Q_QUICK1_PRIVATE_EXPORT inside the qtquick1 module rather than using the definition in qtbase. This change undefines the definitions from qglobal.h; the undef should be removed once the definitions have been expunged from qtbase itself. Change-Id: I1ee6fa1e513d110d9a298d897a8d3d465290e9ce Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Use new plugin system in QtQuick1.Friedemann Kleint2012-02-213-3/+10
| | | | | | | | - Use prefix "org.qt-project" for interfaces. - Use new macros, add json files. Change-Id: I157206ad883be16fb85b9b6bffca7200532561e4 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix license header format.Matthew Vogt2012-02-0728-56/+28
| | | | | Change-Id: Ib71237ed181d075329a0267b5c108e6534c13e4e Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* QtQuick1: Fix compilation on Windows.Friedemann Kleint2012-02-071-0/+1
| | | | | | | | - Add missing modules, includes. - Fix warnings. Change-Id: I21a6107db6c5978ccfd59c4202cf31e3deba19ca Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix license headers to match conventions.Matthew Vogt2012-02-0728-28/+56
| | | | | | | | Files updated to mtach licensing conventions for different types, and license text updated to match current. Change-Id: Ib2c7457fbc3b37907ab3936e176e6f16f8308036 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Modify QtQuick1 to build in Qt5Matthew Vogt2012-01-315-8/+19
| | | | | Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Import relevant source from Qt 4.8Matthew Vogt2012-01-3029-0/+6665
Change-Id: I5078db4081d95290c54f39d3c0efc2fc2f62e6a6