| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix TextEdit auto test failure on windows.
Fix FocusScope example.
Fix compilation on old Symbian platforms
Export symbols from qtestlib required for QtQuickTest
Allow MouseArea to prevent mouse grab begin stolen by Flickable.
Fix QTBUG-17008 XmlListModel blocks Windows system events
Fix TextInput, TextEdit auto test failure on windows and mac.
QDeclarativeDebug: Fix crash when serializing list of QObjects
Update the input context when the pre-edit cursor position changes.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Placing a MouseArea in a Flickable (or PinchArea, or PathView) allows
the Flickable to steal mouse events when it detects a flick/drag event.
In some cases this is not desireable and MouseArea should be able to
retain its grab. Added a 'preventStealing' property to prevent
an ancestor item from stealing the MouseArea's grab.
Change-Id: I6277fbb76919b2b35d4e32a247b38a90e305dbdf
Task-number: QTBUG-17285
Reviewed-by: Joona Petrell
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Don't leak ScopeChainNode's
Rename 'plugins\qmldebugging' (work around qmake issues)
Correct the "module not installed" error handling
Flickable uses the flick velocity to determine whether to retain grab
Make addImportPath() work for windows paths starting with lower case
Report any exceptions occurring in WorkerScript javascript code
MouseArea docs - link to onCanceled() from onReleased()
|
| | |
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (216 commits)
Doc: Fixed a reference to the wrong image.
Fixed a bug that caused marked up inline text to be truncated.
Doc: Renamed an image to ensure that it does not clash with another.
Doc: Fixed QML, unindented snippet.
Doc: Removed unnecessary HTML entity from the title.
Doc: Fixed broken links to the old Symbian Foundation Wiki.
Doc: Updated the copyright statements in the templates.
Doc: Fixing typo
Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
Doc: Adjusted the font sizes for the offline documentation.
Doc: Added a missing style sheet to the qhp manifest.
Doc: Fixed the qthelp namespace for the Qt documentation.
Doc: including missing pages in overviews.
Doc: Fixed typo in QCoreApplication docs
Fixed whitespace.
Avoid hard-coding product names in page titles.
Doc: Unindented a code snippet.
Doc: Fixed confusing wording of a sentence.
Doc: Fixed a broken link.
Doc: Updated the information about commercial editions of Qt.
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/declarative/qdeclarativeintro.qdoc
doc/src/declarative/qdeclarativereference.qdoc
doc/src/snippets/declarative/focus/focusColumn.qml
tools/qdoc3/apigenerator.cpp
tools/qdoc3/apigenerator.h
tools/qdoc3/archiveextractor.cpp
tools/qdoc3/bookgenerator.cpp
tools/qdoc3/bookgenerator.h
tools/qdoc3/ccodeparser.cpp
tools/qdoc3/command.cpp
tools/qdoc3/command.h
tools/qdoc3/cpptoqsconverter.cpp
tools/qdoc3/dcfsection.cpp
tools/qdoc3/dcfsection.h
tools/qdoc3/jambiapiparser.cpp
tools/qdoc3/jambiapiparser.h
tools/qdoc3/javacodemarker.cpp
tools/qdoc3/javacodemarker.h
tools/qdoc3/javadocgenerator.cpp
tools/qdoc3/javadocgenerator.h
tools/qdoc3/linguistgenerator.cpp
tools/qdoc3/linguistgenerator.h
tools/qdoc3/loutgenerator.h
tools/qdoc3/mangenerator.cpp
tools/qdoc3/mangenerator.h
tools/qdoc3/polyarchiveextractor.cpp
tools/qdoc3/polyarchiveextractor.h
tools/qdoc3/polyuncompressor.cpp
tools/qdoc3/polyuncompressor.h
tools/qdoc3/qsakernelparser.cpp
tools/qdoc3/qscodemarker.cpp
tools/qdoc3/qscodemarker.h
tools/qdoc3/qscodeparser.cpp
tools/qdoc3/qscodeparser.h
tools/qdoc3/sgmlgenerator.cpp
tools/qdoc3/sgmlgenerator.h
tools/qdoc3/test/qt-html-templates.qdocconf
tools/qdoc3/uncompressor.cpp
tools/qdoc3/webxmlgenerator.cpp
tools/qdoc3/webxmlgenerator.h
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is a more natural ordering, and makes it trivial to control
different state groups with pressed and onClicked.
Reviewed-by: Martin Jones
|
| | |
| | |
| | |
| | | |
Reviewed-by: Martin Jones
|
| |/
|/|
| |
| | |
Reviewed-by: Martin Jones
|
|/
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
| |
This meant that they would sometimes act upon a drag immediately,
rather than waiting for a nested area to take the grab. This resulted
in a short jump before future events were handled by the nested item.
Task-number: QTBUG-15568
Reviewed-by: Bea Lam
|
|
|
|
|
|
|
| |
two separate clicks
Task-number: QTBUG-14832
Reviewed-by: Martin Jones
|
| |
|
|
|
|
|
|
|
|
| |
Also ensures that the pressed property is updated appropriately
and the double click and hold is possible.
Task-number: QTBUG-14279
Reviewed-by: Michael Brasser
|
|\ |
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-12250
Reviewed-by: Michael Brasser
|
|/ |
|
| |
|
| |
|
|
|
|
| |
...and a set of functional group pages.
|
|
|
|
|
| |
Task-number:
Reviewed-by: Martin Jones
|
|
|
|
|
|
|
|
| |
This allows dragging a MouseArea that contains a clickable MouseArea,
for example.
Task-number: QTBUG-12323
Reviewed-by: Michael Brasser
|
| |
|
|
|
|
| |
Seems some platforms don't have it.
|
|
|
|
|
|
|
|
|
|
| |
Allow essentially unbounded dragging once drag.target is set. The previous
default of contraining the dragging to 0,0 (i.e. no drag) was unintuitive
for learners. It's rare that unbounded is actually what you want, but it
makes it much easier to get started with the element.
Task-number: QTBUG-11184
Reviewed-by: Martin Jones
|
| |
|
|
|
|
| |
Task-number: QTBUG-11986
|
|
|
|
| |
Task-number: QTBUG-11754
|
| |
|
| |
|
|
|
|
| |
being used.
|
|
|
|
| |
examples from class docs and improve assorted docs
|
|
|
|
| |
Task-number: QTBUG-9227
|
|
|
|
|
|
|
|
|
|
| |
Added an onCanceled signal to mouse area, which is triggered when the
mouse area rejects the event (propagates to the nearest
mouse area beneath) or some other element steals the mouse grab
(flickable, for example).
Task-number: QTBUG-10162
Reviewed-by: Michael Brasser
|
| |
|
| |
|
| |
|
|
|
|
| |
Task-number: QTBUG-10243
|
|
|
|
|
|
|
|
|
|
|
| |
The unbgrab mouse happens when the mouse area is inside a flickable and the
flickables takes control over the mouse handling. In this case, the UngrabMouse
will behave similarly to a MouseRelease, emitting released, pressedChanged
and hoveredChanged.
Visual autotest added to mousearea in qmlvisual.
Reviewed-by: Michael Brasser
|
|
|
|
|
|
|
| |
The drag.active property specifies if the target item is being dragged.
Task-number: QTBUG-9833
Reviewed-by: Martin Jones
|
| |
|
|
|
|
|
|
|
|
|
| |
Mouse area coordinates are now updated when the mouse area changes position
and positionChanged signals are not emitted on mousePress anymore (only
mousePosChanged signals).
Task-number: QTBUG-9716
Reviewed-by: Michael Brasser
|
|
|
|
| |
Task-number: QTBUG-9676
|
|
|
|
| |
Task-number: QTBUG-9637
|
|
|
|
| |
Task-number: QTBUG-9638
|
|\ |
|
| |
| |
| |
| |
| | |
Always use private/. The WinSCW compiler doesn't search the current
directory, for whatever reason.
|
|/
|
|
| |
Task-number: QTBUG-9381
|