summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Qml Debugging: Only enable if explicitly requestedv4.7.1Jason McDonald2010-11-035-0/+22
| | | | | | | | | | | | | | | | | | | Enable the remote debugging of QDeclarativeEngines only after QDeclarativeDebugHelper::enableDebugging() has been called. Approved by 4.7 Program Team. Reviewed-by: Alessandro Portale Task-number: QTBUG-13762 (cherry picked from commit b2016bbfc9c7389e7b64451417395ceba96af21f) Conflicts: src/s60installs/bwins/QtDeclarativeu.def src/s60installs/eabi/QtDeclarativeu.def
* Do not crash on SymbianJason McDonald2010-10-291-8/+8
| | | | | | | | | | | | | | | | | The qml debugging enabler in QtDeclarative made any Qt app crash which used QDeclarative. Reason was that QtDeclarative.dll tried to directly access (private) writable static data from QtGui.dll. This patch adds an accessor function for the data to QtGui, and the crash is gone. Done-by: Kai Koehne Reviewed-by: Kai Koehne (cherry picked from commit 2362d8b1e9fa86da1d3cc5dbb7d4467ec12311e1) Conflicts: src/declarative/debugger/qdeclarativedebugservice.cpp
* Update license headers to release version.Jason McDonald2010-10-18305-3978/+3978
|
* Ensure PathView updates positions when path changes.Michael Brasser2010-10-082-2/+16
| | | | | | | | Fixes regression caused by optimization added in commit 35a51442ed21f58c06b21293eeb56e843251ee82. Task-number: QTBUG-14239 Reviewed-by: Martin Jones
* QDeclarativeDebug: Make autotests more robustKai Koehne2010-10-042-0/+4
| | | | | | | | Always flush sockets after sending data, and make autotests more robust by using busy wait. Reviewed-by: Christiaan Janssen (cherry picked from commit cfe198948f1e4867918176df38b3e0b49757a4b8)
* QDeclarativeDebugClient: Make sure status is consistentKai Koehne2010-10-041-2/+1
| | | | | | | | | | When statusChanged() is called during handsake state() was not the same as the argument passed. Fix this by setting gotHello = true _before_ notifying the clients. Reviewed-by: Christiaan Janssen Task-number: QTBUG-14087 (cherry picked from commit a1f050fe4217d3a642ab7f4df8e50c21aa51689c)
* QDeclarativeDebugClient: Fix gcc warningKai Koehne2010-10-041-1/+1
| | | | (cherry picked from commit 9caae83e1f2b9c56ee86b8523391e6a83ea724c5)
* QmlDebugService: Check that there is a receiver before sending messagesKai Koehne2010-10-041-2/+4
| | | | | Reviewed-by: Christiaan Janssen (cherry picked from commit 30959e88498b2c8591145e30c8b497a76c12d8f6)
* Make QmlDebug protocol more robustKai Koehne2010-10-047-111/+304
| | | | | | | | | | | | | | | | | | | | | | | The protocol so far was client->server only. That is, there was no sane way for a client to check whether a plugin on the server (service) was available or not. E.g. calling Client::setEnabled(true) 'succeeded', without a check whether there is actually a service to talk to. The new protocol replaces this shortcoming by a service discovery mechanism: Both client & service announce their available plugins at handshake time, and later on if there are changes. The status is reflected in Client::status() and Service::Status() , which are either NotConnected - no network connection, or not registered properly Unavailable - TCP/IP connection works, but no plugin with the same name on the other side Enabled - You can connect to plugin on other side The status changes happen automatically (no setEnabled() anymore). Furthermore a version ID was added to the handshake, so that we can extend the protocol further in the future :) (cherry picked from commit fd9771c29d401d88779ab7c5d7715c9ca41dd723)
* Add exports for BauhausThomas Hartmann2010-10-042-2/+2
| | | | | | | The QmlDesigner(Bauhaus) should not rely on -nokia-developer Reviewed-by: Marco Bubke (cherry picked from commit 8ad396891f2a4966ad3cf943f99e208211e956bb)
* Use setParentItem() instead of setParentItemHelper if componentComplete is trueMarco Bubke2010-10-012-9/+34
| | | | | | | | | | | This ensures that if the component has already been completed, itemChange() is called. This is required to modify QDeclarativePositions in the visual editor, while keeping a legal state. Without this patch notifications are missing and the Positioner keeps track of already deleted children. This resulted in a crash. Reviewed-by: Thomas Hartmann (cherry picked from commit 1f8bb573f06234a3d13fb57de5eb644824d5024f)
* Add export to QDeclarativeBasePositionerMarco Bubke2010-10-011-1/+1
| | | | | Bauhaus needs this export to manage layouts. (cherry picked from commit 858469445ceb745c70dad9cd4f913acc34683e15)
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Jason McDonald2010-10-0112-16/+16
| | | | | | | | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones (cherry picked from commit 49452ad6b22e080b1dfdfde38c21c48bb910a1ae) Conflicts: tests/auto/declarative/qdeclarativeconnection/data/error-object.qml tests/auto/declarative/qdeclarativeconnection/data/error-property.qml tests/auto/declarative/qdeclarativeconnection/data/error-property2.qml tests/auto/declarative/qdeclarativeconnection/data/error-syntax.qml tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp tests/auto/declarative/qdeclarativeqt/data/quit.qml tests/auto/declarative/qdeclarativeview/data/error1.qml
* Register QtQuick 1.0 module.Aaron Kennedy2010-10-014-31/+145
| | | | | | | | Qt 4.7 is still supported, but deprecated. Reviewed-by: Martin Jones Task-number: QTBUG-13799 (cherry picked from commit 4fcf055f66cc23c9e60a7add489e394420e71914)
* If a type is registered under several names, share the attached property objectAaron Kennedy2010-10-016-10/+34
| | | | | Task-number: QTBUG-13799 (cherry picked from commit 746954581f06e0bca98f25eb95dca09c663d47bf)
* Fix crash when trying to append a null transform to QDeclarativeItem.Michael Brasser2010-10-011-1/+1
| | | | | Task-number: QTBUG-13893 (cherry picked from commit 085a121cb1ebba38d62c924500dbc71806b29b3c)
* Fix assert when placing a .qml file inside $QTDIR/importsKai Koehne2010-09-291-0/+1
| | | | | | | | | | | The assert "Internal error: Plugin imported previously with different uri" happens on Windows. $QTDIR\imports, which is prefixed to the search path, is still written with backslashes. Unify this to forward slashes for all paths. Task-number:QTBUG-13994 Reviewed-by: mae (cherry picked from commit 0aa6360b7648ddeb8a905960265eb46d8c12448f)
* Move includes after copyright blockMartin Jones2010-09-271-5/+2
| | | | (cherry picked from commit b750bb085029117497d26a24dcd590fbe34fe281)
* Mitigate private header problems in QtCreator by adding semi-private APIKai Koehne2010-09-272-0/+98
| | | | | | | | | | | Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a private header, where we nevertheless can make some BC checks/guarantees. Aaron Kennedy agreed with the idea. Task-number: QTCREATORBUG-2179 (cherry picked from commit c1a7deedf1628e0dd3a5fbf92d97c4151d17fb5a)
* Mitigate private header problems in QtCreator by adding semi-private APIKai Koehne2010-09-274-3/+42
| | | | | | | | | | | Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a private header, where we nevertheless can make some BC checks/guarantees. Aaron Kennedy agreed with the idea. Task-number: QTCREATORBUG-2179 (cherry picked from commit 63c4c0449361ced03838e51d18e1113740f27fa9)
* Autotest and small fix for QDeclarativeFontLoader.Yann Bodson2010-09-231-5/+1
| | | | (cherry picked from commit eef26bc8521da62db0dced6796eceb7c27f64160)
* Fix a crash in QDeclarativeVisualDataModelJoona Petrell2010-09-231-3/+3
| | | | | | Task-number: QTBUG-13754 Reviewed-by: Martin Jones (cherry picked from commit 46e49547f8e4614cd504b0af0d52d4e2768b57c3)
* Make qml debugging work with command line argumentsLasse Holmstedt2010-09-231-11/+30
| | | | | | | | | | | The environment variables do not work for Symbian devices, so without this change, QML debugging cannot be done on them. In addition, configure now contains an option to disable qml debugging entirely, due to it being a major security risk. Reviewed-by: kkoehne (cherry picked from commit a9e5329168cd9113bf41293c05193d8b099494c6)
* Make build on SymbianBea Lam2010-09-222-29/+33
| | | | (cherry picked from commit 68281ec913e2a69682f00bf22c291b15ea4ce542)
* Improve error messagesBea Lam2010-09-221-3/+3
| | | | (cherry picked from commit af29c555a29ebcdb1d962176912478212c9c7e65)
* Changes to objects returned from get() should emit itemsChanged() soBea Lam2010-09-225-38/+411
| | | | | | | | | | | | that the view is updated (currently the model data changes but the view does not). In flat-model mode, get() now returns a QScriptClass-type object so that changes to the returned object are received, and for nested-model mode, the fix adds a QDeclarativeOpenMetaObject subclass and ModelNode::listIndex so that itemsChanged() can be emitted when the node data changes. Task-number: QTBUG-12363 (cherry picked from commit c2bbef949126826f0330c69dff1a8c96919f69a5)
* Make it clear that private ListModel constructor is only for workerBea Lam2010-09-224-20/+33
| | | | | | agent. Also set up the worker list copy in the ListModel implementation instead of the agent. (cherry picked from commit c298ed31f8dfa917e5428820aecd39234b4c9097)
* Remove duplicated move() implementationsBea Lam2010-09-221-34/+26
| | | | (cherry picked from commit 16013f8970471f161db9fcc728a8c263e5bb84a7)
* Doc changesBea Lam2010-09-221-4/+4
| | | | (cherry picked from commit ee9c9e412fd5467e82be446603e71bee620ff04b)
* Moving items in a PathView caused PathView.onPath to be set to false.Martin Jones2010-09-211-3/+5
| | | | | | | | | Check that we no longer hold a reference to the item before setting onPath to false. Task-number: QTBUG-13689 Reviewed-by: Michael Brasser (cherry picked from commit 7e6b2b2b95bc1db77544b898ec45ea4a2683e435)
* PathView didn't accept mouse events, preventing it from working in a Flickable.Martin Jones2010-09-212-75/+112
| | | | | | | | | | | | Since it didn't accept the press it didn't get a grab, so its events were always filtered away by Flickable. Use the same implementation as Flickable, i.e. create private handler functions for mouse events and accept normal events in the mouse*Event() methods. Task-number: QTBUG-13687 Reviewed-by: Michael Brasser (cherry picked from commit a4cadd1b1fd30a1989d56f6c06deb8fed4f79882)
* Fix worker agent to emit ListModel itemsChanged() correctly when set()Bea Lam2010-09-211-1/+1
| | | | | | | and setProperty() are called Task-number: QTBUG-13666 (cherry picked from commit ff075380d7ec1472fcdff06b3f39ffdc02b7f112)
* Fix QDeclarativeXmlQuery mutex locking and don't wait for new jobs if the ↵Joona Petrell2010-09-211-3/+5
| | | | | | | | query has already quit Task-number: QTBUG-13041 Reviewed-by: Aaron Kennedy (cherry picked from commit 0c971a9801766a6d7646d1c1c413354f74db41e4)
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1629-283/+1304
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-162-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Check S60_VERSION instead of existence of certain files in bearer plugin Fixed EPOCROOT references in createpackage.pl. Restore 4.7.0 behavior that non-existing paths are possible. QTBUG-4852 Turning on runtime nested exception support where available Fix warnings Fixed incorrect Symbian scoping. QS60style: itemview selection indication works incorrectly
| | * Fix warningsThomas Zander2010-09-162-2/+2
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-162-72/+129
| |\ \ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update QtDeclarative def files Optimize FontLoader for "multi-use".
| | * | Optimize FontLoader for "multi-use".Yann Bodson2010-09-162-72/+129
| | |/ | | | | | | | | | | | | Task-number: QTBUG-13419 Reviewed-by: Michael Brasser
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-168-145/+294
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed regression in QPixmap::size() for null pixmaps. Make test less sensitive to platform specifics Doc: Further QML improvements. Doc: Minor improvements to QML-related documentation. The test livelock of QTimer is now expected to work Make sure mapSelectionFromSource does not return a selection with invalid ranges. QEventDispatcherUnix: do not process too many timer if other events need to be processed first Doc: Continued work on the QML documentation. Doc: More work on the QML documentation. Doc: More work on the declarative API documentation. Doc: Some editing and tidying up. Doc: Added a missing file. Doc: Fixed text in license headers.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-1521-62/+118
| | |\
| | * | Doc: Further QML improvements.David Boddie2010-09-151-22/+61
| | | |
| | * | Doc: Minor improvements to QML-related documentation.David Boddie2010-09-151-2/+2
| | | |
| | * | Doc: Continued work on the QML documentation.David Boddie2010-09-141-10/+49
| | | |
| | * | Doc: More work on the QML documentation.David Boddie2010-09-141-57/+59
| | | |
| | * | Doc: More work on the declarative API documentation.David Boddie2010-09-136-54/+123
| | | |
| * | | Compile fix for static build using mingw.Michael Brasser2010-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix follows the pattern of commit bbf78c9b422c4c7eda7e7fce067578c75d3bc9b3. Reviewed-by: Martin Jones
| * | | Models with a single role may not update due to "modelData" conflict.Martin Jones2010-09-161-10/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Models with a single role also have a modelData property added. These role names both ended up in a hash, resulting in only one or the other updating. Now we handle modelData specially. Task-number: QTBUG-13664 Reviewed-by: Michael Brasser
| * | | Fix bug in 34b805d66c09fb324d1b6a7bcf259e8743ef3894Thomas Hartmann2010-09-152-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This time the implementation of clear is correct Reviewed-by: Marco Bubke
| * | | crashfix for tst_qdeclarativeanimations::badTypes()Thomas Hartmann2010-09-152-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We always have to check for 0 before converting a raw pointer into a smart pointer Reviewed-by: Kai Koehne
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1516-53/+845
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Compile with QT_NO_GESTURES. Give file and line error information for errors in dummydata. Restore any absolute geometry changed by AnchorChanges when returning Export QDeclarativeScriptAction Completing the interface for children/data/resources Unit tests for Bauhaus enablers This patch allows modifications on PropertyChanges on the fly
generated by cgit v0.12 at 2025-04-13 02:43:38 (GMT)