| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/image/qpixmap_raster_symbian.cpp
src/gui/image/qpixmapdatafactory.cpp
src/gui/painting/qgraphicssystem.cpp
src/gui/styles/qs60style.cpp
src/network/bearer/qnetworkconfigmanager_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/bwins/QtOpenVGu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
|
| | |
|
| |
| |
| |
| | |
This reverts commit cf429b48cf144a4f6fa1b7e96ed00f5ce3fe085b.
|
| |
| |
| |
| | |
Reviewed-by: TRUSTME
|
| |
| |
| |
| |
| |
| | |
Hybrid heap exports should not be listed in QtCoreu.def
Reviewed-by: TRUSTME
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Qt on Symbian needs some special capabilities to be able
to work on 32MB GPU. This patch introduces some Symbian
specific functions to QGraphicsSystem
Task-number: QTBUG-17882
Reviewed-by: Laszlo Agocs
|
| |
| |
| |
| |
| |
| | |
Caused by previous merge conflict. Should have made it sequential.
Reviewed-by: TrustMe
|
| |\ |
|
| | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/s60installs/eabi/QtGuiu.def
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When a painter is open on a pixmap's underlying QVolatileImage, it is
better to upload the VGImage content every time the pixmap is drawn
on the screen, in order to enable showing animations that are created
by continously rendering into the same pixmap and keeping the same
painter open.
Task-number: QT-4002
Reviewed-by: Jason Barron
|
| | |\ \
| | | | |
| | | | |
| | | | | |
merge-requests/2584
|
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Because it breaks forward compatibility. We will use the original
fix in 4.8. In 4.7 we just make sure it doesn't crash in
QTextBlock::next().
Reviewed-by: Thiago Macieira
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix build on Symbian
Reviewed-by: Jason Barron
|
| |\ \ \
| | |/ /
| | | /
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QGLPixmapData's fromNativeType() accepts QNativeImageHandleProvider
pointers with type NativeImageHandleProvider from now on, similarly
to OpenVG pixmaps.
Task-number: QTBUG-18209
Reviewed-by: Jani Hautakangas
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The special case of creating a pixmap from RSgImage via a native
handle provider needs extra attention when hibernating: In this case
the hibernating happens as usual, however doing a readback would
produce unwanted results and must be avoided.
Reviewed-by: Jani Hautakangas
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This change currently affects QGLPixmapData on Symbian only. Similarly
to the OpenVG engine, using QVolatileImage allows more efficient
handling of to- and fromSymbianCFbsBitmap, reduces local heap usage,
and improves s60 style performance.
Task-number: QTBUG-15252
Reviewed-by: Jani Hautakangas
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Hot fix for compilation without QGL_USE_TEXTURE_POOL
Initial implementation of GLES2.0 resource pooling
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Keep the implementation in separate
qpixmapdata_poolgl.cpp file until the pooling has
been verified and confirmed to work ok.
Task-number: QTBUG-15253 QTBUG-17850
Reviewed-by: Samuel Rødal
|
| | |
| | |
| | |
| | |
| | | |
Result of sufficient build, remove_freeze freeze cycles to get Qt urel
building cleanly.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Existing code that was used to defer active objects and otherwise alter
their execution time is unnecessary and unused after the round robin
scheduler introduction. So it is being removed here.
Task-number: QTBUG-15019
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
S60 version plugins serve no purpose now that S60 3.x support has
been dropped, so remove them to improve performance.
Task-number: QTBUG-18614
Reviewed-by: Janne Koskinen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Due to removal of QScroller and related classes, QtGui DEF files needed
to be updated.
Additionally, there was some new functionality in QDeclarative that
required updation of QtDeclarative DEF-files.
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Reviewed-by: TRUSTME
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
1. Changed externs to Q_GUI_EXPORTs
2. ABSENTed missing exports from openGL's DEF-file
Reviewed-by: Tomi Vihria
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There will be cases when client will want to disable splitview
automatic view translation, so that keyboard is just brought on top of
the application and no other actions happen. There will be no new
public Qt GUI API to cover the cases (the public API will come from
QML Components), but the implementation is done with new private API.
Task-number: QTBUG-18716
Reviewed-by: Miikka Heikkinen
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
symbian-socket-engine
Conflicts:
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtNetworku.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtNetworku.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust me
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: TRUSTME
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: TRUSTME
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Added new functions to the exports
Reviewed-by: TrustMe
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: TRUSTME
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When QRuntimeGraphicsSystem is asked for its support for static contents
of partial updates it should return the value for the currently running
wrapped graphicssystem. As the getters have not been virtual so far this
could not be implemented.
Additionally the setters have been removed as these values are not
supposed to be set from the outside. Only the graphicssystems itself
knows what it supports. If the default values should be changed the
methods should be overwritten.
Merge-request: 1136
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | |
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/network/access/qhttpnetworkconnectionchannel.cpp
src/network/socket/qlocalsocket.cpp
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtTestu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/s60installs/eabi/QtOpenVGu.def
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Added new functions
Reviewed-by: TrustMe
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Added new functions and absented obsolete functions.
Reviewed-by: TrustMe
|
| |\ \ \ \
| | |/ / /
| |/| / /
| | |/ /
| | | |
| | | |
| | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| | |\ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (27 commits)
AnimatedImage does not change progress value
Fix failing tests
Fix line information for dynamic slots in .qml files
Add missing header include missing from the previous commit
Fix horizontal alignment of QTextDocument-based RTL text
The rotation reported by PinchArea should not be in the range -180..180
Revert to previous lineHeight behavior.
Use the text layout bounds calculated by QLayout.
Fix TextInput key navigation for RTL text
Base empty QML editor horizontal alignment on QApplication::keyboardInputDirection()
Include dynamic parenting use cases in layout mirroring autotests
PinchArea example produced incorrect scaling.
Fix documentation talking about old property LayoutMirror::mirror
Reverse horizontal alignment of QML editors when the layout mirroring is enabled
Update QtDeclarative def files
Removal of text alignment layout direction dependency was missing couple of changes
Fix RTL multiline Text drawing
Remove text alignment of empty QML editors following the layout direction
Add a way to query the reading direction of QML editor text
Make sure horizontal QML editor text aligment always returns the actual alignment
...
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Symbols introduced in Qt Quick 1.1 layout mirroring support.
Task-number: QTBUG-17280
Reviewed-by: Martin Jones
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QNativeImageHandleProvider is a thin interface consisting of get()
and release() functions. Pixmaps constructed with such a provider
will call these functions to acquire and release a native handle,
e.g. a CFbsBitmap or RSgImage pointer in case of Symbian. The behavior
is largely similar to constructing pixmaps via fromSymbianCFbsBitmap
or fromSymbianRSgImage, with the exception of pixmap hibernation:
release() (and subsequently get()) is guaranteed to be called also
in case of hibernation, allowing more fine-grained tracking of
the usage and lifetime of image data.
Task-number: QT-4632
Reviewed-by: Jani Hautakangas
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: TRUSTME
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
By default Symbian devices use fullscreen editing mode. However, in the
latest AVKON releases a partial virtual keyboard is supported. Support
the non-fullscreen editing mode from QCoeFepInputContext.
The non-fullscreen editing mode is only supported for Symbian^3 and
only for graphicsview-based solutions (QGraphicsView, QGraphicsWebView,
QDeclarativeView, ...). When native side indicates that the keyboard
opens, the graphicsview is possibly translated so that the text cursor
position is ensured to be visible. When keyboard closes, the
translation is removed. If the graphicsview contains vertical scrollbar,
the whole view is resized to the area above the keyboard, since
translating it, would move the upper part of the scrollbar out of
screen area.
There is a new exported private API to control when partial vkb is
used.
Task-number: QTBUG-16572
Reviewed-by: axis
Reviewed-by: Mrudul Pendharkar
Reviewed-by: Laszlo Agocs
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: TRUSTME
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/openvg/qvg_symbian.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|