| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845
Read QWS_SIZE from layer rather than screen
Get rid of no_cast_from_ascii warning
Docs: Amendments to latest changes to QImageReader docs.
images: Document QImageReader::loopCount behaviour for infinite loops
gif: Add unit test for QImageReader::size calls
gif: 10% speedup on microbenchmark on QImageReader
png: Avoid calling QImage::scanLine(int) from within a loop
QImageReader: Avoid errorString creation in the normal case
Fix text rendering on GL2 paint engine
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
as discussed at #qt-labs special dirs should be hidden on unix
to preserve qt3-like behavior
unhiding those dirs was not a good idea and now i do revert of my changes
Merge-request: 1894
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The gif and mng reader will return -1 as QImageReader::loopCount()
for infinite images. Document that this -1 is clashing with the
error handling of this method.
The documentation was mixing the default and error cases. In some
cases "Otherwise -1" and "Otherwise 0" was used. Change this to
mention the default coming from QImageIOHandler in the "Otherwise"
clause and document the error case with -1.
Add a test case to check that loopCount() returns -1 for infinite
animations.
Reviewed-by: Andreas
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Verify that QImageReader::size is not consuming a frame and
can be called before each frame and that the last frame will
return a QSize of (-1x-1).
Task-number: QTBUG-6696
Reviewed-by: Andreas
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The libjpeg library has builtin support for scaling to 1/2, 1/4, and 1/8
the original size very quickly. Use this in the implementation of
setScaledSize() to get close to the desired size and then scale
with QImageSmoothScaler the rest of the way.
Task-number: QT-2023
Reviewed-by: Daniel Pope
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added more specific clean targets for Symbian builds
Fixed incorrect headers.
Daylight savings time for Symbian.
Tool for launching symbian apps on the phone from windows command line
Fixes to winscw def files
Fixing compile error on armcc
|
| | | |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix a bug in resizing the anomaly browser demo.
doc: Added a missing \sa command, plus a \l in the text.
Improve the performance of the Anomaly browser demo
Fixed crash when parsing invalid polygons in svgs.
doc: Fixed typos.
Fixed QResource to respect the explicitely set locale
Change QHostInfo to use 5 parallel lookup threads
Doc: fix typo
fix Cocoa build
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: Added a missing \sa command, plus a \l in the text.
Improve the performance of the Anomaly browser demo
doc: Fixed typos.
Fixed QResource to respect the explicitely set locale
Change QHostInfo to use 5 parallel lookup threads
Doc: fix typo
fix Cocoa build
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When using QResource directly, the loader should respect the locale that the
user asked to use for the resource.
Reviewed-by: João Abecasis
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Instead of sequentially looking up and potentially taking
a long time, we now do work in parallel.
Reviewed-by: ogoffart
Reviewed-by: lars
|
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | | |
Reverted due to buildbreak on 3.2 ARMV5 Urel.
This reverts commit 2a20705f874ddad55282f22fabfe30927729ae50.
|
|\ \ \ \
| |/ / / |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We now automatically enable mouse tracking on the viewport of the
GraphicsView when setting AnchorUnderMouse as transformationAnchor or
resizeAnchor.
Autotest included.
Task-number: QTBUG-6835
Reviewed-by: bnilsen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
match its source.
Merge-request: 2266
Reviewed-by: Olivier Goffart
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Also move the modeltest related tests to the modeltest subdirectory
Merge-request: 2262
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QThreadStorageData::get might be accessed very often. QMap lookup
has proven to be too slow.
We can expect about 20 instances of QThreadStorage in a typical
applications (tested with some KDE applications)
So a QVector is more suited
Note: we now re-use the ids. Which means that if the QThreadStorage
is destroyed before the QThread, and another one is created,
we might get crashes (instead of a warning printed to the console)
Reviewed-by: brad
|
| |/ |
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
The test is inherently dependent on the timing behavior of the test
machine. For now, it seems too difficult to ensure this works
everywhere.
|
| | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
mkspecs/macx-g++40/qplatformdefs.h
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If we made calls on a QDBusConnection that isn't connected, the d
pointer is 0. Ensure we don't crash.
Task-number: QTBUG-6571
Reviewed-by: Bradley T. Hughes
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Update FBO docs to describe how QPainter changes the GL state
(OCI) Fixes problem with clobs being handled as binary
Disable depth testing during the 2D QGLWidget::renderText()
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
CLOB/NCLOB/LONG are actually strings, so treat them as such.
Task-number: QTBUG-4461
Reviewed-by: Justin McPherson
|
| | |\ \ \ |
|
| | |\ \ \ \ |
|
| |\ \ \ \ \ \
| | |_|_|/ / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: (31 commits)
Fixed qstylesheetstyle benchmark for Symbian
Fixed qdiriterator benchmark for Symbian
Fixed events benchmark postEvent function
Fix for QTBUG-4908 SVG transparency rendering problem.
Long informative texts causes messagebox to grow outside of screen area
qreal-ization
qreal-ization
qreal-ization
QS60Style: Remove layouts with mirrored information
Fixed qgraphicsview autotest build for winscw.
Enabled input method update code for all platforms.
(ODBC) Fixes segfault when error string is larger than 256 chars.
Fixed QGraphicsView benchmark for Symbian.
FEP indicator shown in status pane when it should not
Skipped the most memory intensive tests in QByteArray benchmark.
qreal-ization
qreal-ization
QS60Style: Theme graphics for QSlider in 3.1
QS60Style: Groove changes caused build break of S60 3.1
Slow spinbox on N95 when using keys Up/Down
...
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The benchmark ran out of stack for large grids somewhere inside
QWidget::show(). Skipped show cases for large grids in Symbian,
since we cannot increase application stack any further.
Also removed some unnecessary whitespace.
Task-number: QTBUG-6693
Reviewed-by: Janne Anttila
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Deployment was handled similarly to WinCE.
Some whitespace was also removed.
Task-number: QTBUG-6690
Reviewed-by: Janne Anttila
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The postEvent function was causing problems in Symbian because it
couldn't handle multiple iterations of the benchmark.
- Moved event allocation inside QBENCHMARK so that each iteration will
have a fresh event object.
- Added resetting of the PingPong counters inside QBENCHMARK.
- Used QTestEventLoop::instance().exitLoop() instead of
QCoreApplication::quit() to make the cases beyond first
to actually test something meaningful.
- Added a "first time" case to postEvent_data, as the first time the
event loop is used it takes much longer that the subsequent times,
at least in Symbian, so that skewed the results.
Task-number: QTBUG-6688
Reviewed-by: axis
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
QPixmap::copy discarded alpha channel.
This fix also removes usage of member variables CFbsBitGc and
CFbsBitmapDevice. Now those are used only in function scope.
Reviewed-by: Sami Merila
|
| | |\ \ \ \ \
| | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/s60installs/bwins/QtGuiu.def
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
SqlServer can throw custom error messages (via RaiseError) that can be
up to 8000 chars long. Fixed this with a pre-query as to the length of
the error string, then allocating enough space to retrieve the whole
error string at once.
Task-number: QTBUG-6618
Reviewed-by: Derick Hawcroft
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
NokiaX86 compiler doesn't like QCOMPAREs unless the compared pointers
are cast correctly.
Reviewed-by: Janne Anttila
|
| | |_|/ / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If there is properties, we cannot skip the code that substract
the property number from the id
Task-number: QTBUG-5590
Reviewed-by: Brad
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change c4d66e27 made sample buffers on EGL platforms to default
to off, matching desktop GL. This patch fixes the autotest which
was still testing for the old behaviour.
Reviewed-By: TrustMe
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QT-2602
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Before commit 88ecc8c8250505129ccff2660c60412996e2fd85, this case was handled
during the mouse release event, but was responsible for selections being made
twice sometimes. We now check whether a selection actually happened during
the mouse press event. If not, we will try to select again during the mouse
release event. Auto-test included.
Reviewed-by: Thierry
Task-number: QTBUG-6753
|
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| | |\ \ \ \
| | | |_|/ /
| | |/| | | |
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
into 4.6
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Use QWeakPointer to bail out early if a widget is deleted while we are
delivering/propagating a TouchBegin event.
In QGraphicsScene, we need to make sure that we clear the scene's
active touch points for items that are removed from the scene. This
allows us to detect when an item is removed during TouchBegin event
delivery/propagation. Unlike QWidget, propagation continues since we
use a hit-test instead of the item's hierarchy for propagation.
Task-number: QTBUG-6654
Reviewed-by: bnilsen
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
QGrahpicsItem behaves similarly to QWidget; if the TouchUpdate or
TouchEnd event is ignored, then the event sent to the view and scene
will also be ignored.
Reviewed-by: Trust me
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Also add an extensive autotest suite for QProcessEnvironment
Task-number: QTBUG-6701
Reviewed-by: Markus Goetz
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Canonical file paths can begin with slash only on unix platforms.
Reviewed-by: Prasanth
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
QML might pass index that are larger that the method cound.
We must not call QMetaObjectPrivate::originalClone in that case as
this would read invalid memory
Reviewed-by: brad
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Some test very corrected, the low level file descriptor tests mostly
skipped as well as the multiple memory mapping of a file, which resulted
in the file handle not beeign properly released.
Reviewed-by: thartman
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The default style (plastique) used was not available if not included in
the build.
Using now the windows style instead.
Reviewed-by: Maurice
|
| | |_|/ / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Even for DeviceCoordinate mode we can return the raw pixmap if the
graphics item size is untransformed.
Reviewed-by: Bjørn Erik Nilsen
|