aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/debugger/qqmlenginedebugservice.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge master into api_changesKent Hansen2012-03-191-27/+37
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/qml/debugger/qqmlenginedebugservice.cpp src/qml/qml/v8/qv8qobjectwrapper.cpp src/quick/util/qquickimageprovider.cpp tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb
| * Debugger: Fix compilation with C++11Kai Koehne2012-03-191-1/+1
| | | | | | | | | | Change-Id: I6f753d14aa381fd29aadfc7c649599beb4ec4a9a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * QmlDebugging: Object Tree and States ListAurindam Jana2012-03-191-16/+28
| | | | | | | | | | | | | | | | | | All created instances are stored under the root context. Check for the creation context of the object when building up the tree. Do the same when building up the states list. Change-Id: I8716d9966a61b8f7cb3ad4b7ab5acd4c94b4cd03 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
| * Remove binding dependency on QQmlExpressionAaron Kennedy2012-03-151-3/+1
| | | | | | | | | | | | | | | | This is the first step to creating much lighter weight bindings that are tuned for the specific scenario in which they're used. Change-Id: Ib985dcff25679b711b5c634bbc891aa7902bf405 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Debugger: Use QStringLiteral where appropriateKai Koehne2012-03-131-8/+8
| | | | | | | | | | Change-Id: I5c33113783834ef0c7292f5f19f12d8c68f42141 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* | Adapt to Qt5 meta-object changesKent Hansen2012-03-131-4/+2
|/ | | | | | | | | | | | | | | | | | | QMetaMethod::signature() has been renamed to methodSignature(), and it now returns a QByteArray. Also, the new function QMetaMethod::isValid() should be used to determine whether a method is valid, instead of relying on signature() returning a 0 pointer. Where it makes sense, the existing code that was using signature() and parameterTypes() has been changed to use the new API QMetaMethod::name(), parameterCount(), and parameterType(int). Also, in the new meta-object revision (7), the QMetaObject stringdata member is now of type QByteArrayData*. QFastMetaBuilder will be ported to generate the new format, but for now it's sufficient to reinterpret_cast the stringdata assignment to keep it compiling. Change-Id: Ie340ef17bcebc3afa4aae6450dfe2d06e4d881a4 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* QmlDebugging: Revert the names of servicesAurindam Jana2012-03-071-2/+2
| | | | | | | | | Revert the names of the services changed in b855240b782395f94315f43ea3e7e182299fac48 to maintain BC. Change-Id: I79826d92fd09c41e0020541b0c7bb77b5b2ecb1f Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-241-0/+733
Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 17:35:40 +0000