summaryrefslogtreecommitdiffstats
path: root/src/s60installs
Commit message (Collapse)AuthorAgeFilesLines
* Eabi DEF file sync between Qt 4.7 and 4.8mread2011-07-217-72/+80
| | | | | | | | | New functions have been added to both Qt 4.7 and 4.8, but they have ended up at different ordinal positions in the DEF files. This change corrects that so that a function in 4.7 will be at the same position in 4.8. Reviewed-by: Honglei Zhang
* Winscw DEF file sync between Qt 4.7 and 4.8mread2011-07-217-370/+380
| | | | | | | | | The Qt 4.7 def files have had some new exports added over time. These have also been added to the Qt 4.8 def files, but at different locations. Cases where these are not just ABSENT exports are now synchronised for winscw. Reviewed-by: Honglei Zhang
* Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-07-041-4/+8
|\ | | | | | | | | | | | | Conflicts: doc/src/external-resources.qdoc src/gui/text/qtextlayout.cpp src/opengl/qwindowsurface_gl.cpp
| * 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
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-07-041-10/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fixing winscw def file broken by recent merge runonphone: Change the upload option to allow uploading any file runonphone: Include the manufacturer name in the friendly name on OS X runonphone: Fix usb device enumeration on Mac OS X
| * | Fixing winscw def file broken by recent mergemread2011-06-271-10/+8
| | | | | | | | | | | | | | | | | | | | | QtGui's def file had duplicated lines and a gap in the ordinal sequence. Reviewed-by: Shane Kearns
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-011-7/+10
|\ \ \ | |/ / |/| / | |/ | | Conflicts: src/s60installs/s60installs.pro
| * Added qmlshadersplugin to Symbian s60installs.pro-file.Marko Niemelä2011-06-291-1/+4
| | | | | | | | | | Task-number: QTBUG-18346 Reviewed-by: Sami Merila
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-246-6/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * 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
* | DEF file updates for Symbianmread2011-06-158-137/+248
| | | | | | | | | | Result of sufficient build, remove_freeze freeze cycles to get Qt urel building cleanly.
* | Merge remote branch 'upstream/4.8' into qt-4.8-from-4.7Toby Tomkins2011-06-087-39/+22
|\ \ | | | | | | | | | | | | Conflicts: src/gui/styles/qs60style.cpp
| * | Move qts60plugindeployment rule to correct scopeMiikka Heikkinen2011-06-061-2/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-18614 Reviewed-by: TrustMe
| * | Removing unused code after introduction of round robin schedulermread2011-06-014-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Fixed def files for WINSCWTomi Vihria2011-06-012-10/+25
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Fixed def files for ARMV5Tomi Vihria2011-05-312-9/+23
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Remove s60 plugin dll from the iby file too.Laszlo Agocs2011-05-201-4/+0
| | | | | | | | | | | | Reviewed-by: TRUSTME
| * | Remove S60 version pluginsMiikka Heikkinen2011-05-203-16/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Fix QtDeclarative def file for winscw.Laszlo Agocs2011-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | A symbol became absent for some reason, which broke the building of the declarativeobserver plug-in. The ABSENT is now removed. Reviewed-by: TRUSTME
* | | Merge branch '4.7' into qt-4.8-from-4.7Liang Qi2011-06-061-0/+4
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_ft.cpp src/s60installs/bwins/QtGuiu.def
| * | 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.
* | | Merge branch '4.8' into qt-4.8-from-4.7Liang Qi2011-05-275-11/+120
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtOpenGLu.def
| * | | Un-absented QML debugger functionv4.8.0-tp1Eckhart Koppen2011-05-221-1/+1
| | | |
| * | | Updating DEF files for SymbianEckhart Koppen2011-05-224-16/+45
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-247-828/+778
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_ft.cpp src/gui/text/qtextlayout.cpp src/plugins/phonon/mmf/mmf.pro src/plugins/s60/5_0/5_0.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtMultimediau.def src/s60installs/bwins/QtNetworku.def src/s60installs/bwins/QtScriptu.def src/s60installs/bwins/QtSqlu.def src/s60installs/bwins/QtTestu.def src/s60installs/bwins/QtXmlPatternsu.def src/s60installs/bwins/QtXmlu.def src/s60installs/bwins/phononu.def src/s60installs/s60installs.pro tests/auto/qcssparser/qcssparser.pro tests/auto/qtextlayout/tst_qtextlayout.cpp Changes in qtextlayout.cpp and tst_qtextlayout.cpp and qfontengine_ft.cpp are not merged because they will have other fixes in 4.8
| * 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
* | Update Symbian DEF-filesSami Merila2011-05-184-1489/+1183
| | | | | | | | | | | | | | | | | | | | 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
* | Freezing the QtCore defs again for 4.8.Laszlo Agocs2011-05-162-139/+153
| |
* | Fix QtOpenGL def file for armv5.Laszlo Agocs2011-05-121-0/+14
| | | | | | | | Reviewed-by: TRUSTME
* | Symbian build failure for Armv5Sami Merila2011-05-121-7/+7
| | | | | | | | | | | | | | 1. Changed externs to Q_GUI_EXPORTs 2. ABSENTed missing exports from openGL's DEF-file Reviewed-by: Tomi Vihria
* | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-05-116-55/+528
|\ \ | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * | update def filesShane Kearns2011-05-106-51/+526
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Provide internal API to avoid automatic translation of input widgetSami Merila2011-05-092-0/+2
|/ / | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-networkShane Kearns2011-04-1224-312/+1691
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def
| * \ Merge branch 'master' of scm.dev.troll.no:qt/qt-earth-team into ↵Shane Kearns2011-04-1127-931/+2728
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v0.12 at 2024-11-12 13:50:03 (GMT)