summaryrefslogtreecommitdiffstats
path: root/src/s60installs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-285-3/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * 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
* | 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.
| * 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
* | 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
| * Fixed unmatched quotes in s60installs.proGareth Stockwell2011-03-181-1/+1
| | | | | | | | Reviewed-by: Miikka Heikkinen
* | 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
| * 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
* | 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
* | 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
| * | | | | Update QDeclarative DEF files for SymbianKalle Juhani Lehtonen2011-02-022-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Jones
| * | | | | Froze two more symbols and fixed compilation error (QtQuick11).juhvu2011-02-022-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Jones
| * | | | | Froze Symbian def files for QtQuick11.juhvu2011-02-018-84/+246
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Jones
* | | | | | Add internal function for releasing cached GPU resources.Jani Hautakangas2011-03-012-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17849 Reviewed-by: Samuel Rødal
* | | | | | Changed QPixmap VG backend to use CFbsBitmap on Symbian.Laszlo Agocs2011-02-284-0/+66
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similarly to QS60PixmapData, that is used on raster, QVGPixmapData is also backed by a CFbsBitmap from now on (at least when it makes sense to do so). This allows copy-less bitmap handle duplication in from- and toSymbianCFbsBitmap() in case of certain image formats, reduces local heap usage and improves performance with the s60 style due to a reduced number of pixel data copies. Task-number: QT-2505 Reviewed-by: Jason Barron Reviewed-by: Jani Hautakangas
* | | | | Update QtOpenGL def filesJani Hautakangas2011-02-252-0/+15
| |_|_|/ |/| | | | | | | | | | | Reviewed-by: TRUSTME
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Eckhart Koppen2011-02-171-17/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Remove sqlite3.sis from qt.sis.Miikka Heikkinen2011-02-171-17/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Nokia Content Signing doesn't like embedded sis packages, so remove the embedded sqlite3.sis from qt.sis. It must now be installed separately just like Open C packages. Task-number: QTBUG-17399 Reviewed-by: axis
* | | Changed the localized vendor name for Qt SIS packages to "Nokia"Eckhart Koppen2011-02-171-1/+1
|/ / | | | | | | | | | | | | | | The previously used name "Nokia, Qt" was not usable for Nokia Content Signing, which only allows "Nokia" as the visible vendor name. The unique vendor ID remains as "Nokia, Qt" Reviewed-by: TrustMe
* | Remove dependencies to pre-Symbian3 platforms from Symbian3 packagesMiikka Heikkinen2011-02-031-7/+1
| | | | | | | | | | | | | | | | | | | | Qt applications built against Symbian3 SDK will not run on older devices, so remove the platform dependency to those devices so that the user will get a proper warning if he tries to install incompatible software to an older device. Task-number: QTBUG-17187 Reviewed-by: Janne Koskinen
* | Fix qt.sis platform dependencies for Symbian^3 builds.Miikka Heikkinen2011-02-021-5/+7
|/ | | | | | | | Symbian^3 build of qt.sis is not compatible with pre-Symbian^3 devices, so remove the platform dependencies to said devices. Task-number: QTBUG-17150 Reviewed-by: Janne Koskinen
* Fix corelib def files.Miikka Heikkinen2011-01-122-0/+2
| | | | | | | Added symbianCommandLine function to corelib def files. Task-number: QTBUG-15987 Reviewed-by: TrustMe
* Remove sqlite3_selfsigned.sis as it is no longer usable or needed.Miikka Heikkinen2011-01-112-2/+1
| | | | | | | | | | | | Selfsigned qt.sis no longer installs on top of sqlite3_selfsigned.sis as patching embedded sises and dependencies was removed from patch_capabilities.pl script. However, since the regular sqlite3.sis is nowadays signed for all three Symbian manufacturers that Qt supports, there is no more need to have a self-signed sqlite3.sis in the first place, so it is removed to reduce confusion. Task-number: QTBUG-16576 Reviewed-by: axis
* Remove support for automatic tactile feedback from QS60StyleSami Merila2010-12-162-11/+0
| | | | | | | | | | | | | | | Currently QS60Style loads automatically a plugin to support tactile feedback for styled applications. However, there is no control over this, so applications cannot remove the automatic support, if they'd like to use Mobility APIs to control the feedback themselves. In order to avoid this, remove tactile feedback plugin from style. Lets see if we can later put this back with optional enable/disable flag. Task-number: QTBUG-16151 Reviewed-by: Miikka Heikkinen
* Fixed several compile and deployment issues in the mmf phonon plugin.axis2010-12-141-1/+1
| | | | RevBy: Trust me
* Update QtGui bwins def file for QTBUG-15615Joona Petrell2010-12-091-2/+4
|
* Merge qtsoftware:qt/qt.git#4.7 into qtsoftware:qt/qt-qml.git#4.7Joona Petrell2010-12-091-3/+5
|\ | | | | | | | | Conflicts: src/s60installs/eabi/QtGuiu.def
| * Update .def files after 783a278f243c6411f5f32d11f2165b9eed9b6f8cTor Arne Vestbø2010-12-081-2/+4
| | | | | | | | Based on patch from CI system
* | Update QtGui def filesJoona Petrell2010-12-072-0/+2
|/ | | | Task-number: QTBUG-15815
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-241-5/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (28 commits) Fixed tst_qwidget::winIdChangeEvent Use parent class function to generate Makefile headers in Symbian Fix spaces Fix QPixmap::fromImage() in the OpenVG pixmap backend. Native color dialog on symbian Fix non-stroked filled paths in OpenVG paint engine. Fix symbian-mmp.conf include path Fix a build break when namespace is defined Fixed namespace issues related to epocroot.cpp Corrected ASCII comparison and removed extra braces Add symbian scope for qfiledialog_symbian.cpp Resolve EPOCROOT in qt.conf using same logic as in .pro Make epocroot resolving compatible with more build environments Fix for QtOpenGL RVCT4 compilation error Removed extra cpp and done changes based on comments Correct flags for Symbian file dialogs Fix for WServ 64 crash on Symbian. Use include(original mkspec) instead of copying of mkspec to default Fixed code style of d92cbfc5, reported by git push. Switched qdesktopservices to use SchemeHandler for Symbian^3 and later. ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-241-5/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (27 commits) Use parent class function to generate Makefile headers in Symbian Fix spaces Fix QPixmap::fromImage() in the OpenVG pixmap backend. Native color dialog on symbian Fix non-stroked filled paths in OpenVG paint engine. Fix symbian-mmp.conf include path Fix a build break when namespace is defined Fixed namespace issues related to epocroot.cpp Corrected ASCII comparison and removed extra braces Add symbian scope for qfiledialog_symbian.cpp Resolve EPOCROOT in qt.conf using same logic as in .pro Make epocroot resolving compatible with more build environments Fix for QtOpenGL RVCT4 compilation error Removed extra cpp and done changes based on comments Correct flags for Symbian file dialogs Fix for WServ 64 crash on Symbian. Use include(original mkspec) instead of copying of mkspec to default Fixed code style of d92cbfc5, reported by git push. Switched qdesktopservices to use SchemeHandler for Symbian^3 and later. Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp. ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-191-5/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits) Fixed handling of QInputMethodEvents with nonzero replacementLength. Fixed namespace issues related to epocroot.cpp Corrected ASCII comparison and removed extra braces Add symbian scope for qfiledialog_symbian.cpp Resolve EPOCROOT in qt.conf using same logic as in .pro Make epocroot resolving compatible with more build environments Fix for QtOpenGL RVCT4 compilation error Removed extra cpp and done changes based on comments Correct flags for Symbian file dialogs Fix for WServ 64 crash on Symbian. Use include(original mkspec) instead of copying of mkspec to default Fixed code style of d92cbfc5, reported by git push. Switched qdesktopservices to use SchemeHandler for Symbian^3 and later. Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp. Documented usage of dialogs on Symbian Native file dialog on Symbian^3 Add Location as self signable capability in patch_capabilities.pl Localize .loc and .pkg content based on TRANSLATIONS Bump Qt version to 4.7.2. SSL: Fix for systemCaCertificates being called first on symbian ...
| | | * Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-182-1/+4
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| | | * | Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-121-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If developer specifies "CONFIG += localize_deployment" in .pro file, the generated .loc and .pkg will now use translatable strings from .ts files defined in TRANSLATIONS. The .ts files must have an underscore and Qt language code at the end of the filename body to be compatible with deployment localization. E.g. myapp_en.ts. Running lupdate will generate these entries into .ts files: - Application short caption - Application long caption - Package name - Smart installer package name Task-number: QTBUG-13917 Reviewed-by: Oswald Buddenhagen Reviewed-by: Janne Anttila Reviewed-by: axis