| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is a slightly less awkward approach (keeps backwards-compatibility) while
speeding up startup for applications that don't use the old import path.
Also prints a warning to let developers know they should migrate their code when
possible. Completely disabling the Qt 4.7 import is still possible by setting
QT_NO_IMPORT_QT47_QML.
This takes around 10-15ms off a very simple "hello world" on my macbook.
(backport of qtquick1/2a3e9eb0ba00acf30b9cc40f7e2e4347726fb6b4)
Change-Id: I6960e7c28bb4f153d793802b978c1944977e8ed4
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
| |
- Assigned/Unused variables.
- Unsigned comparison >= 0 is always true.
- Constructor initialization order.
- Signed/Unsigned comparisons.
Change-Id: I1f9edab0506573420ed0bf3055252ba48625c8eb
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If the drag.axis is changed while a drag operation is in progress, put
it into action immediately. This allows, for example, start a dragging
operation out of an item in a scrollable ListView to anywhere on the
screen.
See the linked bug number for an example.
Task-number: QTBUG-26440
Change-Id: I4ffa71c08b97a767aec7f69d19271000a2631327
Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Use the component creationContext to create the highlight item.
Also do this for the header and footer.
Task-number: QTBUG-26043
Change-Id: Ib4b947d022cb1513f728ac66455bfd2fe2703744
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Item.mapFromItem() and Item.mapToItem() get the script engine from
the item they are called on. Safer to use the script value passed
to the function to determine the engine being used.
Task-number: QTBUG-26280
Change-Id: Id9d6c952cc91c7799910b29a27e24945d8ba073b
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QDeclarativeTextInputPrivate::sendMouseEventToInputContext()
now forwards also the delayed press events (sent by
QDeclarativeFlickable) to Input context. In case of delayed
event QWidget pointer in QGraphicsSceneMouseEvent parameter
is null and QApplication::focusWidget() is used to obtain
QWidget pointer.
Task-number: ou1cimx1#1001264
Change-Id: Ia595af651c322b0c91f3a2bd93a9ac1111a00cf6
Reviewed-by: Pauli Järvinen <ext-pauli.p.jarvinen@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Don't overwrite the ignore value once it's been set to true. Backport
from Qt 5.0 to Qt 4.8
(commit a7017465152d544a4217d5ce4f6f84b80cb9b8b9)
Task-number: QTBUG-25447
Change-Id: I2232806b1235b0c901aab21116b5bc70c65d0500
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Parent order was backwards, the inner context was parented to the
outer context, and then the inner context was reparented to the
delegate. Parent the outer context to inner context so both are
deleted when the delegate is deleted.
Task-number: QTBUG-25784
Change-Id: I1d6cd4dfc2530424535a7e00164563d9b4aaa513
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Both onMovingHorizontallyChanged and onMovingVerticallyChanged received
when Flickable element moved only to one direction.
Fixed so that only relevant signal sent.
Task-Id: QTBUG-25042
Change-Id: I20acb2403e08c2afa681da2e553cea227c91f001
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
A disabled Flickable should not filter children.
This is a backport of change I9f0d8fbfd0922b5c6a9eaffa69212867359f79e0,
from Qt5 (later discarded in QtQuick1 restructuring of Qt5).
Task-number: QTBUG-20584
Change-Id: Id279907ee90faf19284c12b548467850662a7019
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Verify the text cursor is not before attempting to deference the
layout it refers to.
Task-number: QTBUG-25389
Change-Id: I8a75393c5af9f81821ad91cbfdd7bbca0d84b1a2
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Add XButton1 AND Xbutton2 to the list of accepted Buttons.
This is only a doco fix, without any code change.
On branch 4.8
Change-Id: Ib396ec7707a63123759f1164927f0b63850cebe9
Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This function returns true if the item (or, in case it's a focus
scope, one of its children,) has focus (i.e., will
receive key events now), or will receive focus once the scene is
activated. It also returns true if the item has not yet been added
to a scene, but has subFocus, implicating that someone has called
setFocus() on it prior to it being added to the scene; the latter
case seen most commonly in unit tests.
Cherry-picked from qt/qtquick1: bb364c14157df635cf166b293f8cab6c22534aa1
Task number: QTBUG-24681
Change-Id: I2f2d9dd81820e94202a44393a38972c868a774b7
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Deactivation can happen for example if some notification dialog opens
on top of the application. In this case the PinchFinished signal was not
emitted.
It is fixed so that when the QDeclarativePinchArea component receives
QEvent::WindowDeactivate event, the ongoing touch activity is cancelled,
which causes the pinch to finish. Also if QEvent::TouchUpdate event is
received without receiving QEvent::TouchBegin event first, the
QEvent::TouchUpdate event will not cause the updatePinch() method to be
called.
Task-number: ou1cimx1#948030
Change-Id: Ib8b9e1a022415be06f1a8e778b887418f32c75ef
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-22512
Change-Id: I9acde5b799aa12c9de6e3321003bd5dcc4bb853d
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
|
|
|
|
|
|
|
|
| |
Inserting new items used a different threshold than removing items
outside the view in refill.
Change-Id: Id3605122a7a31caf0b661e78b5d868ceb3f01e20
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (23 commits)
Added missing license header.
Adjust pathes once again.
Fixed a link
Fixed a link
Split behavior and wigglytext examples
Rename files to show up in docs.
Whitespace changes and added depends.
Fix up examples.
Fixed some linking issues.
Removed unecessary files from folders.
Fixes for the manifest and links.
Changed some of the short descriptions for WebView examples.
Removed unecessary duplicate files.
Fix link to WebView examples.
Fix link to ListView and WebView example pages.
Fixed lists to be ordered lists and added curly brackets
Change the links to behavior examples.
Fix warning about unbalanced parantheses.
Fix abstractitemmodel compilation error.
Split ListView and WebView examples.
...
|
| | |
|
|/
|
|
|
|
|
|
| |
QTextDocument needs to know the actual control width rather than
the text width to be able to align the text to the control.
Task-number: ou1cimx1#934687
Reviewed-by: Joona Petrell
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/mainpage.qdoc
doc/src/platforms/supported-platforms.qdoc
doc/src/qt-webpages.qdoc
src/network/access/qnetworkdiskcache.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
If there is no delegate then clear state and return.
Change-Id: I786b9bc4018706797056fbd1ad25d25663102707
Task-number: QTBUG-22379
Reviewed-by: Andrew den Exter
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/kernel/qeventdispatcher_symbian.cpp
src/declarative/qml/qdeclarativetypeloader.cpp
src/imports/gestures/gestures.pro
src/imports/particles/particles.pro
src/opengl/qgl.cpp
src/opengl/qgl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro
tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro
tests/auto/qaudioinput/qaudioinput.pro
tests/auto/qaudiooutput/qaudiooutput.pro
tests/auto/qchar/qchar.pro
tests/auto/qclipboard/test/test.pro
tests/auto/qsound/qsound.pro
|
| |\
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Cannot flick to the end of a horizontal list view width LayoutMirroring
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
minXExtent calculated the offset due to highlight range incorrectly
(reversed) when mirroring enabled. Also us same algorithm for fixup()
in GridView and ListView uses.
Change-Id: Id7e7e540a894d6f520685b237d34b4186bc427b6
Task-number: QTBUG-21756
Reviewed-by: Bea Lam
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Backport more imports directory caching changes.
Fix more test DEPLOYMENT statements for Symbian
Fix deployment for declarative tests, examples on Symbian
Fix StrictlyEnforceRange with snapOneItem/Row and header behavior, pt 2
Backport imports directory caching performance optimization
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
Change f85819fe083ae7c6804c884de68e906d153a6d11 partially fixed the
problem. This change handles the case of the header/footer being
large enough to cause a snap item not to be found when the view
is dragged beyond the first/last item. In this case snap to the
currentItem.
Change-Id: I08b7e61496a79f71c3b40fafaca985ae90f88503
Task-number: QTTH-1501
Reviewed-by: Bea Lam
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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:
src/network/ssl/qsslcertificate.cpp
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QDeclarative::hasActiveFocus should return false for hidden items
FocusScope's focusItem must always be a descendent
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
In graphics view you can be the focus item without being visible,
but you still won't receive events. QML should hide these distinctions.
Task-number: QTBUG-21045
|
| | |\ \ \ \ \
| | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
Fix conversion of QAbstractItemModel::rowsMoved() parameters
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
VisualDataModel was emitting itemsMoved() signal with incorrect
"to" value when multiple items were moved forwards.
Reviewed-by: Martin Jones
|
| | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Fixed use of deleted object in XmlPatterns EvaluationCache
Crash when creating scroll bar skin graphics on S60 (debug only)
QS60Style omits drawing theme background in some Symbian SDKs
Fix for qml1shaderplugin GPU resource handling on Symbian
Make it easier to select words at the start of a line.
Doc: Fixing typo
In landscape mode QComboboBox popup can not be showed completely
Fix left alignment of native RTL pre-edit text.
|
| | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
Fix memory leak in ListModel custom parser
Correct documentation of TextInput.PasswordEchoOnEdit.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The documentation incorrectly stated only the last character was
unmasked. Use the same wording from the QLineEdit documentation
instead.
Task-number: QTBUG-20003
|
| |\ \ \ \ \ \ \
| | |_|_|/ / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
doc/src/index.qdoc
|
| |\ \ \ \ \ \ \
| | |_|/ / / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
doc/src/index.qdoc
src/xmlpatterns/expr/qevaluationcache_p.h
|
| |\ \ \ \ \ \ \
| | |_|_|/ / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
examples/webkit/fancybrowser/fancybrowser.pro
src/3rdparty/libpng/ANNOUNCE
src/3rdparty/libpng/CHANGES
src/3rdparty/libpng/CMakeLists.txt
src/3rdparty/libpng/LICENSE
src/3rdparty/libpng/README
src/3rdparty/libpng/configure.ac
src/3rdparty/libpng/example.c
src/3rdparty/libpng/libpng-manual.txt
src/3rdparty/libpng/libpng.3
src/3rdparty/libpng/libpngpf.3
src/3rdparty/libpng/png.5
src/3rdparty/libpng/png.c
src/3rdparty/libpng/png.h
src/3rdparty/libpng/pngconf.h
src/3rdparty/libpng/pngerror.c
src/3rdparty/libpng/pnginfo.h
src/3rdparty/libpng/pnglibconf.h
src/3rdparty/libpng/pngmem.c
src/3rdparty/libpng/pngpread.c
src/3rdparty/libpng/pngpriv.h
src/3rdparty/libpng/pngread.c
src/3rdparty/libpng/pngrtran.c
src/3rdparty/libpng/pngrutil.c
src/3rdparty/libpng/pngset.c
src/3rdparty/libpng/pngstruct.h
src/3rdparty/libpng/pngtest.c
src/3rdparty/libpng/pngtrans.c
src/3rdparty/libpng/pngvalid.c
src/3rdparty/libpng/pngwrite.c
src/3rdparty/libpng/pngwtran.c
src/3rdparty/libpng/pngwutil.c
src/gui/dialogs/qfiledialog_symbian.cpp
src/gui/kernel/qsoftkeymanager.cpp
src/s60installs/s60installs.pro
|
| |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Fixes: QTBUG-20390
|
| |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
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
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Drag, stop, release should result in a pan, which does not trigger
a flick. The current flick threshold velocity is too low, leading
to flicks when a pan gesture is more desireable.
Change-Id: I3aa3bf28cc0ccbb043f3390ff4e044ea587ba3ff
Task-number: QTBUG-19933
Reviewed-by: Bea Lam
|