summaryrefslogtreecommitdiffstats
path: root/src/s60installs/s60installs.pro
Commit message (Collapse)AuthorAgeFilesLines
* Fix 'make sis' working on symbian makefile based system again.Thomas Zander2010-04-061-3/+9
| | | | Only use EPOCROOT as the source for libs on symbian-abld|symbian-sbsv2
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-251-1/+4
|\ | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| * Changed Symbian pkg files to deploy from under epoc32Miikka Heikkinen2010-03-231-1/+4
| | | | | | | | | | | | | | | | | | | | Since the build process copies everything that is deployed using DEPLOYMENT variable under epoc32 somewhere, pkg files might as well look for the files from there. This can be useful for binary releases if the release needs to be repackaged. Task-number: QT-3147 Reviewed-by: Janne Anttila
* | Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-38/+46
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe mkspecs/common/symbian/symbian.conf src/gui/graphicsview/qgraphicswidget.h src/gui/kernel/qapplication.cpp src/gui/text/qtextlayout.cpp src/openvg/qpixmapdata_vg.cpp src/s60installs/s60installs.pro tools/runonphone/main.cpp tools/runonphone/serenum_unix.cpp qtextlayout.cpp fixed up together with Eskil. Kept the configure.exe from 4.7 without recompile.
| * Enable s60main.rsc infixing.Miikka Heikkinen2010-03-191-5/+3
| | | | | | | | | | | | | | | | Now s60main.rsc file is also infixed, making infixed and vanilla builds indepenendent of each other. Task-number: QTBUG-9065 Reviewed-by: Shane Kearns
| * Useful support for -qtlibinfix configure parameter in SymbianMiikka Heikkinen2010-03-181-34/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure parameter -qtlibinfix will now change also plugin names of plugins built and installed with Qt in Symbian. Default plugin path is changed to: /resource/qt<libinfix>/plugins. Other plugins besides the ones installed with Qt are not renamed. With infixed configuration, Qt can be installed on a phone that already has a Qt installed on ROM without interfering with the ROM version of Qt. Note that since s60main.rsc resource cannot deployed with infixed Qt, and infixing it is somewhat problematic, currently the phone needs to have proper Qt installation, too, for infixed Qt to work. It also means that any changes to Qt that would affect s60main.rsc cannot be tested on real device using infixed builds. Since this file is unlikely to need changing, this should not be a big problem. Task-number: QTBUG-9065 Reviewed-by: Jani Hautakangas
* | Revert "Temporarily disable problematic dll."axis2010-03-161-3/+1
| | | | | | | | This reverts commit a65738d8e81f165e32d948ffbaea98702717d8db.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-161-7/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/embedded/anomaly/anomaly.pro demos/embedded/flightinfo/flightinfo.pro demos/embedded/lightmaps/lightmaps.pro demos/embedded/weatherinfo/weatherinfo.pro examples/network/fortuneclient/fortuneclient.pro examples/network/fortuneserver/fortuneserver.pro examples/network/network-chat/network-chat.pro mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/platform_paths.prf qmake/generators/symbian/symmake.cpp qmake/generators/symbian/symmake.h src/s60installs/s60installs.pro
| * \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-151-7/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| | * Moved Symbian audio backend into QtMultimedia.dllGareth Stockwell2010-03-121-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changed backend from being a plugin, to being statically compiled into QtMultimedia.dll. This is to achieve consistency with the backends for other plugins, and to allow the plugin API to be modified. Task-number: QTBUG-8994 Reviewed-by: trustme
| | * Export qtdemoapps.iby to proper locationMiikka Heikkinen2010-03-101-1/+1
| | | | | | | | | | | | | | | | | | Part of QtP delta reduction effort Reviewed-by: Janne Anttila
* | | Temporarily disable problematic dll.axis2010-03-111-1/+3
| | | | | | | | | | | | This should be reverted later, and investigated.
* | | Fixed location of dll for the makefile based Symbian build system.axis2010-03-011-1/+1
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-011-1/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/symbian/symbian.conf qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.cpp qmake/generators/symbian/symmake_sbsv2.cpp src/plugins/plugins.pro
| * | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-221-0/+6
| |\ \ | | |/ | | | | | | | | | Conflicts: src/network/access/qnetworkaccessmanager.cpp
| * | Merge remote branch 'origin/4.6' into bearermanagement/integrationAaron McCarthy2010-02-111-2/+6
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/s60installs/s60installs.pro
| * | | 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-291-9/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/painting/qpainter.cpp src/s60installs/s60installs.pro
| * | | | Partially convert Symbian backend into a plugin.Aaron McCarthy2010-01-121-1/+9
| | | | | | | | | | | | | | | | | | | | QNetworkSession functionality not converted yet.
* | | | | Corrected library locations for deployment on Symbian.axis2010-02-251-1/+1
| | | | |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-231-0/+6
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/qt.prf qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/generators/symbian/initprojectdeploy_symbian.cpp src/src.pro
| * | | | Symbian backend for QtMultimedia audioGareth Stockwell2010-02-181-0/+6
| | |_|/ | |/| | | | | | | | | | Task-number: QT-567
* | | | Enabled the "make sis" target with the Symbian makefile build system.axis2010-02-191-0/+1
| | | |
* | | | Fixed plugin locations in the pkg file.axis2010-02-161-10/+6
| | | | | | | | | | | | | | | | This broke after commit cfdf813056c5e6063e97bd01266c249ec2f9ecf1.
* | | | Fixed location of dll on Symbian after QtMultimedia was added.axis2010-02-161-1/+1
| | | |
* | | | Fixed position of plugins on Symbian.axis2010-02-121-1/+1
| | | |
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-121-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.cpp qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro Conflict resolution was heavily based on manual application of commit 9cc4ae77a73bd28ff495f36f26dd87c78b76b976.
| * | | Deployed QtMultimedia.dll on SymbianGareth Stockwell2010-02-011-0/+4
| | |/ | |/| | | | | | | | | | Task-number: QT-2813 Reviewed-by: trustme
* | | Made some changes after code review.axis2010-02-121-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed makefile generator name to SYMBIAN_UNIX, to be more in line with the other generators. - Explained the reason for avoiding virtual inheritance in a bit more detail. - Removed an unnecessary string replacement. - Fixed the location of s60 plugins for MMP based generators. RevBy: Miikka Heikkinen
* | | Implemented pkg generator for the symbian/linux-armcc mkspec.axis2010-02-041-27/+37
|/ / | | | | | | | | | | | | | | | | | | | | | | | | It reuses almost everything from the original pkg generator, but the code had to be restructured to accomodate for the new makefile generator. In addition a few new codepaths and profile changes had to be introduced to cope with the fact that this mkspec puts files in different places than Symbian does (inside $QTDIR/lib instead of $EPOCROOT/...). This enables the pkg generator to generate correct pkg files for Qt itself, but applications will not work yet because they also require generated rss files.
* | Added Symbian backup & restore support for Qt.sis and fluidlauncher.sis.Miikka Heikkinen2010-01-251-1/+5
| | | | | | | | | | Task-number: QTBUG-7518 Reviewed-by: Janne Koskinen
* | Generic solution for plugin stub exports for IBY usageMiikka Heikkinen2010-01-201-5/+0
| | | | | | | | | | | | | | | | | | | | 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-071-4/+3
| | | | | | | | | | Task-number: QTBUG-4879 Reviewed-by: Shane Kearns
* | 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-281-0/+5
| | | | | | | | | | | | | | | | | | 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
* | Keep the same capitalization for Phonon.dll.Frans Englich2009-11-161-1/+1
|/ | | | Task-number: QTBUG-4735
* Install Qt declarative (if available) and QmlPatterns on S60Martin Jones2009-11-161-0/+4
| | | | Reviewed-by: Warwick Allison
* 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
* 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
* Prevented deployment of QtScript when not compiling that module.axis2009-10-071-1/+4
| | | | RevBy: Miikka Heikkinen
* 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
* 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
* | Fix merge conflict: the file was renamed.Frans Englich2009-09-241-0/+7
|/
* 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
generated by cgit v0.12 at 2024-12-04 01:20:11 (GMT)