| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Call connectNotify() and disconnectNotify() in QML signal
handlers and in QML bindings.
This is a backport of Qt5's QtDeclarative commit
26ea8e01e9ee2a8c8c09266147b94c9ac92d09f9.
Task-number: QTBUG-11284
Change-Id: If5c3701426208875f3b775040c4e7bcbaac2b0a9
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
| |
The test has two unstable failures, so mark these with QEXPECT_FAIL
Task-number: QTBUG-26905
Change-Id: I1912626376f70ae6d645638fb5b07dbf9e4c3393
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
|
|
|
|
|
|
|
| |
This test is passing now on Windows.
Change-Id: I569c32c268406e3909ad418dc1761f85e9388f92
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Add missing .gitattributes file to ensure the test data file is
checked out with LF line endings on Windows.
Change-Id: I9ece655dbc8657d6e70c58ce1ada06ee021c92ad
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
(cherry picked from commit 587b21cf18bcb689aef58411837ed616b02c952b)
|
|
|
|
|
|
|
|
|
|
| |
This is a backport from qt5 commit:
0eeb925aa5039ffddf8d623f250980fc4c97712e
Task-number: QTBUG-17963
Change-Id: Ibc262e81d6c7d3b6882461627a7a312d1fbafb3b
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.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>
|
|
|
|
|
|
|
| |
precision issues
Change-Id: Ib667dc79072e900f200943f05fb3db9512f4282e
Reviewed-by: Glenn Watson <glenn.watson@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>
|
|
|
|
|
|
|
|
|
|
| |
Right now, the parser crash when using id.variant.property for an alias.
The current patch fix the crash, and it displays an error message in
the console now (like QtQuick 2).
Task-number: QTBUG-25341
Change-Id: I5e2c13f487655fd2b90129c5693f5daf3f77984b
Reviewed-by: Matthew Vogt <matthew.vogt@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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
The preventContextMenu QDeclarativeMouseArea auto test creates
QContextMenuEvent without specifying the global mouse position. As a
result, the event's global mouse position is incorrectly set to
QCursor::pos().
Change-Id: Ib67fbcf3acf968eb2748426ad0db0e900826b232
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Marked the following tests insignificant due to failures, these need
to be fixed later and then re-enabled:
tst_qdeclarativeerror
tst_lupdate
tst_qfile
tst_qlibrary
tst_qtcpserver
tst_qxmlquery
Task-number: QTQAINFRA-428
Change-Id: I648f86b3ec7767f83767af8981a6ce2aed65722b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
|
|
|
|
|
|
|
| |
This test has been stable for quite some time now.
Change-Id: I97157c4ccc8221d2ff9f54ee7ed4c66b50956c01
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
|
|
|
|
|
|
|
| |
This test has been stable for quite some time now.
Change-Id: I485ad4c904db758fa4e594ba0cd883fbe964e525
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Id42aefd69484d5cfe1f44566dffce4b05db5aa19
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@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-qml-staging:
Adapt autotests to commit e2773a9
Declarative: Use qDebug() for debugger status updates
Declarative: Unify output of warning messages in debug server
|
| |\ |
|
| | |
| | |
| | |
| | |
| | | |
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Change-Id: I30f996099346668f7b8067246c98b9ccc137ba57
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Marking a test with CONFIG+=insignificant_test will cause the exit code
of the test to be discarded during `make check'. This is intended to be
used for tests which are valuable to run, but are known to be unstable
and are not feasible to immediately fix.
Change-Id: Id7b2407d0a13c8de19a58badb78fa7c018c9b50a
Reviewed-by: Jo Asplin
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| | |
Symbian builds seem more strict about properly declaring exports than
other builds, so added proper exporting and importing to some
function declarations.
Task-number: ou1cimx1#957184
Reviewed-by: mread
|
|/ |
|
|\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Properly protect access to pixmap reader thread with mutex
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previously, access to the data from the reader thread wasn't guarded
properly, causing a crash when the reader thread was deleted prior to
QDeclarativePixmapData (which then attempted to dereference the
thread pointer to cancel the request), or in the case where a
QDeclarativePixmapData was deleted after its QDeclarativePixmapReply
was removed from the jobs queue but prior to processing.
Reviewed-by: Martin Jones
Task-number: QTBUG-22125
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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:
Fix crash on exit when overriding signal handlers in states.
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: I0e73948f18aa1b78c7e92677167673b84a90a450
Task-number: QTBUG-21617
Reviewed-by: Martin Jones
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '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
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-21306
Reviewed-by: Rohan McGovern
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/getting-started/installation.qdoc
doc/src/platforms/platform-notes.qdoc
src/corelib/tools/qlocale_symbian.cpp
src/gui/kernel/qwidget_p.h
src/network/access/qnetworkaccesshttpbackend.cpp
src/opengl/qgl.cpp
src/plugins/bearer/symbian/qnetworksession_impl.cpp
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QLineControl: selectedTextChanged() signal is omitted in some cases
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QLineControl does not emit selectionChanged() signal when
selection is changed due to handling of input method query.
As a fix, the signal is emitted when internal values for selection
end and beginning are changed in processInputMethodEvent().
Additionally, added deselect() test case for both QDeclarativeTextEdit
and QDeclarativeTextInput to help out autotesting of text selections.
Note that there are some differences in the QLineControl and QTextControl
implementations. This causes the different signal counts even if the
test steps are similar.
Task-number: QTBUG-21429
Reviewed-by: Miikka Heikkinen
|
| |\ \ \ \
| | | |/ /
| | |/| /
| | |_|/
| |/| |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QML import path puts Qt dirs in correct Symbian order
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The QML import path contains an entry for the standard
import location on each drive on Symbian. These were
being ordered so that Z:, the ROM drive, was listed
first. In fact the drive order was the reverse of the
normal Symbian drive search order. This had the effect
that upgraded versions of QML imports installed on
the device were generally ignored for older ROM based
versions.
The import path has now been changed to match the normal
Symbian drive search order. This will make it more likely
for upgraded QML imports to be picked up and used.
Task-number: QTBUG-21409
Reviewed-by: Shane Kearns
Reviewed-by: Martin Jones
|
| | |
| | |
| | |
| | |
| | |
| | | |
Fix compilation breakage caused by 160e1eed007f43a68ee03a6e8c0bfd2602a64ee0
Change-Id: I664a45454f247cf0bc85b09d8787443a75e62568
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: I0c289bdf555aa317dc12c5dbcff0168ebcc7bd50
Reviewed-on: http://codereview.qt.nokia.com/3935
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
(cherrypicked from a07f68eff5ac4696a551f083d186a685f7ef043d)
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
And fix the file names/location, too
Change-Id: If2d5ec0896332896ad11af748ec8f75c39e1555c
Reviewed-on: http://codereview.qt.nokia.com/3890
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
(cherrypicked from 8804ec49bda8672c5700ab843f2958c3d2bd8e41)
|
|\ \ \ |
|
| |\ \ \
| | |/ / |
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QTextDocument::isEmpty() doesn't account for pre-edit text so use the
return value of size() to determine if implicitHeight should fall back
to the font height instead.
Change-Id: I028552a7646372b22894c45946a57ec4951b044a
Task-number: QTBUG-21288
Reviewed-by: Martin Jones
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | | |
Conflicts:
doc/src/index.qdoc
src/xmlpatterns/expr/qevaluationcache_p.h
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QTextControl's word selection will only include a word if the cursor
position is past the mid point of the word. This can make it
difficult to select words near the edges of the screen on touch
devices. For the TextEdit word selection mode select a word ignore
the relative position within a word.
Change-Id: I2bc61376f663836fedd7e157448f0b565a64d485
Task-number: QT-5206
Reviewed-by: Martin Jones
|
| | | | |
|