summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* DocAaron Kennedy2011-07-291-1/+1
|
* DocAaron Kennedy2011-07-291-1/+5
|
* Compile in namespaceAaron Kennedy2011-07-291-2/+2
|
* Fix alias warnings in QML compiled bindingsAaron Kennedy2011-07-291-9/+17
|
* Fix alias warnings in MetaCallArgumentAaron Kennedy2011-07-291-49/+65
|
* Fix alias warnings in QDeclarativeVMEAaron Kennedy2011-07-292-32/+72
|
* Fix alias warnings in QDeclarativeGuardAaron Kennedy2011-07-294-55/+88
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-reviewMartin Jones2011-07-0553-1406/+1876
|\
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-07-048-169/+293
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: Flicking behaviour of ListView/GridView SnapOnItem is inconsistent Skip flick velocity test on Mac. Try again to fix flickable velocity on Mac. Try to fix Mac CI test failure qmlplugindump: Fix dumping with -path on Mac. qmlplugindump: Improve error message for misbehaving plugin components. Flickable is too sensitive. Reduce timing dependancy in flickable test Velocities reported by Flickable in onFlickStarted can be 0 qmldump: Fix export comparison.
| | * Flicking behaviour of ListView/GridView SnapOnItem is inconsistentMartin Jones2011-07-045-153/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the response of the views when SnapOneItem/Row is enabled. In this case it is best to be much more reactive to the user input since even a small movement in a particular direction indicates a change to the next/previous item. Change-Id: I6a8eb689c3b12cdc67f24106032e36bba82d2846 Task-number: QTBUG-19874 Reviewed-by: Bea Lam
| | * Skip flick velocity test on Mac.Martin Jones2011-07-031-0/+4
| | | | | | | | | | | | | | | | | | Change-Id: Ib995961d7b1a939e5feb86d72a82408d1ceebe88 Task-number: QTBUG-19676 Reviewed-by: Bea Lam
| | * Try again to fix flickable velocity on Mac.Martin Jones2011-06-301-0/+1
| | | | | | | | | | | | | | | | | | Change-Id: Id2693a69739886f9a171f3f6438a5404dff8e901 Task-number: QTBUG-19676 Reviewed-by: Bea Lam
| | * Try to fix Mac CI test failureMartin Jones2011-06-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Try slowing down the flick to give the slow CI machine a better chance of success. Change-Id: Id61473e73a38bb888b9bee47cffb913c936155b9 Task-number: QTBUG-19676 Reviewed-by: Bea Lam
| | * qmlplugindump: Fix dumping with -path on Mac.Christian Kamm2011-06-291-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the current working directory was a direct parent of the qmldir path the exported modules had the path as the module URI on macs. Also changes the QtQuick export back to 1.0 to make it work with Qt 4.7.3. The version of that import statement does not actually matter as long as it's valid. Mirrors a change in Qt Creator: http://codereview.qt.nokia.com/896 Reviewed-by: Kai Koehne
| | * qmlplugindump: Improve error message for misbehaving plugin components.Christian Kamm2011-06-291-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Mirrors 6244008dcb43dde15dea3becbbec07d941b4759c in Qt Creator/2.3. Reviewed-by: Kai Koehne
| | * Flickable is too sensitive.Martin Jones2011-06-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drag, stop, release should result in a pan, which does not trigger a flick. The current flick threshold velocity is too low, leading to flicks when a pan gesture is more desireable. Change-Id: I3aa3bf28cc0ccbb043f3390ff4e044ea587ba3ff Task-number: QTBUG-19933 Reviewed-by: Bea Lam
| | * Reduce timing dependancy in flickable testMartin Jones2011-06-292-49/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | Interval of 10ms between synthesized flick move events is too prone to timing difference on CI platforms. Change-Id: Id5da794a7294868c8f5e544fa71edeec967e31ca Task-number: QTBUG-19676 Reviewed-by: Bea Lam
| | * Velocities reported by Flickable in onFlickStarted can be 0Martin Jones2011-06-282-9/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the smoothed velocity is set at the start of the flick. Ensure that the smoothed velocity animation isn't restarted unless there is new valid data. Change-Id: I00f8bbf1fe91faeea752b093c4658ad0f53ad06d Task-number: QTBUG-19676 Reviewed-by: Bea Lam
| | * qmldump: Fix export comparison.Christian Kamm2011-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Compare the full uri/name, not just the uri. Also QDeclarativeType::module was not available in 4.7.3. Mirrors http://codereview.qt.nokia.com/759 Reviewed-by: kkoehne
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-2339-1211/+1315
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: QmlInspector: Some code cleanups QmlInspector: Some cleanup in the Color Picker tool QmlInspector: Unified mouse and keyboard event handling QmlInspector: Removed private header postfix and Qt namespace QmlInspector: Share code between QGV/SG based QML debugging
| | * 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
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-232-20/+44
| |\ \ | | |/ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: qmlplugindump: For extended types, remove exports of the base object. qmlplugindump: Build debug version if possible.
| | * qmlplugindump: For extended types, remove exports of the base object.Christian Kamm2011-06-231-20/+27
| | | | | | | | | | | | Reviewed-by: Kai Koehne
| | * qmlplugindump: Build debug version if possible.Christian Kamm2011-06-231-0/+17
| |/ | | | | | | Done-with: owolff
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-225-7/+225
| |\ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: QDeclarativeDebug: Add code coverage information
| | * QDeclarativeDebug: Add code coverage informationKai Koehne2011-06-225-7/+225
| | | | | | | | | | | | | | | | | | | | | 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
* | | Merge remote branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2011-06-223-25/+54
|\ \ \ | |/ /
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-212-2/+14
| |\ \ | | |/ | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: Fix QDeclarativeInspector when starting with ,block
| | * Fix QDeclarativeInspector when starting with ,blockAurindam Jana2011-06-212-2/+14
| | | | | | | | | | | | | | | Change-Id: I3797567f22f61abf59ec5332ebc74b3fa37ede93 Reviewed-by: kkoehne
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-211-23/+40
| |\ \ | | |/ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: qmlplugindump: Add -v option. qmlplugindump: Fix emitted tooling version.
| | * qmlplugindump: Add -v option.Christian Kamm2011-06-211-23/+40
| | | | | | | | | | | | Reviewed-by: Kai Koehne
| | * qmlplugindump: Fix emitted tooling version.Christian Kamm2011-06-211-2/+2
| | | | | | | | | | | | | | | | | | Fixes 10f16bc55b9e5535bc3353260f97a32e18d70cf1. Reviewed-by: Kai Koehne
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into ↵Kai Koehne2011-06-212-13/+27
|\ \ \ | |/ / | | | | | | master-qml-staging
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-202-13/+27
| |\ \ | | |/ | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: QDeclarativeDebug: Fix cases where multiple packets arrive in one go
| | * QDeclarativeDebug: Fix cases where multiple packets arrive in one goKai Koehne2011-06-202-13/+27
| | | | | | | | | | | | | | | | | | | | | Make sure no packets get 'lost' when they're arriving in one go through the TCP/IP socket. Reviewed-by: Christiaan Janssen
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into ↵Kai Koehne2011-06-2015-194/+1540
|\ \ \ | |/ / | | | | | | master-qml-staging
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-2011-194/+1517
| |\ \ | | |/ | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: Fix js debugging autotest on Windows + Add license header Rewrite autotests for js debugging Rename qdeclarativescriptdebugging autotest directory
| | * Fix js debugging autotest on Windows + Add license headerKai Koehne2011-06-153-12/+65
| | |
| | * Rewrite autotests for js debuggingAurindam Jana2011-06-148-111/+1381
| | | | | | | | | | | | | | | Change-Id: I5cb0e53ceab136bfe7c53a3d6c51c8865b76761b Reviewed-by: kkoehne
| | * Rename qdeclarativescriptdebugging autotest directoryKai Koehne2011-06-144-7/+7
| | | | | | | | | | | | | | | | | | Align it with the other qdeclarativedebug* tests. Change-Id: Idde1c0948daa10bf4cc893bcd08c99b5c743553a
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-104-0/+23
| |\ \ | | |/ | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: Create property cache in case of Component{} root
| | * Create property cache in case of Component{} rootAaron Kennedy2011-06-104-0/+23
| | | | | | | | | | | | | | | Change-Id: I36f969d09d8ce5e0b68b657b514586990e88ebe4 Task-number: QTBUG-19354
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into ↵Kai Koehne2011-06-0979-427/+486
|\ \ \ | |/ / | | | | | | master-qml-staging
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-06-094-1/+25
| |\ \ | | |/ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: QDeclarativeDebug: Don't hang if started with ',block' argument QDeclarativeDebug: Fix QJSDebugService if launched with ',block'
| | * QDeclarativeDebug: Don't hang if started with ',block' argumentKai Koehne2011-06-091-0/+1
| | | | | | | | | | | | | | | | | | Fixes regression introduced in a59261454071 Reviewed-by: Christiaan Janssen
| | * QDeclarativeDebug: Fix QJSDebugService if launched with ',block'Kai Koehne2011-06-083-1/+24
| | | | | | | | | | | | | | | | | | | | | If the debugger is launched in blocking mode the service will be enabled from the start. Reviewed-by: Thorbjorn Lindeijer
generated by cgit v0.12 at 2024-09-25 14:31:51 (GMT)