summaryrefslogtreecommitdiffstats
path: root/src/s60installs/s60installs.pro
Commit message (Expand)AuthorAgeFilesLines
* Moved the QML WebKit integration into QtWebKit.sisSimon Hausmann2010-06-241-7/+0
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-221-3/+3
|\
| * Update S60 stuff after renaming the webkit component.Alexis Menard2010-06-181-3/+3
* | Fixed bearer plugin deployment in libinfixed buildsMiikka Heikkinen2010-06-181-3/+3
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-151-7/+18
|\
| * Fixed error deploying qsymbianbearer.qtplugin on Symbian.Rohan McGovern2010-06-111-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-091-7/+18
| |\
| | * Split Symbian bearer plugin into three platform specfic pluginsAaron McCarthy2010-06-081-7/+18
* | | Change $${EPOCROOT} to also have drive if EPOCROOT env variable has itMiikka Heikkinen2010-06-151-2/+2
|/ /
* | Fix Symbian install path for Qml pluginsAlessandro Portale2010-06-091-4/+4
|/
* Fix the building of sis files.Thomas Zander2010-06-071-5/+5
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-06-031-20/+33
|\
| * Fix Qt.sis content for Symbian^3 buildsMiikka Heikkinen2010-06-021-20/+33
* | Add qml import plugins to qt.iby and qt.sisJoona Petrell2010-06-021-0/+21
|/
* More mediaservices removal work.Derick Hawcroft2010-05-181-11/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-301-0/+3
|\
| * Fix 'make sis' when media services is disabled and multimedia is notThomas Zander2010-04-281-0/+3
* | S60 mediaservices backendhawcroft2010-04-291-1/+7
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-261-19/+0
|\
| * Revert "Add QML imports to s60installs.pro"Thomas Zander2010-04-261-19/+0
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-231-0/+1
|\ \ | |/ |/|
| * Three fixes from Shane after QtMultimedia was split into two dlls.Espen Riskedal2010-04-161-0/+1
* | Add QML imports to s60installs.proJoona Petrell2010-04-161-0/+19
|/
* Fix 'make sis' working on symbian makefile based system again.Thomas Zander2010-04-061-3/+9
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-251-1/+4
|\
| * Changed Symbian pkg files to deploy from under epoc32Miikka Heikkinen2010-03-231-1/+4
* | Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-38/+46
|\ \ | |/
| * Enable s60main.rsc infixing.Miikka Heikkinen2010-03-191-5/+3
| * Useful support for -qtlibinfix configure parameter in SymbianMiikka Heikkinen2010-03-181-34/+45
* | Revert "Temporarily disable problematic dll."axis2010-03-161-3/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-161-7/+1
|\ \
| * \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-151-7/+1
| |\ \ | | |/
| | * Moved Symbian audio backend into QtMultimedia.dllGareth Stockwell2010-03-121-6/+0
| | * Export qtdemoapps.iby to proper locationMiikka Heikkinen2010-03-101-1/+1
* | | Temporarily disable problematic dll.axis2010-03-111-1/+3
* | | 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
|\ \ \ | |/ /
| * | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-221-0/+6
| |\ \ | | |/
| * | Merge remote branch 'origin/4.6' into bearermanagement/integrationAaron McCarthy2010-02-111-2/+6
| |\ \
| * | | 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
| |\ \ \
| * | | | Partially convert Symbian backend into a plugin.Aaron McCarthy2010-01-121-1/+9
* | | | | 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
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Symbian backend for QtMultimedia audioGareth Stockwell2010-02-181-0/+6
| | |_|/ | |/| |
* | | | 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
* | | | 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
|\ \ \ \ | |/ / /