summaryrefslogtreecommitdiffstats
path: root/src/s60installs
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Demos and applications have a nice Qt logo when installed on SymbianEspen Riskedal2009-10-021-0/+17
| | | | | | | | | | Added a line to the symbianpkgrules.pri files which includes an ICON if the TARGET.UID3 is defined. We should fix the application_icon.prf to handle ICON without UID3 situations more gracefully, but for now I reordered existing UID3s to be specified before the symbianpkgrules.pri includes. Reviewed-by: Aleksandar Babic
* Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-291-0/+5
|\
| * make sure QtWebKit and QtScript are included in the .sis fileEspen Riskedal2009-09-291-0/+5
| | | | | | | | | | Task-number: QTBUG-4613 Reviewed-by: Aleksandar Babic
* | Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-299-142/+262
|\ \ | |/
| * Move selfsigned cert & key out of root directoryShane Kearns2009-09-252-0/+31
| | | | | | | | | | | | | | | | Moved the certificate/key to the src/s60installs path. Updated createpackage.pl to look in this new location. Task-number: QTBUG-4553 Reviewed-by: axis
| * Latest update to Symbian EABI DEF filesIain2009-09-247-142/+231
| | | | | | | | | | | | | | | | | | | | | | | | A mix of updates caused by code changes, and marking a number of accidentially introduced exports as ABSENT. The extra exports came from freezing using abld on S60 3.2, as it seems that the suppression of --export_all_vtbl doesn't work in abld at the moment (needs investigating) Note that DEF files are still off by default in src/qbase.pri, so this doesn't affect anything unless you enable them. Reviewed-by: TrustMe
* | Fix merge conflict: the file was renamed.Frans Englich2009-09-242-99/+7
| |
* | Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-2311-0/+21004
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/embedded/fluidlauncher/config_s60/config.xml demos/embedded/fluidlauncher/fluidlauncher.pro src/corelib/io/io.pri src/gui/kernel/qapplication_s60.cpp src/gui/kernel/qwidget_s60.cpp src/s60installs/qt_libs.pro
| * Update def filesShane Kearns2009-09-178-12/+749
| | | | | | | | | | | | | | DEF files for ARMv5 UREL, that include the autotest exports. Note that Q_AUTOTEST_EXPORT is only on by default in internal builds Reviewed-by: Iain
| * Remove (out-of-date) DEF files for Symbian winscw build.Iain2009-09-109-19218/+0
| | | | | | | | | | | | | | | | | | | | These hadn't been updated since they were frozen against Tower (or a build close to the one used for Tower) so they're out of date and therefore useless. They'll reappear when we have a DEF file strategy. RevBy: Jason Barron
| * Install only the required S60 SDK version specific plugin to the HW.Janne Anttila2009-08-311-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake has been lately expanded with pkg_prerules / pkg_postrules support which make it possible to customize .pkg file content via pro file. In addition we have got template package file support which takes care of expanding TARGET and PLATFORM variables from .pkg files before creating .sis file. With help of these features and since .pkg format supports conditional install statements, we can now install only the S60 version specific plugin to each HW. This saves disk usage a bit. Task-number: 248061 Reviewed-by: Miikka Heikkinen
| * Trivial change to comment.Janne Anttila2009-08-311-0/+1
| | | | | | | | Reviewed-by: TrustMe
| * Removed hard-coded sqlite3 deployment statement - used PKG conditions.Janne Anttila2009-08-311-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change Qt did not install to device which had sqlite3 already in ROM. Since we now install the sqlite3 only if it is not on any drive, the installation works also with preinstalled sqlite. Even better appraoch would be to use embedded SIS file for sqlite, since that would allow sqlite3 upgrade without upgrading the whole Qt. However we yet don't have such SIS, but once we get one from Symbian this needs to be further changed. Task-number: 258858 Reviewed-by: Miikka Heikkinen
| * Various small fixes and cleanups for symbian qmake generator.Janne Anttila2009-08-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The included fixes / cleanups: - QtLibs PKG filename changed - Component name in Qt libs pkg changed to "Qt for S60" * Done in order to make SISX upgrade possible after pre-release. - Removed passing of 'fixedTarget' member variable as an argument - Removed whitespaces from generated file names - Fixed 'make sisx' calling syntax when custom makefile name used - Fixed MAKEFILE variable content in generated makefiles - Changed names of environment variables used by 'make sisx' * Nee variables have 'QT_SISX_' prefix Reviewed-By: Miikka Heikkinen
| * Update QtCore and QtGui EABI DEF files with recent symbol changesIain2009-08-242-20/+241
| | | | | | | | Reviewed-by: Jason Barron
| * Merge commit 'origin/master' into symbolVisibilityIain2009-08-211-1/+0
| |\
| | * Remove QtScript from deployed libraries.axis2009-08-211-1/+0
| | | | | | | | | | | | | | | | | | | | | It is not currently supported anymore after QtScript switched to the JavaScriptCore backend. RevBy: Trust me
| * | Update EABI DEF files after 4.6 mergeIain2009-08-2110-1160/+2560
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed exports are marked ABSENT, as we're experimenting with how hard it will be to maintain BC once these DEF files are final. There were probably too many exports anyway, as I think I might have originally frozen them with a version of RVCT that had the symbol visibility issues. Reviewed-by: TrustMe
| * | Merge commit 'origin/master' into symbolVisibilityIain2009-08-201-2/+2
| |\ \ | | |/
| | * Changed names and URLs to reflect name change.axis2009-08-191-2/+2
| | | | | | | | | | | | RevBy: Trust me
| * | ***EXPERIMENTAL*** DEF files for WINSCW targetsIain2009-08-199-0/+19218
| | | | | | | | | | | | | | | | | | | | | | | | | | | Note: these *will* change between now and the release of 4.6, they should not be relied upon for anything - they are purely for experimental purposes Task-number: 259810 (partial) Reviewed-by: TrustMe
| * | ***EXPERIMENTAL*** DEF files for EABI targetsIain2009-08-199-0/+18549
| |/ | | | | | | | | | | | | | | Note: these *will* change between now and the release of 4.6, they should not be relied upon for anything - they are purely for experimental purposes Webkit DEF files to follow in later commit...
* | Rename objectdump to mmfphonondebug in order to avoid conflicts.Frans Englich2009-09-141-1/+2
| |
* | Fix bug, it's phonon-backend, not phonon_backend.Frans Englich2009-09-141-2/+2
| |
* | Merge branch 'master' into mmfphononFrans Englich2009-08-191-0/+1
|\ \ | |/ | | | | | | | | Conflicts: src/gui/itemviews/qitemselectionmodel.cpp tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp