| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit ac5c099cc3c5b8c7eec7a49fdeb8a21037230350)
|
|
|
|
|
|
|
| |
qdeclarativeglobal and tst_creation.cpp
Task-number:
Reviewed-by: Martin Jones
|
| |
|
|
|
|
|
| |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
Examples get the BSD license, while all other .qml files get the
LGPL/tech-preview license.
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
tests/benchmarks/declarative/binding/binding.pro
tests/benchmarks/declarative/creation/creation.pro
tests/benchmarks/declarative/creation/tst_creation.cpp
tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-9491
Reviewed-by: Martin Jones
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
These tests were either not compiling, were deploying incorrectly,
or looking for data files from wrong place.
Task-number: QTBUG-10661
Task-number: QTBUG-10666
Task-number: QTBUG-10667
Reviewed-by: Shane Kearns
|
|/
|
|
|
| |
Task-number: QTBUG-10665
Reviewed-by: Janne Anttila
|
| |
|
| |
|
|
|
|
|
|
| |
Since we aren't releasing for 4.6, all types are new in 4.7.
Task-number: QTBUG-10081
|
| |
|
| |
|
|
|
|
| |
Currently, by far the biggest chunk is QUrl hashing :-(
|
| |
|
|
|
|
| |
Consistent with "qml" runtime binary
|
| |
|
|
|
|
| |
Use setParent_NoEvent when parenting to group.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
Get them all running again after renames, etc.
|
|
|
|
| |
QDeclarativeXXX.
|
|\
| |
| |
| |
| |
| | |
Conflicts:
src/declarative/util/qmlanimation.cpp
src/declarative/util/qmlxmllistmodel.cpp
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
|/
|
|
| |
Task-number: QT-2798
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (81 commits)
Revert "Speed up QmlGraphicsItem::setParentItem."
Fix dynamic example
More strict type checking of ListElement properties.
Fix tst_QmlGraphicsLoader::networkRequestUrl autotest.
Fix tst_qmlgraphicstextedit::delegateLoading autotest
Delete the QmlImageRequestHandler in the correct thread.
Fix "AnimatedImage ignores Anchors setting"
Remove unused function that breaks build on AIX.
doc
Add support for startDragDistance in qmlviewer.
Add pixmap benchmarks and make cached rounded rect the same as Rectangle.
Make QmlDom API internal
Compile fix with namepaces
Doc: reformulate why we build a button
Removed incorrect Q_UNUSED() macro from QmlPropertyAnimation::transition
Doc: onExited, onEntered only work when button pressed or hoverEnabled
Ensure visibleIndex and currentIndex are updated on itemsMoved().
QmlView API review. See QmlChanges.txt for details.
Fix example after introduction of RotationAnimation.
Animation doc fix.
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
mkspecs/linux-g++-x11egl/qplatformdefs.h
src/declarative/qml/qmldom.h
src/declarative/util/qmlview.cpp
src/declarative/util/qmlview.h
tools/qdoc3/cppcodemarker.cpp
tools/qmldebugger/standalone/canvasframerate.cpp
tools/qmldebugger/standalone/engine.cpp
tools/qmldebugger/standalone/expressionquerywidget.cpp
tools/qmldebugger/standalone/expressionquerywidget.h
tools/qmldebugger/standalone/objectpropertiesview.cpp
tools/qmldebugger/standalone/objectpropertiesview.h
tools/qmldebugger/standalone/objecttree.cpp
tools/qmldebugger/standalone/qmldebugger.cpp
tools/qmldebugger/standalone/watchtable.cpp
tools/qmldebugger/standalone/watchtable.h
|
| | | |
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
Conflicts:
tools/assistant/tools/assistant/helpviewer_qtb.h
tools/assistant/tools/assistant/helpviewer_qwv.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |/
| |
| |
| | |
Reviewed-by: Trust Me
|