| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Test shouldn't relay on error message, but on error type.
Reviewed-by: Kent Hansen
|
|
|
|
|
|
| |
Test checks comparison between two null contexts.
Reviewed-by: Kent Hansen
|
|\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Incorrect comparison result in QString::locale
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Incorrect comparison result in QString::locale
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The problem is that we are not able to set the locale in Symbian,
therefore this test becomes unreliable since it depends on a particular
locale being defined. We are disabling this test for now.
Task-number: QTBUG-16921
Reviewed-by: Shane Kearns
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fixed hslHue / hslHueF returning the wrong value for achromatic QColors.
|
| |\ \
| | |/
| |/| |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Made toHsl() work the same way as toHsv(), ensuring the hue gets set to
USHRT_MAX and not 0.
Task-number: QTBUG-16530
Reviewed-by: Eskil Abrahamsen Blomfeldt
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Moving the cursor to the corner of the desktop (0, 0) will typically
trigger things to happend in the OS, at least on Mac (spaces, synergy etc).
So I changed those tests to move it to (1, 1) instead. The reason to move
it to (0, 0) was just to get the mouse away from the window anyway.
And second, it takes some time after using QCursor::setPos on Mac
before the events from the move actually arrive. And many tests
that use this function relies on this. So I introduces a little
delay. This alone will fix a couble of tests.
|
|\ \ \ |
|
| |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Cocoa: non-native toolbar shows in window when hidden
Cocoa: disable scroll optimization for certain cases
Cocoa: fix scroll optimization bug
Cocoa: add scroll optimization when scrolling both hor and ver
Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4
Cocoa: remove compiler warning
Add support for disabling touch on to enhance scrolling in Cocoa
Cocoa/Alien: replace depricated API
Cocoa/Alien: remove unneded code for scrolling with alien
Cocoa/Alien: keep the scrolling within correct bounds
Cocoa/Alien: bugfix scrolling, dirty region issue
Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgets
Cocoa: enable more autotests for qwidget as a result of Alien
Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask)
Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engine
Alien implementation for the Cocoa port
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Cocoa: non-native toolbar shows in window when hidden
Cocoa: disable scroll optimization for certain cases
Cocoa: fix scroll optimization bug
Cocoa: add scroll optimization when scrolling both hor and ver
Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4
Cocoa: remove compiler warning
Add support for disabling touch on to enhance scrolling in Cocoa
Cocoa/Alien: replace depricated API
Cocoa/Alien: remove unneded code for scrolling with alien
Cocoa/Alien: keep the scrolling within correct bounds
Cocoa/Alien: bugfix scrolling, dirty region issue
Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgets
Cocoa: enable more autotests for qwidget as a result of Alien
Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask)
Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engine
Alien implementation for the Cocoa port
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Cocoa: non-native toolbar shows in window when hidden
Cocoa: disable scroll optimization for certain cases
Cocoa: fix scroll optimization bug
Cocoa: add scroll optimization when scrolling both hor and ver
Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4
Cocoa: remove compiler warning
Add support for disabling touch on to enhance scrolling in Cocoa
Cocoa/Alien: replace depricated API
Cocoa/Alien: remove unneded code for scrolling with alien
Cocoa/Alien: keep the scrolling within correct bounds
Cocoa/Alien: bugfix scrolling, dirty region issue
Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgets
Cocoa: enable more autotests for qwidget as a result of Alien
Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask)
Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engine
Alien implementation for the Cocoa port
|
| |\ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (78 commits)
Add util/xkbdatagen/README
Application background is incorrect if app locked to landscape.
QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap
Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap"
Temporary fix for ambiguous cast from four letter char constant
add autotest for digest authentication
Fix cursor position adjustment when removing strings
Fix QMAKE_POST_LINK in Symbian for targets with special characters.
QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap
Improved performance of mapFromGlobal/mapToGlobal on X11
Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivate
Avoid possible font name collisions on fbserv
Update of Czech translation for Qt 4.7-stable
Fix crash in QtScript/JSC stack allocator on Symbian
HTTP: fix digest authentication
Fix loop count in animanted gifs sometimes being incorrect
Fixed UTF-8 application names in device application menu in Symbian
Validate arguments to QDBusConnection::connect
make the test a bit stricter
ignore the warning from auto-detach in destructor
...
|
| | |\ \ \ \ |
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap
Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap"
add autotest for digest authentication
QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap
Improved performance of mapFromGlobal/mapToGlobal on X11
Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivate
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Markus Goetz
Task-number: QTBUG-15070
|
| | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Commit 0ba1b4d0 introduced a regression to QTextDocument: it postponed
cursor position adjustment until the move operation is done, but
contentsChanged will be triggered by finishEdit() in this move
operation, thus cursor positions in this signal handler will be in
inconsistent states (normally we should first update cursor position
then trigger contentsChanged). In this case we should also postpone
finishEdit() handling after cursor positions have been adjusted, then
the states expose to applications will be consistent.
Task-number: QTBUG-15857
Reviewed-by: Eskil
|
| | |\ \ \ \ \
| | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
configure
src/network/bearer/bearer.pri
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
don't say we passed the test if we didn't
Merge-request: 1018
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
we locked shm few line ago and didn't unlock it, so we expecting for this warning
Merge-request: 1018
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-16769
Reviewed-by: Bea Lam
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
We positioned the view beyond the bounds, which in some cases resulted
in only one item being created. Combined with a bug in the bounds
fixup very many items were created.
Task-number: QT-4441
Reviewed-by: Michael Brasser
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This reverts commit 82ff3f484c7ec49e60b7fddf23794937974a6768.
QTBUG-16796 reports that this commit is causing regressions
relating to initial sizing of items.
Task-number: QTBUG-16796
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Use SRCDIR as a base path for the test data.
Add the test data to the INSTALLS target
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The test cannot run on harmattan CI system, which executes it from
a different directory than the one where the executable resides.
Reviewed-by: Adrian Constantin
Reviewed-by: Harald Fernengel
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Lucian Varlan
|
| | | |\ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Cleanup created views in TextEdit tests.
TextEdit implicit size varied depending upon wrapMode.
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Michael Brasser
|
| | | |\ \ \ \ \ \
| | | | |_|/ / / /
| | | |/| | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Supporting Qt application fonts on Symbian
|
| | | | |/ / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This patch finally implements the missing application font support on
Symbian. QFontDatabase's addApplicationFont[FromData],
applicationFontFamilies and removeApplicationFont are now functional and
allow an application to load, use and unload fonts at run-time.
The underlying Symbian API comes with some restrictions/specialties.
Most of them are worked around in this patch, the missing ones are left
as part of QTBUG-16514:
- The font file must be a file, not a memory buffer. Web fonts and qrc
fonts come as memory buffers. These buffers are saved to a temporary
.ttf file and the file is loaded by the underlying Symbian API. The
temporary file can only be deleted after the font is unloaded.
- The font file must be in a public location in order to be loadable by
Symbian. It can for example not reside in the private application
directory. Therefore, all application fonts (also those that are on the
file system) become a temporary .ttf file in c:\temp\.
- Symbian3/PR2 will come with a font table API which provides direct
access to font tables. Symbian3/PR1 and below are missing this API,
therefore, an own TFontStore is (ab)used to read font tables out of a
font. This patch is considering both code paths in several occasions,
making the Qt Symbian font implementation significantly less
maintainable.
- The fonts are loaded into Symbian's central font server. Loaded fonts
from different processes can have colliding font typeface names (not
file names) on that server. The server does not separate loaded fonts by
their origin processes. Working around such collisions is part of
QTBUG-16514.
The number of fonts loadable at the same time by a Qt application is
limited to the random value 5. Just to prevent abuse of the font
server's memory.
As usual, this patch was looked at by colleagues, and it was adjusted
according to the feedback. But since the bus factor for the
interaction of Qt's and Symbian's font systems is 1, I reviewed this
patch, myself.
Task-Number: QTBUG-6611
Autotest: tst_QFontDatabase::addAppFont
|
| | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
on a systems with small packet windows, QProcess::readAllStandardError()
might return a part of the string and the existing code
adds an endl to it a bit later, causing a test failure.
(I don't care about the '\r'-s here because of QString shall eat them anyways)
Merge-request: 2546
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Revert "Add a warning about trying to release a timer ID that isn't active"
Some unit tests for layout explosion thingy
Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f
Build failure fix (related to QT-4079)
QWidgets support for VGA screen
|
| | | | |\ \ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Adds more tests for commit 7fbf1829e11504eca6a55f1e5dbddf2f658b5302
Task-number: QTBUG-13551
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
The bug has been around for a while, but change 604c51f1fc5c7 made it
emerge.
The problem was that stretches were combined by always *maxing* them.
The values of 'stretch' can be interpreted as this:
-1: (the default) it means that the items should be stretched with
the stretch factor dervived from the size hints. (In practice this
means that they are distributed fairly).
0: Means that the item should not be stretched
>0: Means that the item should be stretch with that number as a factor.
This meant that combining one item with a fixed size(0) and another
item with a default stretch (-1) the combined row stretch would end
up being fixed.
This also fixes how stretches are combined for spanning items too.
Task-number: QTBUG-13551
Reviewed-by: John Tapsell
|
| | | |/ / / / / |
|
| |\ \ \ \ \ \ \
| | |_|_|_|/ / /
| |/| | | | | /
| | | |_|_|_|/
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fixed a stupid typo
Fixed QPainterPath::pointAtPercent(t) for one-element paths.
|
| | |\ \ \ \ \
| | | |/ / / /
| | |/| | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Return the MoveTo element instead of QPointF(0, 0).
Task-number: QTBUG-16788
Reviewed-by: Eskil Abrahamsen Blomfeldt
|
| |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If QStateMachine::stop() was called by an event test or while
transitioning to another state, the state machine could end up
in an inconsistent internal state (stop==true, but the stopped()
signal was not emitted). This also caused the machine to behave
incorrectly if it was then restarted (it would immediately stop
upon receiving the first event).
Solution: Move the stop-handling after the event processing loop,
so that it always takes precedence over other possible reasons
for exiting the loop (event queues exhausted, final state
entered).
Task-number: QTBUG-16463
Reviewed-by: Eskil Abrahamsen Blomfeldt
|
| |_|_|_|/
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This test reveals a real bug when updating and scrolling
at the same time in graphicsview. The problem is that the scroll
will issue an update to cocoa that gets handled before already
queued Qt events. This means that the viewport of graphicsview
will receive a paintevent, and clear dirtyScrollOffset, before
the posted call to _q_processDirtyItems is executed. This means
that we 'loose' the scrolling information upon painting.
I discussed this problem with Bjørn Erik, and he had strong opinions
about this promblem not worthwhile fixing. The raster engine is
anyway about to be default on Mac, and there the problem will not exist.
|
|\ \ \ \ \
| |/ / / / |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QPainterPath can't handle NaNs/Inf inside coordinates, but instead of
safely ignoring or aborting an operation, it shows a warning and keeps
going on, with undefined behavior. Sometimes leading to infinite loops,
leaks or crashes (see qtwebkit example below).
This is particularly bad when QPainterPath is used to render content
from untrusted sources (web or user data). As an example, there's a
qtwebkit bug where the browser crashes when a particular SVG is loaded:
https://bugs.webkit.org/show_bug.cgi?id=51698.
Please note that "untrusted sources" doesn't apply only to network
sources. This behavior can probably be exploited on applications such as
file-browsers with previews enabled.
Task-number: QTBUG-16664
Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
Merge-request: 1026
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This adds a few more tests to exercise dynamic properties and child
objects as properties of QObject binding.
Some of these were implicitly tested elsewhere, but is good to have
the "properties" clearly stated in our test suite.
Reviewed-by: Jedrzej Nowacki
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This removes the assumption that the properties will be ordered by
index and that length will be visited after the indexes, which are
not part of QScriptValueIterator API.
Reviewed-by: Kent Hansen
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Fix qmake project in QtScript benchmarks
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
For some reasons script.pro file was missing a few benchmarks.
QScriptValueIterator benchmark didn't follow naming rules.
Reviewed-by: Olivier Goffart
|
| |\ \ \ \ \
| | |/ / / / |
|
| | | | | | |
|