summaryrefslogtreecommitdiffstats
path: root/src/s60installs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-222-0/+12
|\ | | | | | | | | Conflicts: src/network/access/qnetworkaccessmanager.cpp
| * Symbian backend for QtMultimedia audioGareth Stockwell2010-02-182-0/+12
| | | | | | | | Task-number: QT-567
* | Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-144-3/+105
|\ \ | |/ | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp
| * Add make stub_sis target, and add webkit stub to qt.ibyShane Kearns2010-02-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | qmake - add targets to wrapper make file make stub_sis createpackage - use -s or --stub to run makesis with the -s argument also copies the file to the right place in epoc32\data\system\installs qt.iby - add qt_stub.sis and qt_webkit_stub.sis Task-number: QTBUG-6570 Reviewed-by: Miikka Heikkinen
| * Update Symbian DEF filesIain2010-02-103-2/+103
| | | | | | | | | | | | | | | | | | | | | | Reserve ordinal numbers in the WINSCW DEF file for EGL exports from QtGui (now added, but marked as ABSENT) Update OpenVG DEF files for EABI and WINSCW Update QtGui DEF file for WINSCW with 2 non-EGL-related exports Reviewed-by: TrustMe
* | Merge remote branch 'origin/4.6' into bearermanagement/integrationAaron McCarthy2010-02-114-18/+50
|\ \ | |/ | | | | | | Conflicts: src/s60installs/s60installs.pro
| * Update Symbian OS def files for 4.6.2Shane Kearns2010-02-082-12/+40
| | | | | | | | Task-number: QTBUG-8024
| * New Symbian signed sqlite3.sis with backup_registration.xmlMiikka Heikkinen2010-02-021-0/+0
| | | | | | | | | | | | | | | | Sqlite3.sis was repackaged with backup_registration.xml to support device backup/restore on Symbian Task-number: QTBUG-7518 Reviewed-by: TrustMe
| * Fixed def files on Symbian.axis2010-02-022-4/+4
| |
| * Deployed QtMultimedia.dll on SymbianGareth Stockwell2010-02-011-0/+4
| | | | | | | | | | Task-number: QT-2813 Reviewed-by: trustme
* | Don't build generic bearer engine on Symbian.Aaron McCarthy2010-02-031-1/+1
| |
* | Merge commit 'origin/4.6' into bearermanagement/integration-4Aaron McCarthy2010-01-2915-1375/+287
|\ \ | |/ | | | | | | | | | | Conflicts: configure src/gui/painting/qpainter.cpp src/s60installs/s60installs.pro
| * Added a selfsigned version of sqlite3.sisMiikka Heikkinen2010-01-271-0/+0
| | | | | | | | Reviewed-by: TrustMe
| * Added Symbian backup & restore support for Qt.sis and fluidlauncher.sis.Miikka Heikkinen2010-01-252-1/+10
| | | | | | | | | | Task-number: QTBUG-7518 Reviewed-by: Janne Koskinen
| * Update symbian def filesShane Kearns2010-01-216-6/+26
| | | | | | | | | | | | | | Commit 5464cee529a26832517607b764e805bef96ea9f1 changes 3 private class symbols. Reviewed-by: Trust Me
| * Generic solution for plugin stub exports for IBY usageMiikka Heikkinen2010-01-202-18/+13
| | | | | | | | | | | | | | | | | | | | Previous s60installs specific fix was flawed in that it failed to generate exports when doing clean build. Replaced that with a more generic solution that exports plugin stubs under \epoc32\data\z always. Task-number: QTBUG-6972 Reviewed-by: Janne Anttila
| * Added absolute path to sqlite3.sis in s60installs.proMiikka Heikkinen2010-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | Relative path was only working when package was created from s60installs directory. Binary installer creation requires package creation to work also from Qt root, so added absolute path to sqlite3.sis. Task-number: QTBUG-7275 Reviewed-by: Janne Anttila
| * Deploy sqlite3.sis instead of sqlite3.dll in SymbianMiikka Heikkinen2010-01-072-4/+3
| | | | | | | | | | Task-number: QTBUG-4879 Reviewed-by: Shane Kearns
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-12-302-1316/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 70b5989bdeea2f73bd950099fc0f0e954550ef54 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-12-30 Janne Koskinen <janne.p.koskinen@digia.com> Reviewed by Simon Hausmann. Upstream Symbian def files from Qt 4.6. These files define the ABI of QtWebKit on Symbian. * symbian/bwins/QtWebKitu.def: Added. * symbian/eabi/QtWebKitu.def: Added.
| * Removed QtWebkit.dll from Qt.sis in Symbian buildsMiikka Heikkinen2009-12-291-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for future removal of Webkit from Qt, Qt.sis no longer contains QtWebkit.dll. All projects that have webkit dependency now automatically also add dependency qtwebkit.sis into their .pkg files. To create qtwebkit.sis, run "make sis" in src\3rdparty\webkit\WebCore directory. Task-number: QTBUG-6841 Reviewed-by: Simon Hausmann Reviewed-by: Janne Koskinen
| * Using qt.iby no longer requires emulator deployment to be doneMiikka Heikkinen2009-12-282-13/+18
| | | | | | | | | | | | | | | | | | Export generated plugin stubs to a known location under epoc32 in all Symbian builds, so that emulator deployment is not the only way to make them available for qt.iby. Task-number: QTBUG-6972 Reviewed-by: Janne Koskinen
| * Fixes to winscw def filesShane Kearns2009-12-211-5/+8
| | | | | | | | Reviewed-by: TrustMe
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-12-163-7/+54
| |\ | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def
| | * def file maintenance.Rohan McGovern2009-12-151-5/+5
| | |
| | * def file maintenance.Rohan McGovern2009-12-151-1/+1
| | |
| | * Fixed compile for S60 (.def file updates).Rohan McGovern2009-12-151-45/+47
| | | | | | | | | | | | | | | More private API changes, and mark QEgl symbols as ABSENT so compilation is not broken when OpenVG is disabled.
| | * Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-141-1/+0
| | |\
| | | * Merge upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-12-093-6/+149
| | | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def
| | * | | OpenVG .def file updates.Rohan McGovern2009-12-142-2/+47
| | | |/ | | |/|
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-12-112-1/+145
| |\ \ \ | | |/ / | | | / | | |/ | |/| Conflicts: src/s60installs/bwins/QtGuiu.def
| | * Updates to QtGui DEF files for WINSCW and EABIIain2009-12-032-17/+26
| | | | | | | | | | | | | | | | | | Changes to private/internal symbols only Reviewed-by: TrustMe
| | * Update QtOpenVG DEF file for EABI, add for WINSCW, on Symbian OSIain2009-12-032-1/+145
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Update QtCore DEF file to remove isSignalConnected() (which is now inline)Iain2009-12-021-1/+1
| | | | | | | | | | | | Reviewed-by: Jason Barron
| * | Def file updatesShane Kearns2009-12-082-17/+26
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Fixed compile for S60.Rohan McGovern2009-12-041-1/+1
| |/ | | | | | | QObjectPrivate::isSignalConnected was inlined, update QtCoreu.def
| * Merge branch '4.6' into mmfphononFrans Englich2009-11-206-8/+40
| |\ | | | | | | | | | | | | Conflicts: demos/qmediaplayer/mediaplayer.cpp
| | * Freeze def files against 4.6.0Shane Kearns2009-11-196-8/+40
| | | | | | | | | | | | Reviewed-By: Trust Me
| * | Keep the same capitalization for Phonon.dll.Frans Englich2009-11-161-1/+1
| |/ | | | | | | Task-number: QTBUG-4735
* | Partially convert Symbian backend into a plugin.Aaron McCarthy2010-01-121-1/+9
| | | | | | | | QNetworkSession functionality not converted yet.
* | Freeze def files against 4.6.0Shane Kearns2009-11-196-8/+40
|/ | | | | Reviewed-By: Trust Me (cherry picked from commit 1f6aa19209a7d22bb15bf0a0afb2d62200c0d3fa)
* Install Qt declarative (if available) and QmlPatterns on S60Martin Jones2009-11-162-0/+6
| | | | Reviewed-by: Warwick Allison
* Fix corelib def files for the new atomics implementationShane Kearns2009-11-132-0/+10
| | | | | | | | | | 4.6.0 has the wrong atomics implementation for symbian, as the team branch was not merged before the freeze. This updates the def files to match the implementation on the team branch so that it can be cherry-picked. Task-number: QTBUG-5752 Reviewed-by: Iain
* Binary compatibility of Symbian ARMv5 and ARMv6 buildsShane Kearns2009-11-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ARMv6 atomics where available Use OS atomics otherwise Integrate ARMV6 atomics to Symbian builds Use compiler defined macros to detect if ARMv6 instructions are available This defines the QT_HAVE_ARMV6 macro, replacing the way it was defined by the Symbian build system previously in qpainting.pri. qatomic_symbian now uses qatomic_arm or qatomic_armv6 automatically Port armv6 atomics to implement generic atomics interface The inline atomics are not inlined when we build for thumb using RVCT. So there is no performance improvement of using the "inline" versions vs a shared version called through a function call. The generic atomics interface is good for binary compatibility, as the same symbols are exported in all versions now. Changed the fallback generic atomics implementation from the unix one to a symbian specific one using RFastLock (identical code to the windows generic atomics, except for RFastLock replaces Win32 CRITICAL_SECTION) Note: GCCE atomics still need porting Tell git to ignore .lst listing files (produced by sbs/abld listing) ARMv6 support for GCCE compiler and fallback implementation using OS When building corelib with GCCE and -march=armv6, QT_HAVE_ARMV6 will be defined. This patch adds copies of the asm functions in GCC syntax. When building for the Symbian emulator, or ARMv5, then Symbian OS atomic functions are used as a fallback - these are more efficient than the unix atomics, and don't require data import (which the ARMv5 atomics use, but the OS loader doesn't support fully) Symbian OS functions are always used for QBasicAtomicInt::ref / deref, because these are faster than the generic function in all cases. They are machine coded for ARMv6, and are used internally by RFastLock. Reviewed-By: axis Reviewed-By: Brad
* Def files frozen for 4.6.0 RCShane Kearns2009-11-1120-361/+21660
| | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
* Rewind def files to betaShane Kearns2009-11-1119-20979/+155
| | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
* Removed unused public Api from QS60StyleAlessandro Portale2009-11-101-2/+2
| | | | | | | | | | | | | | | QS60Style::setStyleProperty() and QS60Style::styleProperty() were intended as generic property setter/getters, but are not needed anymore. Reviewed-by: Sami Merila modified: src/gui/styles/qs60style.cpp modified: src/gui/styles/qs60style.h modified: src/gui/styles/qs60style_p.h modified: src/gui/styles/qs60style_s60.cpp modified: src/gui/styles/qs60style_simulated.cpp modified: src/s60installs/eabi/QtGuiu.def
* Unexported a class that doesn't need to be exported.axis2009-11-042-104/+104
| | | | RevBy: Iain
* def files updateShane Kearns2009-11-038-147/+817
| | | | | | | New def file for XML patterns Some changes in GUI effects API Reviewed-by: Trust Me
* Inclusion of QtOpenVg overwrites all other modules in s60install.proSami Merilä2009-11-031-1/+1
| | | | | | | | The pro-file is missing '+' when it is adding QtOpenVg support for sis file. Task-number: None Reviewed-by: Janne Koskinen
* Force Qt libs to install on phone memory in Symbian.Miikka Heikkinen2009-11-031-12/+12
| | | | | | | | | | | | Starting Qt apps when Qt libs are installed on a memory card takes ages (15-20 seconds), because Symbian recalculates hash of the dll every time it loads it from a non-system drive. Worked around this issue by forcing installation of Qt libs to the C-drive. Task-number: QT-690 Reviewed-by: Janne Koskinen