| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Declarative had a number of places where double operations were used
instead of qreal, due to the use of double literals. These are now
constructed as qreal literals so that qreal operations are used.
This makes no difference where qreal is double. But on Symbian, qreal
is float, and this give a performance boost for floating point intensive
code.
Task-number: QTBUG-4894
Reviewed-by: Martin Jones
|
|\
| |
| |
| |
| |
| | |
Conflicts:
src/gui/text/qtextengine_p.h
src/network/ssl/qsslsocket_openssl.cpp
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/index.qdoc
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/index.qdoc
src/xmlpatterns/expr/qevaluationcache_p.h
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
doc/src/external-resources.qdoc
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
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.
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
qmlplugindump: For extended types, remove exports of the base object.
qmlplugindump: Build debug version if possible.
QDeclarativeDebug: Add code coverage information
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| |/ / / /
| | | | |
| | | | |
| | | | | |
(cherry picked from commit 609dc22f719ecb8d48349fd56f84960bbf46d731)
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
doc/src/declarative/righttoleft.qdoc
examples/draganddrop/fridgemagnets/main.cpp
examples/script/context2d/main.cpp
|
| | |\ \ \ \
| | | |/ / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QDeclarativeDebug: Don't hang if started with ',block' argument
QDeclarativeDebug: Fix QJSDebugService if launched with ',block'
Fix docs on caching for images loaded by image providers
Fixed compile of tst_qscriptextensionplugin on some Windows configurations
QDeclarative: fixed clean animation lists
DeclarativeObserver: Don't fade in the highlight edge
Renamed declarativeobserver plugin to qmldbg_inspector
QmlDebugger: adding slots to items in Live Preview
QmlDebugger: parsing packets iteratively in the communication protocol
qmlplugindump: Bump QtQuick.tooling version to 1.1.
qmlplugindump: Dump revision property.
qmlplugindump: Fix --path usage with drive letters on Windows.
ListView segmentation fault when setting highlight to null
DeclarativeObserver: Fixed duplicates in item selection
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Setting view highlight to null due to focus change caused a crash
since graphicsview accessed the highlight item after it had been
deleted. Remove highlight item from scene and deleteLater(),
as is done for delegates.
Change-Id: I5bfd59095aca90d3adca805bc4f61c92c192ee1b
Task-number: QTBUG-19509
Reviewed-by: Bea Lam
|
| | |\ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/gui/text/qtextengine.cpp
src/gui/text/qtextengine_p.h
src/gui/text/qtextlayout.cpp
src/plugins/phonon/mmf/mmf.pro
src/plugins/s60/5_0/5_0.pro
tests/auto/qtextlayout/tst_qtextlayout.cpp
|
| |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/gui/text/qrawfont.cpp
src/gui/text/qtextlayout.cpp
src/gui/util/qscroller.cpp
src/gui/widgets/qlineedit.cpp
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
doc/src/examples/wheel.qdoc
src/gui/util/qflickgesture.cpp
src/gui/util/qflickgesture_p.h
src/gui/util/qscroller.cpp
src/gui/util/qscroller.h
src/gui/util/qscroller_p.h
src/gui/util/qscrollerproperties.cpp
src/gui/util/qscrollerproperties.h
tests/auto/qscroller/tst_qscroller.cpp
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/gui/painting/qpainterpath.cpp
src/gui/text/qfontengine_ft.cpp
src/s60installs/eabi/QtGuiu.def
|
| | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |/ / / / / |
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/global/qnamespace.h
src/gui/text/qtextcontrol.cpp
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/gui/text/qfontengine_mac.mm
tests/auto/qdiriterator/tst_qdiriterator.cpp
|
| |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
doc/src/declarative/example-slideswitch.qdoc
doc/src/development/qmake-manual.qdoc
doc/src/snippets/code/doc_src_qmake-manual.pro
doc/src/snippets/code/doc_src_qtscript.qdoc
src/corelib/animation/qabstractanimation.cpp
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/eabi/QtOpenGLu.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qdir/qdir.pro
tests/auto/qsslsocket/tst_qsslsocket.cpp
tools/qdoc3/doc/qdoc-manual.qdocconf
|
| | | | | | | | | |
|
|\ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|/
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
StrictlyEnforceRange with snapOneItem/Row and header behavior change
|
| | |_|_|_|_|_|/
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change cf23188de237009136fa1480ab8fd9e3ca364769 changed the positioning
of a view with StrictlyEnforceRange, snapOneItem/Row, and a header,
such that the view was positioned at the beginning of the header,
rather than on the first item. This change reverts back to the old
behavior (position on the first item).
Change-Id: I62ad183919bb2ed83d787d1d76421caf9e708599
Task-number: QTTH-1501
Reviewed-by: Michael Brasser
|
|/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
(cherry picked from commit 609dc22f719ecb8d48349fd56f84960bbf46d731)
Reapplied after bad v4.7.4 merge
|
| |_|_|_|_|/
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
(cherry picked from commit e7bebcf0c59368340df524db4a53ae2595d057d7)
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalAlignment and anchors.mirror properties
|
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
effectiveHorizontalAlignment and anchors.mirror properties
* these properties are seldomly used
* they confuse developers that do not care about right-to-left user interfaces
* LayoutMirroring.enabled property can be used instead to determine if mirroring is enabled
* if needed, you can easily determine the effective layout directions and alignments
with a little bit of JavaScript:
function effectiveLayoutDirection() {
if (LayoutMirroring.enabled)
return (listView.layoutDirection == Qt.LeftToRight) ? Qt.RightToLeft : Qt.LeftToRight;
else
return listView.layoutDirection;
}
Task-number: QTBUG-11042
Reviewed-by: Martin Jones
|
|\ \ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updating file with CRLF line endings for the updated header
Fix a regression in QList::mid()
update gitignore
remove -fno-stack-protector
Fix make confclean
Update licenseheader text in source files
|
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The views don't have a valid count until both a model and a delegate
are provided. But, countChanged() is not called when a delegate is
set after the model, so bindings to count were not evaluated. Also
test that count is updated for insertion/removal
Change-Id: Ic82039a624c02f0bdb2862ac7a6e215df75bb314
Task-number: QTBUG-19037
Reviewed-by: Bea Lam
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QmlDebug: Fix license headers in new ost plugin
Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79
Resolve unqualified attached properties correctly
Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian.
QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'
QDeclarativeDebug: Don't crash when connection is closed
Fix so concurrent jobs produce the correct model results
Fix uninitialized variable.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: Ieebfc72cf9b31c9d2522487ed7cd860f060ef0be
Task-number: QTBUG-15877
|
|\ \ \ \ \
| |/ / / /
| | | | /
| |_|_|/
|/| | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Add pincharea.qmlproject file for PinchArea example.
Moving contentY by large values in List/GridView is slow
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We needed to create/destroy every delegate between the current position
and the new position. Now we estimate element at the new position and
just create the elements from that item.
Change-Id: I9da1354cbadb4e44fafc1a0bee619d058d1e06a2
Task-number: QTBUG-14974
Reviewed-by: Bea Lam
|
|\ \ \ \
| |/ / /
| | | /
| |_|/
|/| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Improve Flickable dynamics and allow platform specific tweaking.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Flickable's previous overshoot behavior was to continue past the
boundary without any additional friction (deceleration). It now
decelerates faster when overshooting.
On touch screens in particular, the last points when a touch point
is released are unreliable, resulting in sporadic flick velocities.
It also now allows the number of samples used for velocity calclations
to be tuned.
It is now easy to tune the Flickable behavior for different platforms.
Change-Id: I24142a50be1fde2f8877e359e30b8efcdd1f7d5c
Task-number: QTBUG-10894, QTBUG-16388, QTBUG-17830
Reviewed-by: Michael Brasser
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Return correct boundaries reasons from QTextBoundaryFinder.
GridView jumps to beginning of list when resized
|
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Introduced by RTL changes. The list position should only be reset when
the view is completely regenerated, e.g. when the orientation changes.
Change-Id: I748333529c113d95eaebfb8ac9bb9cf543413d3b
Task-number: QTBUG-18441
Reviewed-by: Bea Lam
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/examples/qml-examples.qdoc
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Change b3080d78f2ff2d98410249e09d5d7d6e20fd155c stopped the
currentIndex from being updated when a new item is added to an empty
view.
Change-Id: I77a0789fcf3693034a2d7aca173fec669b913b18
Task-number: QTBUG-18123
Reviewed-by: Bea Lam
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-11042
Reviewed-by: Bea Lam
Change-Id: I3f842b7672ee57dadbd1ed9216249c36aa527d6a
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativelistview.cpp
Change-Id: Ic21311365c6139520ae337a379bdedb6ffe497db
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-17280
Reviewed-by: Martin Jones
Change-Id: I34a623b49ce0fd5c05ae7a7ea5d0437c107b8a9b
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
ListView and GridView check before accessing an empty model.
Fixed issue with undefined header.
Current index initialised properly when dynamically creating
ListModel items with javascript.
Change-Id: I121c0626db6eb7ccaab689dfc750e0d03773d90f
Task-number: QTBUG-15877
Reviewed-by: Joona Petrell
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
GridView and ListView can now be laid out right-to-left. The
behaviour should be identical and mirrored to the oridinary behaviour.
Change-Id: I8e55c5f88358042caa5201712ef239cd67628172
Task-number: QTBUG-15877
Reviewed-by: Joona Petrell
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | | |
Conflicts:
doc/src/declarative/dynamicobjects.qdoc
doc/src/declarative/elements.qdoc
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There are two related problems:
- when dragging variable height content up beyond bounds items are
destroyed, causing the maximum extent to change, which in turn causes
skipping. This is fixed by storing the extents on press so that later
changes do not affect drag behavior.
- when variable height content is dragged beyond the bounds and
and released, items are created as the view returns to bounds. This
changes the extents, however the bound target was not updated. If the
viewport height changes during fixup the bounds animation is now
updated.
Change-Id: Ib37ec9e51f8ceb71af1e2e58f25fd8da18dcd632
Task-number: QTBUG-17769
Reviewed-by: Michael Brasser
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Ensure attributes added in QtQuick 1.1 are marked with the
'\since QtQuick 1.1' tag. Also add links to items listed in the
QtQuick 1.1 section in whatsnew.qdoc.
Task-number: QTBUG-17771
Change-Id: Ic8fb3c8d3c99a1469c1767779efaafd27ef460e1
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
merge-requests/1113
Conflicts:
doc/src/development/qmake-manual.qdoc
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ibe6969b5c3209062213c6582eaf4c285bcb793de
Task-number: QTBUG-17594
Reviewed-by: Bea Lam
|