| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
| |
Clean up the function a little and make sure I don't call
QImage::hasAlphaChannel twice for opaque images.
Reviewed-by: muthu <qt-info@nokia.com>
|
| |
|
|
|
|
|
| |
We don't need to do the conversion using QImage when NoOpaqueDetection
is specified.
Reviewed-by: muthu <qt-info@nokia.com>
|
| |\
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Reverts using composition mode when using DeviceCoordinateMode cache.
Fix linking error
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Going back to always blitting the newly painted areas to the cache (and
not blending it like before). To avoid painting artifacts when the item
is rotated and when it uses DeviceCoordinateMode cache mode, the entire
cache is always repainted in that case.
Task-number: QTBUG-7863
Reviewed-by: trustme
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The #include "moc_qgraphicswidget.cpp" is superfluous and caused these
link errors:
.obj/debug-shared-emb-x86_64/moc_qgraphicswidget.o:(.data.rel.ro+0x0): multiple definition of `QGraphicsWidget::staticMetaObject'
.obj/debug-shared-emb-x86_64/qgraphicswidget.o:(.data.rel.ro+0x0): first defined here
.obj/debug-shared-emb-x86_64/moc_qgraphicswidget.o: In function `QGraphicsWidget::metaObject() const':
Presumably this only happens when you have a stale moc file sitting
around but it's a bug none-the-less.
Reviewed-by: TrustMe
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style cannot draw transparency to UI element border areas
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Due to incorrect initialization of CFbsBitmap, graphic frames (9-part,
or 3-part ones) are drawn with white non-transparent rect below them.
Initialization corrected.
Task-number: QT-3185
Reviewed-by: Janne Anttila
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Changed pkg_prerules to not use default_deployment for vendor ID
Enable armcc version specific compler options for Symbian
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Demos and examples used default_deployment to define vendor ID
pkg rule, which is not what default_deployment should be used for.
As these are supposed to serve as examples for developers, changed
these declarations to use another deployment item.
Reviewed-by: TrustMe
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
VERSION_FLAGS.ARMCC variable is used in symbian.conf to define
supported armcc compiler version flags. Values given to this
variable must be directly usable as ifdef flags in mmp.
QMAKE_CXXFLAGS.<version flag> variables can now be used to add
compiler options to specific compiler versions.
Note that options added via QMAKE_CXXFLAGS.ARMCC flag
will apply to all versions of armcc compiler.
Task-number: QTBUG-8685
Reviewed-by: Iain
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix another off-by-1 error in OpenVG image painting.
|
| | |\ \
| |/ /
|/| | |
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix OpenVG build on non-Symbian platforms.
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Correct documentation for ObjectReplacementCharacter and ReplacementCh.
Fix for submenu placement for QMenus in Symbian.
Symbian event loop priority drop not used in Symbian^4
QMessageBox is smaller than native MessageBox
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Marius Storm-Olsen
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix for submenu placement for QMenus in Symbian.
Symbian event loop priority drop not used in Symbian^4
QMessageBox is smaller than native MessageBox
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-5992
Reviewed-By: Sami Merila
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The priority drop hack used in the Symbian version of Qt's event
dispatcher is not needed from Symbian^4, as the viewsrv panics, which
it was designed to prevent, are disabled. This change disables the
priority drop code when Qt is compiled in a Symbian^4 environment,
using the SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS define as a key.
This will improve system and performance predictability, as app
priorities will be more stable. It also gives a slight performance
boost to app startup in the order of 10ms.
Reviewed-by: Jason Barron
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Messageboxes are smaller than native ones.
This is due to that native ones have a lot of empty space.
To fix this, we define a new custom pixel metrics that is the minimum
height of one text line messagebox (aka AknPopUp) on the native side.
Then we ensure that the QMessageBox is at least of this height.
Additionally we do some minor styling for QMessageBox:
- the corners graphics are now as rounded as on native side
- the font is set to match the native side
- the top margin space is doubled for dialogs, which is rather good
approximation of native side
Task-number: QTBUG-4875
Reviewed-by: Janne Anttila
|
| | | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Off in the vertical direction this time; previously was horizontal.
Task-number: QT-2999
Reviewed-by: Jason Barron
|
| | |_|/
|/| |
| | |
| | | |
Reviewed-by: trustme
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Prevents a useless repaint with QGraphicsItem cache mode.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
No repaint is triggered anymore when setting the cache mode to
DeviceCoordinateMode when already using that mode.
Also added an autotest for checking repaints when setting cache modes.
Task-number: QTBUG-9391
Reviewed-by: ahanssen
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: Fix links in the ActiveQt framework, and also link to the tools.
|
| | | | | |
|
| |\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Sql Autotest cleanup and tweaking.
|
| | |\ \ \
| |/ / /
|/| | | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix ODBC compilation for ODBC versions < 3.5
Unicode fixes for ODBC SQL Driver.
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Calculate period size correctly.
|
| | |\ \ \ \ \
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Calculate period size correctly.
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Calculate period size correctly.
|
| | | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Calculate period size correctly.
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by:Dmytro Poplavskiy
|
| | | | | | |/ / |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-8488
Reviewed-by: Justin McPherson
|
| | |_|_|_|/ /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Better unicode handling detection, plus turn off unicode if FreeTDS,
plus handling of returning strings under non-unicode scenarios.
Task-number: QTBUG-8846
Reviewed-by: Justin McPherson
|
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Stabilize QGraphicsEffect test on X11
Add a children private property needed for QML to support QGraphicsObject
Invalidate the cache of QGraphicsEffect if a child becomes visible.
Fix a crash when reparenting an item in QGraphicsView.
|
| | |\ \ \ \ \
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Stabilize QGraphicsEffect test on X11
Add a children private property needed for QML to support QGraphicsObject
Invalidate the cache of QGraphicsEffect if a child becomes visible.
Fix a crash when reparenting an item in QGraphicsView.
|
| | | | | | | |
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Add a children private property needed for QML to support QGraphicsObject
Invalidate the cache of QGraphicsEffect if a child becomes visible.
Fix a crash when reparenting an item in QGraphicsView.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Commit adds a private property that QML can use to add children for a given
item. This is a custom list that calls a callback which actually reparent
the item instead of just appending in the list (otherwise it will mess up
the state of QGraphicsView). This is needed because childItems() is pretty
useless you get a list but if you append something on it then it adds
that into a copy. Also the children property is the default property
a concept used by QML.
Width and Height private properties has been added in order to support
better the integration with QGraphicsWidget in QML. The actual implementation
is in the private class of QGI and QGraphicsWidget reimplements it to return
the geometry. (In 4.7 QDeclarativeItem reimplements it too).
This change should be harmless everything is private.
Task-number:QT-2757
Reviewed-by:andreas
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The effect might rely on a child to draw itself. So we need to redraw if
a child become visible or invisible.
Task-number:QTBUG-7843
Reviewed-by:janarve
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Before calling addItem we need to invalidate the depth otherwise if
someone call anything relating to sorting when itemChange is called
(because of the scene change for instance) then qt_closestItemFirst
for example can crash because of an invalid state.
Task-number:QTBUG-6932
Reviewed-by:janarve
|
| |\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix error reporting when symbian file copy fails.
QIODevice::read() and QFile::atEnd() performance improvements
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
When a file copy failed on symbian, the file engine error was not set.
Now translates the symbian os error code to set the file engine error.
Reviewed-by: Marius Storm-Olsen
|
| | | |_|/ / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
atEnd improvements, since atEnd is used in published example Qt read
loops. The two main ideas are to push the buffer test forward, which
optimises the normal buffered case, and to cache the file size till you
get to the end, which otherwise has to get the file size every 16K of
data.
read buffer improvements: The ring buffer structure was causing
significant performance overheads. In practice QIODevice has much
simpler requirements on its read buffer, and a linear buffer can be
used instead. This now uses a buffer optimised to QIODevice's use of
it.
QIODevice read function improvements. There are a number of sub-themes
here, which all are aimed at getting the normal buffered path through
the code done as fast as possible. This gives greatest improvements for
small reads, but it is these small reads that have the biggest
problems.
- removing the isSequential test, by setting a pointer to the qint64
to update and using a dummy qint64 target when isSequential, then
writing through the pointer.
- doing the readability check on the first read only, out of the fast
path
- doing the maxSize<0 test after the getchar fast path
- removing the buffer isEmpty test and giving a fast exit test
instead
- moving arithmetic out of the fast path, so "data" and "maxSize"
are now dynamically updating
- for RCVT builds, ARM mode is used for the read functions because
the 64-bit operations are much slower with this compiler in Thumb
mode
There are some other changes to read() which improve clarity:
- bytesToBuffer is now always set to QIODEVICE_BUFFERSIZE. This has
always been the case, its just that the logic was not clear before.
- moreToRead is set to false now in the case where the request was
met by a direct device read. Leaving it true in this case was
pointless, and setting it true in the converse case seems dangerous
because the function might iterate for a very long time, although
it might meet the API semantics better and would be a change in
behavior because the function used to not read more when it claimed
it would.
Reviewed-by: Joao
Reviewed-by: Aleksandar Babic
|
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( aa40cdb9595eb15a68e7be03322f973aa613a8f9 )
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
( aa40cdb9595eb15a68e7be03322f973aa613a8f9 )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-03-21 axis
Reviewed by Simon Hausmann.
Fixed updating the VKB display when inputting into QGraphicsWebView.
https://bugs.webkit.org/show_bug.cgi?id=36292
* Api/qgraphicswebview.cpp:
(QGraphicsWebViewPrivate::_q_updateMicroFocus):
(QGraphicsWebView::setPage):
* Api/qgraphicswebview.h:
WebCore:
[Qt] Support for QT_LIBINFIX in Symbian builds
Patch by Miikka Heikkinen <miikka.heikkinen@digia.com> on 2010-03-19
Reviewed by Simon Hausmann.
Configuring Qt with -qtlibinfix parameter will enable installing
an alternate version of Qt on devices that already have it on ROM.
This patch provides support for infixed builds of Webkit.
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Clarified pkg_prerules usage documentation.
Made it possible to define more than one language using pkg_prerules
Symbian QAudioOutput::suspend() was resetting processedUSecs() to zero
Added Symbian UserEnvironment capability to audioinput example
Compile fix
Changed Symbian pkg files to deploy from under epoc32
Remove internal custom pixel metric enums
Hotfix to const usage in 262e98f9a29385f99cd6f768632264e0b621dc01
Fixed S60 softkey implementation to use popup/modal dialog softkeys.
Fixed 'fullsreen with softkeys' mode not to expand under softkey area.
Fixed left softkey regression caused by 7829fe15 in Symbian.
QS60Style: Housekeeping
Custom pixel metric values cannot be inquired from outside the class
Adding custom pixel metrics requires cleaning and rebuilding of QtGui
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The default_deployment item shouldn't be used to add own rules.
Task-number: QTBUG-9277
Reviewed-by: Janne Anttila
|
