summaryrefslogtreecommitdiffstats
path: root/src/s60installs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Martin Jones2009-11-276-8/+40
|\ | | | | | | into kinetic-declarativeui
| * Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-276-8/+40
| |\ | | | | | | | | | kinetic-declarativeui
| | * Freeze def files against 4.6.0Shane Kearns2009-11-196-8/+40
| | | | | | | | | | | | | | | Reviewed-By: Trust Me (cherry picked from commit 1f6aa19209a7d22bb15bf0a0afb2d62200c0d3fa)
* | | Symbian fixes.Martin Jones2009-11-271-4/+0
|/ /
* | Remove duplicateWarwick Allison2009-11-191-4/+0
| |
* | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-193-4/+18
|\ \ | |/ | | | | | | | | | | kinetic-declarativeui Conflicts: src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
| * 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
* | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-1220-20703/+21178
|\ \ | |/ | | | | kinetic-declarativeui
| * 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
* | Merge remote branch 'qt/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-11-111-2/+2
|\ \ | |/
| * 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
* | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-099-264/+934
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/gui/graphicsview/qgraphicsview.cpp src/s60installs/s60installs.pro tools/configure/configureapp.cpp tools/qdoc3/node.h
| * 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
* | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-043-9/+39
|\ \ | |/ | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem_p.h
| * Bad line ending in cabbff076f40eeeb56beb53220a40f124a2e0215Shane Kearns2009-10-281-1/+1
| | | | | | | | Reviewed-by: TrustMe
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Shane Kearns2009-10-281-0/+4
| |\
| | * Enable QtXmlPatterns module in qt package and assign an UID for it.Liang QI2009-10-281-0/+4
| | | | | | | | | | | | | | | | | | | | | Enable QtXmlPatterns module in qt package and assign an UID for it. RevBy: Miikka Heikkinen RevBy: Jason Barron
| * | Change deployment of SQLite to check for stub SIS fileShane Kearns2009-10-281-2/+2
| |/ | | | | | | | | | | | | | | This is less wrong than searching for a file name on specific drives. Correct solution is to use an embedded SIS file dependency, for that we need to get a symbian-signed sis file from the symbian OS team. Reviewed-by: Miikka Heikkinen
| * Update def files after Gesture API and Text Engine changesShane Kearns2009-10-272-7/+33
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2009-10-2913-9/+20579
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/script/api/qscriptengine.cpp src/script/api/qscriptprogram.cpp src/script/api/qscriptprogram.h src/script/api/qscriptprogram_p.h tests/auto/qscriptengine/tst_qscriptengine.cpp tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp tools/qdoc3/test/qt-inc.qdocconf
| * Small updates to WINSCW DEF filesIain2009-10-237-34/+34
| | | | | | | | | | | | | | Looks like the originals may have had some extra exports from udeb in them Reviewed-by: TrustMe
| * *Experimental* WINSCW DEF files for Qt, except WebKitIain2009-10-2311-0/+20308
| | | | | | | | | | | | Note: No autotest exports, no EGL exports from QtGui Reviewed-by: Jason Barron
| * OpenVG EABI DEF fileIain2009-10-231-0/+232
| | | | | | | | Reviewed-by: TrustMe
| * QtGui def file updateShane Kearns2009-10-221-0/+2
| | | | | | | | Two new APIs in QDesktopWidget
| * Fix def file error for qtcoreShane Kearns2009-10-221-2/+0
| | | | | | | | | | | | Problem caused by freezing with wrong openC version in environment Reviewed-by: TrustMe
| * update QtGui def fileShane Kearns2009-10-221-1/+1
| | | | | | | | | | | | | | One private export has been changed from non-const to const pointer parameter Reviewed-by: TrustMe
| * Update 4.6 def filesShane Kearns2009-10-222-8/+38
| | | | | | | | Reviewed-by: TrustMe
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-256-12/+55
|\ \ | |/ | | | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/cppcodemarker.cpp
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Iain2009-10-214-36/+34
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtMultimediau.def src/s60installs/eabi/QtNetworku.def
| | * Use premultiplied alpha pixel format in SymbianShane Kearns2009-10-206-10/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | Gives better performance in the raster paint engine. For Symbian 9.3 onwards, this can also be used as the native pixmap format. For 9.2, conversion is required. Reviewed-by: Sami Merila Reviewed-by: Jani Hautakangas
| * | Update EABI DEF files for Symbian OSIain2009-10-205-10/+55
| |/ | | | | | | Reviewed-by: TrustMe
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-1913-20763/+18752
|\ \ | |/ | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/s60installs/qt.iby util/qlalr/cppgenerator.cpp
| * Update IBY file to contain all Qt modules, inc. phonon, multimedia, sqlIain2009-10-141-0/+8
| | | | | | | | Reviewed-by: Janne Koskinen
| * *Completely new* EABI DEF files for Symbian OSIain2009-10-1311-20796/+18739
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes: - refrozen from scratch without any of the autotest exports (To spell it out: there is no BC between anything built against these DEF files, and anything built with previous versions of the DEF files) - no autotest exports in this set, so no good for autotests - it is very likely that the DEF files will be reworked again before release, meaning that anything built against these ones won't be BC with the 4.6.0 final release (so don't expect your apps built against the beta to work against the final release) - finally added a DEF file for WebKit Reviewed-by: TrustMe Conflicts: src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtScriptu.def src/s60installs/eabi/phononu.def
| * Conservative fix for link error with ARM RVCT compiler on symbian sbsv2Shane Kearns2009-10-081-10/+10
| | | | | | | | | | | | | | | | | | | | Not exporting the whole class prevents the capabilities example from linking, because the vtable is not exported. However windows builds don't support export of templated class, and export the vtable implicitly when there is an exported member function. Task-number: QTBUG-4593 Reviewed-by: Thierry Bastian
| * Updates to EABI DEF files for Symbian OSIain2009-10-072-2/+37
| | | | | | | | Reviewed-by: TrustMe
| * Revert "Fix linker error with Symbian/ARM RVCT ABIv2 toolchain"Shane Kearns2009-10-071-10/+10
| | | | | | | | | | This reverts commit 342fcb287b09d016d482e25482ddd1b36e2983a3. Didn't work on all compilers
| * Prevented deployment of QtScript when not compiling that module.axis2009-10-071-1/+4
| | | | | | | | RevBy: Miikka Heikkinen
| * Fix linker error with Symbian/ARM RVCT ABIv2 toolchainShane Kearns2009-10-071-10/+10
| | | | | | | | | | | | | | | | | | | | Not exporting the whole class prevents the capabilities example from linking, because the vtable is not exported. Changing from member exports to exporting the class also fixes the GCC 3.4.x compiler error. Task-number: QTBUG-4593 Reviewed-by: Thiago
* | Symbian build fixesMartin Jones2009-10-162-0/+10
|/
* Update EABI DEF files for Symbian OSIain2009-10-065-40/+157
| | | | Reviewed-by: TrustMe
* Corrected Qt logo colors.Alessandro Portale2009-10-061-7/+7
| | | | | | | | Replaced the poisonous green by the 'official' one. Took the RGB values from the logos availiable at: http://qt.nokia.com/about/logos-for-download Reviewed-By: TrustMe
* Update self-signed certificate for Symbian, since the old one expiredIain2009-10-051-8/+10
| | | | | | | | | New certificate for using for self-signing. Updated some organisational details, gave this one a 10 year validity rather than a 1 year validity. Same private key as before. Reviewed-by: axis
* Changed Qt package name in pkg and generated sis files for Symbian.Janne Anttila2009-10-051-6/+6
| | | | | | | | | It was decided on weekly telco that Symbian pkg and sis files can use plain Qt name, since it is already clear that user is installing "Qt for Symbian" version of Qt. Task-number: QT-772 Reviewed-by: Miikka Heikkinen
generated by cgit v0.12 at 2024-10-18 04:37:56 (GMT)