summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
Commit message (Collapse)AuthorAgeFilesLines
* Fix assert when placing a .qml file inside $QTDIR/importsKai Koehne2010-09-271-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
* Fix test.Michael Brasser2010-09-271-0/+4
|
* More declarative autotests.Michael Brasser2010-09-241-1/+1
|
* Improve docs for Qt.quit()Bea Lam2010-09-231-1/+3
|
* Remove unused, unexported class.Michael Brasser2010-09-234-127/+0
|
* Fix warningsThomas Zander2010-09-161-1/+1
|
* Compile fix for static build using mingw.Michael Brasser2010-09-161-1/+1
| | | | | | Fix follows the pattern of commit bbf78c9b422c4c7eda7e7fce067578c75d3bc9b3. Reviewed-by: Martin Jones
* crashfix for tst_qdeclarativeanimations::badTypes()Thomas Hartmann2010-09-151-1/+2
| | | | | | | 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-154-2/+21
|\ | | | | | | | | | | | | | | | | | | | | * '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
| * This patch allows modifications on PropertyChanges on the flyThomas Hartmann2010-09-144-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is important for Bauhaus to ensure that we can edit properties and states dynamically in the visual editor Most of the changes consist of added functions for Bauhaus, that do not affect any current behaviour. Important changes: QDeclarativeAbstractBinding is holding a QSharedPointer to itself so that other classes can hold a weak reference to avoid accessing dangling pointers while keeping track of bindings. QDeclarativeStateOperation now has its own private class QDeclarativeStateOperationPrivate to hold a pointer back to QDeclarativeState since the parent is not set correctly in every context. QDeclarativePropertyChangesPrivate does now hold a QDeclarativeGuard instead of a raw pointer to the target QObject. In Bauhaus the target object might be deleted. Reviewed-by: Aaron Kennedy
* | Rename "interface" in qdeclarativeinterface.h to "qmlInterface"Rhys Weatherley2010-09-151-2/+2
|/ | | | | | | | The "interface" name is #define'd to "struct" in Windows COM headers in some SDK's, and creates problems when such headers are mixed with QML bindings. Reviewed-by: Joona Petrell
* I18n: Fix some lupdate warnings.Friedemann Kleint2010-09-141-4/+4
|
* Fix compile warnings.Friedemann Kleint2010-09-143-4/+4
| | | | Reviewed-by: Thomas Hartmann <thomas.hartmann@nokia.com>
* Merge branch '4.7' into qmldocsDavid Boddie2010-09-071-7/+5
|\
| * Small cleanupAaron Kennedy2010-09-061-7/+5
| |
* | Doc: More work on the QML documentation.David Boddie2010-09-071-1/+1
| |
* | Merge branch '4.7' into qmldocsDavid Boddie2010-09-065-11/+29
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-035-12/+28
| |\
| | * qreal == float fixesAaron Kennedy2010-09-031-1/+1
| | | | | | | | | | | | QTBUG-11853
| | * Don't modify the signal order on the second dynamic meta object passAaron Kennedy2010-09-031-4/+8
| | | | | | | | | | | | QTBUG-13374
| | * Support passing QObject derived types to QML methodsAaron Kennedy2010-09-032-3/+15
| | | | | | | | | | | | QTBUG-13047
| * | Complete Component::createObject() creation after setting the parent.Martin Jones2010-09-031-3/+5
| | | | | | | | | | | | | | | Task-number: QTBUG-13170 Reviewed-by: Alan Alpert
* | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-033-8/+16
|\ \ \ | | |/ | |/| | | | | | | Conflicts: doc/src/snippets/declarative/qml-intro/basic-syntax.qml
| * | The declarative parser should only save comment text (and not /*,*/,//)Michael Brasser2010-09-011-4/+4
| | | | | | | | | | | | Reviewed-by: Roberto Raggi
| * | Support for qsTrId and meta-data in comments for QML.Michael Brasser2010-09-011-1/+1
| |/
| * Support JS "in" operator on QML objectsAaron Kennedy2010-09-011-1/+1
| | | | | | | | QTBUG-12837
| * Only emit change signal when variant properties actually changeAaron Kennedy2010-09-011-3/+11
| | | | | | | | QTBUG-12601
* | Doc: Added types to method and signal documentation; other fixes.David Boddie2010-09-014-4/+13
|/
* Prevent calling deleteLater() from QMLAaron Kennedy2010-08-311-2/+2
| | | | QTBUG-13045
* Ignore non-scriptable properties in QMLAaron Kennedy2010-08-313-13/+43
| | | | QTBUG-13043
* Don't double call classBegin()Aaron Kennedy2010-08-311-1/+1
| | | | QTBUG-13114
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-08-311-0/+3
|\
| * Fix application exiting in embedded qml examplesJoona Petrell2010-08-301-0/+3
| | | | | | | | | | Task-number: QTBUG-13178 Reviewed-by: Martin Jones
* | Simplify type management codeAaron Kennedy2010-08-2717-1186/+1470
| |
* | QML JavaScript .import parserAaron Kennedy2010-08-272-0/+222
|/
* CleanupAaron Kennedy2010-08-273-13/+11
|
* Internal QML API cleanupAaron Kennedy2010-08-275-108/+124
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-251-9/+78
|\
| * Fix responseText to check the charset encoding field and also to notBea Lam2010-08-251-9/+78
| | | | | | | | | | | | | | | | assume that the data is xml. The change also follows the w3c spec more closely (e.g. check the mime type field as well for encoding, for both responseText and responseXML). Task-number: QTBUG-13117
* | Don't circumvent onDestruction handlers when clearing expression in delegate ↵Martin Jones2010-08-252-3/+16
|/ | | | | | | | | | | cleanup We clear all expressions when removing a delegate in order to avoid spurious warnings. This also removed onDestruction handlers. Ensure the onDestruction handlers are called before the expressions are cleared. Task-number: QTBUG-12946 Reviewed-by: Aaron Kennedy
* QDeclarativeDebug: send a message when new object are addedOlivier Goffart2010-08-243-2/+22
| | | | Reviewed-by: Lasse Holmstedt
* QDeclarativeEngineDebugServer: make it a singleton.Olivier Goffart2010-08-243-9/+14
| | | | | | | | | It is already a singleton, just formalize it so it can be used in other files than qdeclarativeengine.cpp This also remove the global olbject QDeclarativeEngineDebugServer::m_engines Reviewed-by: Lasse Holmstedt
* Fix few declarative code issues discovered by static code analysisJoona Petrell2010-08-246-6/+6
| | | | | Task-number: Reviewed-by: Aaron Kennedy
* QDeclarativeDebug: stream all the context, including the internals ones.Olivier Goffart2010-08-201-4/+2
| | | | | | | Some public context are within the internal context, so we need to stream them to get every objects Reviewed-by: Lasse Holmstedt
* Allow QML Quit buttons to work inside QtDemo.Alan Alpert2010-08-201-1/+1
| | | | Also changes the line documenting the quit signal on QDeclarativeEngine.
* QDeclarativeImageProvider: Do not keep the global declarative mutex locked ↵Olivier Goffart2010-08-193-8/+13
| | | | | | | | | | | | | | | | when processing. The point is to be able to process images in a thread. If the mutex is locked, this is useless. Use case is a slow QDeclarativeImageProvider that generates thumbmails from large files. Even with the asynchronous attribute set to true, the gui thread would be blocked by the mutex. By using QSharedPointer, I also fix the leak of the providers (which were not deleted) Reviewed-by: Martin Jones
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-162-5/+13
|\ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Keyboard navigation regression in QTreeView Implement the general blending of ARGB32_pm with SSSE3 QtDeclarative debugging: Add an option not to stream the properties of an object.
| * QtDeclarative debugging: Add an option not to stream the properties of an ↵Olivier Goffart2010-08-162-5/+13
| | | | | | | | | | | | | | | | | | object. Streaming all the properties is too slow, and we do not need them in the debugger of creator. Reviewed-by: Lasse Holmstedt
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-163-0/+4
|\ \ | | | | | | | | | | | | Conflicts: doc/src/declarative/elements.qdoc
| * | qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-163-0/+4
| |/ | | | | | | ...and a set of functional group pages.