| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
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
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If there is no committed text in a TextInput or TextEdit determine
if the pre-edit text is right to left before falling back to the
global keyboard settings.
Change-Id: I7e5568e936341602b8faf7be120f9a770c115f48
Task-number: QMLNG-72
Reviewed-by: Michael Brasser
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The application might get the COVERAGE false message before
anything is executed.
Change-Id: Iafa26e527757a76a1e8502c362ba767acfe87e75
Reviewed-by: Aurindam Jana
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We forgot about this in the original commit.
Change-Id: Ic88c6155e0f95bb8d93629489ab6c95b1844bca7
Reviewed-by: TrustMe
|
|/ / /
| | |
| | |
| | | |
Change-Id: I84119a3164018a4179f8a7187348865a30b3237a
|
|\ \ \
| |/ /
| | /
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| | |
Change-Id: Iae4b2f9f6c9a7da7ec0e194b2568fb3a6da8ea71
Task-number: QTBUG-19109
Reviewed-by: Martin Jones
|
|\ \ |
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/declarative/qtbinding.qdoc
|
| | |\ \
| | | |/
| | | |
| | | |
| | | | |
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If QT_GUI_PASSWORD_ECHO_DELAY is defined in qplatformdefs.h with an
integer value in milliseconds, QLineEdit and TextInput will display
the last character entered unmasked for that delay period and then
mask the character as normal. If QT_GUI_PASSWORD_ECHO_DELAY is
not defined then the behaviour is unchanged.
Change-Id: I55f527932d34453828caba88e93ad57e012e79be
Task-number: QTBUG-17003
Reviewed-by: Martin Jones
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: Ib995961d7b1a939e5feb86d72a82408d1ceebe88
Task-number: QTBUG-19676
Reviewed-by: Bea Lam
(cherry picked from commit 8fbb802fa50d0a01c9c01d007a3e016c45fa863c)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: Id2693a69739886f9a171f3f6438a5404dff8e901
Task-number: QTBUG-19676
Reviewed-by: Bea Lam
(cherry picked from commit 927b22b06ee2e749395e73f457fe3c16ea087864)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Try slowing down the flick to give the slow CI machine a better
chance of success.
Change-Id: Id61473e73a38bb888b9bee47cffb913c936155b9
Task-number: QTBUG-19676
Reviewed-by: Bea Lam
(cherry picked from commit 343069c7843321b33f06bfd42d476abae76dcece)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Interval of 10ms between synthesized flick move events is too prone
to timing difference on CI platforms.
Change-Id: Id5da794a7294868c8f5e544fa71edeec967e31ca
Task-number: QTBUG-19676
Reviewed-by: Bea Lam
(cherry picked from commit 6fb7cdf8741ca924413dd7cbc09fad91ddc04823)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Ensure the smoothed velocity is set at the start of the flick. Ensure
that the smoothed velocity animation isn't restarted unless there is
new valid data.
Change-Id: I00f8bbf1fe91faeea752b093c4658ad0f53ad06d
Task-number: QTBUG-19676
Reviewed-by: Bea Lam
(cherry picked from commit a2d97672bfaace677a4308db93f5802ba53af46e)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fixed license text in files having old license.
Reviewed-by: Trust Me
|