| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QSoftkeyManager auto test update
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Updated correct values to simulateSymbianCommand function calls. It is
defined in QSoftKeyManagerPrivateS60 that left and right softkeys are
0 and 2, now these values are used in test also.
The signal spy actions have been updated to track the correct
button in checkSoftkeyEnableStates-function.
Task-number: QTBUG-18375
Reviewed-by: Sami Merila
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Corrected case mismatch.
Fixed pro file syntax in demos/spectrum
Fix for failing autotest QToolBar/Symbian
Removed useless Exit button in Symbian^3
|
| | |
| | |
| | |
| | | |
RevBy: Trust me
|
| | |\
| | | |
| | | |
| | | | |
merge-requests/2584
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '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
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The next character after a boundary is at pos, not pos + 1. Also
consider whether the previous and next character are whitespace in
combination when determing word boudaries otherwise positions between
whitespace characters will return both StartWord and EndWord.
And since there's no need to look ahead one character don't shortcut`
the regular logic for the boundary before the last character.
Change-Id: I2efbf3947066767945f96bf8456ef518d2149191
Task-number: QTBUG-11365
Reviewed-by: Denis Dzyubenko
Reviewed-by: Ritt Konstantin
|
| |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Show softkeys when opening a dialog that has a fullscreen parent.
Fixed autotests on Windows.
QS60Style: draw QComboBox menu correctly
Remove two compilation warnings for ARM
QTabWidget tabs are resized in wrong way when device rotates
Symbian: QComboBox popup Listbox size is not adjusted
Switched back to using symlinks for all mkspecs on Linux.
QS60Style: Support for Menu separators
Native image handle provider support in QGLPixmapData
Fix an issue with VGImage readback in openvg.
QSysInfo support for next generation Symbian devices.
Call FixNativeOrientation on Symbian for certain fullscreen qml views.
|
| | | | |
| | | | |
| | | | |
| | | | | |
RevBy: Trust me
|
| |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix text selection with shift-click.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Move the cursor when word selection is NOT enabled. If word selection
is enabled then then cursor would have been moved in a previous branch,
the (incorrectly inverted) check was to prevent that being overridden.
Change-Id: I788c3b41c6fdb250d6086893ea98a1aa8c302514
Task-number: QTBUG-18017
Reviewed-by: Alan Alpert
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed infinite loop in QPainterPath::intersects() when qreal=float.
|
| | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Similar to c30714122c58a3dc6fd8401427da60c4afc4127b, we need to limit
the max number of recursions.
Task-number: QTBUG-16422
Reviewed-by: Kim
|
| |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QSslSocket: add test for blacklisted certificates
QSslSocket internals: abort on encountering blacklisted certificates
QSslCertificate: fix test for blacklisted certs on Windows
QSslCertificate: report fraudulent certificates as invalid
FTP: Only read as much as the buffer size the user provided
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Make sure num_glyphs pass to HarfBuzz is large enough
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
(Backport from master)
Currently we only pass the num_glyphs for the run to
HB_ShapeItem, but it can be less then the string length
for this run because of Unicode surrogates. Thus, we need
to pass at least the length of that run as num_glyphs to
HB (given that we have enough space allocated because for
the entire string), if that's still not enough, we will
do ensureSpace again according to the num_glyphs returned
by HB and move remaining glyphs backwards.
Task-number: QTBUG-15679
Reviewed-by: Lars Knoll
|
| |\ \ \ \ \
| | | |_|/ /
| | |/| | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Text bounding rect calculated incorrectly if non-top aligned.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QRect::setY() affects the size of the rectangle, so the height of
the bounding rect was too small. Use moveTop() instead, which does
not affect the size of the rectangle.
Change-Id: If41ba6a28c9a7370f054dab20995a198f822ae2b
Task-number: QTBUG-18194
Reviewed-by: Bea Lam
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Bump Qt version to 4.7.4
Fix endianness detection with gcc 4.6 -flto -fwhole-program
remove redundand validateModes() call
|
| |\ \ \ \ \ \
| | | |_|_|_|/
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform.
Remove incorrect check in qpixmap autotest.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The test assumed that pixmaps do not have an alpha channel. This is
not true on some platforms, e.g. Symbian with OpenVG, there pixmaps
are often backed by some image data in ARGB32_Premultiplied format,
which means that QPixmap::mask() will return a valid QBitmap.
Task-number: QTBUG-18247
Reviewed-by: Jani Hautakangas
|
| |_|_|_|_|/
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
In Qt 4.5.3 and earlier, creating a QDirIterator with QDir::Files |
QDir::Hidden (i.e. search for all files, including hidden files)
returned a list of all hidden and non-hidden files in a directory tree.
In Qt 4.6.0 and later the same filter causes QDirIterator to return a
list of all hidden and non-hidden files and all hidden directories. As
the user is asking only for files, clearly returning hidden directories
too is incorrect behaviour.
Similarly, when asking for QDir::Dirs | QDir::Hidden (i.e. all
directories, including hidden directories), hidden files are also
(wrongly) returned.
Task-number: QTBUG-15421
Reviewed-by: joao
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Richard J. Moore
Task-number: QTBUG-18338
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Apparently the wildcard matching and the SRCDIR hack don't go well
together.
Reviewed-by: Markus Goetz
Task-number: QTBUG-18338
|
| |_|/ / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
There are some fraudulent certificates in the wild that are not valid;
this patch introduces a blacklist of serial numbers of those
certificates.
Reviewed-by: Richard J. Moore
Reviewed-by: Markus Goetz
Task-number: QTBUG-18338
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | | |
Conflicts:
dist/changes-4.7.4
|
| |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Change the pooled QGLPixmapData to be backed by QVolatileImage.
Started changes-4.7.4 file
Changed s60 style not to rely on QPixmapData::toNativeType().
Add missing bitmap locking to QVGPixmapData::fromNativeType.
Prepare fromSymbianCFbsBitmap autotest for 16 bpp format.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Due to recent changes QPixmap::fromImage() can return RGB16 images for
OpenVG pixmaps created from CFbsBitmap of display mode EColor64K.
The qpixmap autotest assumed that the returned image is always 32 bpp
which is not true anymore. Now it explicitly checks for 16 bpp and
handles it properly.
Reviewed-by: Jani Hautakangas
|
| |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix writing to an attached property from script.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: I80c228092271d4d9c5694607da7a123d06739731
Reviewed-by: Aaron Kennedy
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix accidental population of the disk cache with partial content
Fix disk cache interaction for range retrieval HTTP requests.
|
| |\ \ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
PathView doesn't update if preferred highlight range changes.
Image.PreserveAspectFit has unexpected effect on Image's sourceSize
Doc improvement for Image.fillMode.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Simply call refill() when they change.
Change-Id: I45ab56cbcaf5c726ce4c4f23f66ee687a6d89dad
Task-number: QTBUG-15356
Reviewed-by: Kevin Wu Won
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The sourceSize should always be the size of the image, unless set
otherwise. When calculating the size of an image with
Image.PreserveAspectFit set the natural image size should be used
for the calculation if no size has been set explicitly.
Change-Id: I104b7d1c3c16aa5b4fc98b1f9078ed8ae997cf69
Task-number: QTBUG-16389
Reviewed-by: Joona Petrell
|
| |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QDeclarativeView flickers when composited on MeeGo
Re-enable lineHeight tests.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
These tests were disabled by 24d8e96624af91ab01a20c10625858300f16099b
Change-Id: I5bf3e11dfb3c975415c3039b39a39c22984d2900
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Introduce QGraphicsItem::ItemStopsFocusHandling flag
|
| | |\ \ \ \ \ |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
When set for an item, QGraphicsScene will skip focus handling for this item and
everything underneath it (including focus-out). Allows users to reimplement
custom focus handling.
Use case: touch devices that implement panning. Here, focus-in has to happen
only if no panning was triggered. Analogous, no focus-out should happen when
panning was detected.
Fixes the alternative proposal ("black holes for focus changes") of
QTBUG-16343: QGraphicsView doesn't support focus change on mouse release.
The previous test was only testing one scenario, which didn't give a good idea
whether the flag was actually working as intended.
Task-number: QTBUG-17505
Reviewed-by: Yoann Lopes
Reviewed-by: Jan-Arve Sæther
|
| |\ \ \ \ \ \ \
| | | |_|/ / / /
| | |/| | | | |
| | | | | | | |
| | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Qt.include() used in WorkerScript is broken on Windows.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The script local filename was used to resolve the source URL rather
than the script URL.
Change-Id: I78aa23eadbd76e100bb872b6ac9459aa9a5ee5ce
Task-number: QTBUG-17977
Reviewed-by: Aaron Kennedy
|
| |_|_|_|/ / /
|/| | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Trust Me
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Since the disk cache does not support partial content, we should not
try to store it in the cache altogether.
Done-with: Jocelyn Turcotte
Reviewed-by: Markus Goetz
Reviewed-by: Peter Hartmann
|
|/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The disk cache API does not currently support retrieving partial content,
it can only serve entire files. Therefore we disable the use of the cache
for these kinds of requests, as indicated by the presence of the Range
header field.
Done-with: Jocelyn Turcotte
Reviewed-by: Markus Goetz
Reviewed-by: Peter Hartmann
|
|\ \ \ \ \ \
| |/ / / / /
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Disabled non-QDeclarativeItems in Flickable break flicking
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Allow Flickable to steal grab from items that are disabled.
Change-Id: I71e401cd78695ecb2c3d47abde1c3d13e722d848
Task-number: QT-4677
Reviewed-by: Michael Brasser
|
|\ \ \ \ \ \
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Designer: Fix a bug affecting tab reordering of promoted tab widgets.
Designer: Fix a bug clearing the Z-Order when adding a new widget.
Adjust right bearing when breaking with line separators
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If we found a forced line break with line separator (e.g. '\n'),
take the right bearing of previous glyph into account, otherwise
the resulting text width will be slightly smaller than the one
without a line separator.
Task-number: QTBUG-17020
Reviewed-by: Eskil
|
|\ \ \ \ \ \
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (46 commits)
Fix the license info for bin/elf2e32_qtwrapper.pl.
Avoid panics in QDesktopWidget on Symbian emulator.
QS60Style: use placeholder texture when polishing widgets and palette
Regression: QS60Style: Theme background is incorrect
Remove changes from fix to QTBUG-17045 that were not related to the fix
Prevent null pointer crash when closing splitview
QS60Style slows down layout switch by updating widgets unnecessarily
Fix qgraphicstransform autotest for Symbian, where qreal is float.
Removed reference to nonexistant profile.
Disable capabilities example for symbian-gcce due to a bug in elf2e32
Readded a ';;' that was removed by mistake.
Fixed mkspec detection for Symbian.
Removed javascript-jit from default symbian-gcce build.
Corrected a mismerge in GCCE link parameters.
Fixed incorrect referral to an include file.
Fixed win32-msvc2008 build regression.
Made qmake strip trailing \ from libdirs.
Fixed GCCE libdir handling if the paths have spaces in them.
Added MinGW support for adding lib prefix and extension via profile.
Added support for various special compiler/linker flags on MinGW.
...
|