summaryrefslogtreecommitdiffstats
path: root/src/s60installs
Commit message (Collapse)AuthorAgeFilesLines
* Fix installation on S60 5.0Shane Kearns2011-08-041-3/+3
| | | | | | | | | A case change broke the case sensitive comparison of UIDs to check if the package being built was Qt itself - this caused a recursive dependency in the sis file. Task-number: QTBUG-20742 Reviewed-by: Miikka Heikkinen
* Backporting fix for QTBUG-18716Tomi Vihria2011-07-112-0/+2
| | | | | | | | | | | | Provide internal API to avoid automatic translation of input widget 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-20171 Reviewed-by: Honglei Zhang
* The qmlshadersplugin deployment must be scoped same as its buildingMiikka Heikkinen2011-06-301-4/+8
| | | | | | | | | The check "contains(QT_CONFIG, opengl)" is used to include shaders subdir, so the same check needs to be used when defining deployment for shaders in s60installs.pro Task-number: QTBUG-20192 Reviewed-by: TrustMe
* Added qmlshadersplugin to Symbian s60installs.pro-file.Marko Niemelä2011-06-291-1/+4
| | | | | Task-number: QTBUG-18346 Reviewed-by: Sami Merila
* Added qmlshadersplugin to Symbian qt.iby-file.Marko Niemelä2011-06-231-0/+3
| | | | | Task-number: QTBUG-18346 Reviewed-by: Sami Merila
* Def update for gui, openvg, and opengl.Laszlo Agocs2011-06-175-0/+7
|
* Revert "Def update."Laszlo Agocs2011-06-178-24/+0
| | | | This reverts commit cf429b48cf144a4f6fa1b7e96ed00f5ce3fe085b.
* Def update.Laszlo Agocs2011-06-168-0/+24
| | | | Reviewed-by: TRUSTME
* Fix for winscw QtGui.defJani Hautakangas2011-06-021-7/+7
| | | | Reviewed-by: TRUSTME
* Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-252-24/+24
| | | | | | | | The patch applies everything from the original, except for the filename case changes in LIBS which are handled differently based on the auto-detected is_using_gnupoc CONFIG value. Reviewed-by: Laszlo Agocs
* Revert "Fixing Linux compatibility issues for Symbian"Laszlo Agocs2011-05-252-24/+24
| | | | | | | | | | Changing the library names to lowercase breaks 5.0-based Linux builds. It will be investigated if it is possible to change the SDKs instead. If not, the patch will have to be extended to use the original names for 5.0 and the lowercased ones otherwise. This reverts commit 5933d4e4fb8b48ebed641e7f6b1d032df253df30.
* Absenting function in winscw def files.Laszlo Agocs2011-05-2011-215/+215
|
* Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-182-24/+24
| | | | Reviewed-by: Laszlo Agocs
* Fix QtCoreu.def file errorJani Hautakangas2011-05-101-13/+0
| | | | | | Hybrid heap exports should not be listed in QtCoreu.def Reviewed-by: TRUSTME
* Introduce platform extension to QGraphicsSystemJani Hautakangas2011-05-1016-5/+438
| | | | | | | | | 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
* Fix Symbian/WinsCW build breakSami Merila2011-05-101-0/+1
| | | | | | | A new exported method qt_draw_decoration_for_glyphs was recently added to the QtGui, but DEF file was only adjusted for ARM. Reviewed-by: Tomi Vihria
* Fix ordinal number conflictJiang Jiang2011-05-041-1/+1
| | | | | | Caused by previous merge conflict. Should have made it sequential. Reviewed-by: TrustMe
* Fix merge conflictJiang Jiang2011-04-292-0/+2
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-04-281-1/+3
| |\ | | | | | | | | | | | | Conflicts: src/s60installs/eabi/QtGuiu.def
| * | Upload VGImage data when drawing pixmaps that are being painted into.Laszlo Agocs2011-04-272-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Revert symbol addition in b033bb9Jiang Jiang2011-04-291-1/+0
| |/ |/| | | | | | | | | | | | | 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
* | Add new exported symbol to QtGuiu.defEskil Abrahamsen Blomfeldt2011-04-261-0/+2
|/ | | | | | Fix build on Symbian Reviewed-by: Jason Barron
* Take phonon backend back in qt.ibyGuoqing Zhang2011-04-051-5/+2
| | | | | Task-number: Reviewed-by: Miikka Heikkinen
* Remove obsolete files from qt.ibyMiikka Heikkinen2011-04-041-13/+0
| | | | | | | | | | | | - qaudio.dll is no longer built separately, it is static part of QtMultimedia.dll - s60main resources are no longer needed or generated - Webkit files are installed via separate IBY Task-number: QT-4839 Reviewed-by: Guoqing Zhang
* Merge commit 'refs/merge-requests/2584' of gitorious.org:qt/qt into ↵Sami Merila2011-03-292-0/+8
|\ | | | | | | merge-requests/2584
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-212-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-191-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add flag for forcibly propagating backing store alpha to framebuffer Fixed unmatched quotes in s60installs.pro
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-152-0/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-102-0/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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 ...
| | * | | | Update QtDeclarative def filesJoona Petrell2011-03-042-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbols introduced in Qt Quick 1.1 layout mirroring support. Task-number: QTBUG-17280 Reviewed-by: Martin Jones
* | | | | | Native image handle provider support in QGLPixmapDataLaszlo Agocs2011-03-242-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLPixmapData's fromNativeType() accepts QNativeImageHandleProvider pointers with type NativeImageHandleProvider from now on, similarly to OpenVG pixmaps. Task-number: QTBUG-18209 Reviewed-by: Jani Hautakangas
* | | | | | Fix an issue with VGImage readback in openvg.Laszlo Agocs2011-03-242-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | QSysInfo support for next generation Symbian devices.Miikka Heikkinen2011-03-241-1/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new QSysInfo::S60Version enum value SV_S60_5_3 is introduced. QSysInfo::symbianVersion still returns SV_SF_3 for the new platform. The official name of the platform is still pending, so documentation will be updated later. Task-number: QT-4593 Reviewed-by: Sami Merila
* | | | | Change the pooled QGLPixmapData to be backed by QVolatileImage.Laszlo Agocs2011-03-212-0/+2
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Fixed unmatched quotes in s60installs.proGareth Stockwell2011-03-181-1/+1
| |_|/ |/| | | | | | | | Reviewed-by: Miikka Heikkinen
* | | Initial implementation of GLES2.0 resource poolingJani Hautakangas2011-03-152-0/+13
|/ / | | | | | | | | | | | | | | | | 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
* | Added native image handle provider support in pixmaps on openvg.Laszlo Agocs2011-03-082-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Correcting incorrect ordinal introduced by the split view changes.Laszlo Agocs2011-03-081-1/+1
| | | | | | | | Reviewed-by: TRUSTME
* | Support partial input modeSami Merila2011-03-082-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Updated def files with new QVGPixmapData function.Laszlo Agocs2011-03-072-0/+2
| | | | | | | | Reviewed-by: TRUSTME
* | Removing extra tabs from def file.Laszlo Agocs2011-03-011-1/+1
| | | | | | | | Reviewed-by: TRUSTME
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-03-018-192/+376
|\ \ | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-282-46/+46
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix FolderListModel test - set folder to one containing files. Drag over bounds errors when ListView has variable height content FolderListModel emitted incorrect rowsRemoved range causing crash. fix/improve docs for new QtQuick 1.1 attributes Fix test instability. Document BorderImage::asynchronous Ensure layout is updated when section property changes. QDeclarativeDebug: Export needed symbols on Symbian Add a 'CursorPosition' parameter to TextInput.positionAt(). Fix qmlviewer compilation on old Symbian platforms
| | * QDeclarativeDebug: Export needed symbols on SymbianKai Koehne2011-02-242-46/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | Allow applications to link against the QDeclarativeDebugService API. This is needed for on-device debugging of QML. (The removal of the symbols was a regression in 4.7.2). Task-number: QTBUG-17503 Reviewed-by: Tom Sutcliffe
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-262-0/+15
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update QtOpenGL def files Fix extern usage in qpixmapdata_gl.cpp Fix for loading QPixmaps from file in GL graphics system Fix code style in qgl_symbian.cpp QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system. Use the 'convertInPlace' versions of QImage in QGLPixmapData load. Recreate GL surface when native window is resized on Symbian
| * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-221-22/+1
| |\ \ | | | | | | | | | | | | | | | | Conflicts: tools/qml/qml.pri
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-181-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Changed the localized vendor name for Qt SIS packages to "Nokia"
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-171-17/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove sqlite3.sis from qt.sis.
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-041-4/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed wrong casing of a Symbian library. Fixed wrong static library extension on Symbian. Fixed library casing. Remove dependencies to pre-Symbian3 platforms from Symbian3 packages Fix qt.sis platform dependencies for Symbian^3 builds. Fix few QFileDialog static method issues in Symbian^3 Make emulator deployment depend on post linking in symbian-sbsv2.
| * | | | | | Update QtGui def filesJoona Petrell2011-02-222-0/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones