summaryrefslogtreecommitdiffstats
path: root/config.profiles
Commit message (Collapse)AuthorAgeFilesLines
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2914-271/+271
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0111-22/+22
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Symbian: create stub sis during buildPasi Pentikainen2012-06-192-3/+6
| | | | | | | | | | Create stub sis during the (tools2) configure step of the Symbian build. This allows changing of the stub sis package version just by modifying the qt_stub.pkg file. Change-Id: I8260fc3db3d6e41926f2217542f84ec93868b65f Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Symbian: drop OpenGL ES in non-supported hardwarePasi Pentikainen2012-03-231-1/+8
| | | | | | | | | | When hardware configuration has no OpenGL ES 2 support indicated, leave OpenGL ES out of Qt compilation alltogether. Task-number: ou1cimx1#987609 Change-Id: If43a8de059596fbdb52c97535436c441760c97ab Reviewed-by: Gareth Stockwell <ext-gareth.stockwell@nokia.com> Reviewed-by: Jani Hautakangas <jani.hautakangas@nokia.com>
* Bump Qt version to 4.8.1 for Symbian specific files alsoJuha Kukkonen2012-03-164-3/+3
| | | | | | | | | | | | | This continues work done in commit "Bump Qt version to 4.8.1" 8ced172dd250277f38cc3d2753692cda0fa183da by updating version number to Symbian specific files also. Updated Qt version to 4.8.1 in pkg files and ROM stub file. Task-number: ou1cimx1#987442 Change-Id: Ia71dff65956453a0eceb4b8ebba187289f20eebf Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Symbian building: enable symbian platform autodetectionPasi Pentikainen2012-02-091-3/+0
| | | | | | | | | Enable Symbian platform autodetection to differentiate between platform versions. Change-Id: I9553d181952f011b162232cc8946d0dc0a64d92c Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* qt demos and qt examples config in symbian package definitionRoy Mickos2012-02-011-1/+1
| | | | | | | | | Symbian package definition has been changed so that the build filter definition in package_definition.xml is identical. This allows them to be built in a separate build phase. Change-Id: Ie29f2358a6c6d796a32b78d9439ed899c43a49ad Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Symbian: clean package definition filePasi Pentikainen2012-01-251-23/+30
| | | | | | | Clean whitespaces and old comments on the file. Change-Id: I34e4e6ccb2c2e4f5c3dcbbad2c0933cde8215f3f Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | Manually update strings that did not get fixed by previous search-and-replace. Change-Id: Ie9ff57f08ce0dcf91d28620fa2dc9eeb8e98481e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1113-13/+13
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-11-291-0/+0
|\ | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Set execution bits for more scripts. Set execution bits for .test files. Fix more permissions (no execute bit). Fix permission (no execute bit). QGraphicsLayoutItem - bound constraint the minimum and maximum size Notify X11 of its resizable state through MWM Hints.
| * Set execution bits for .test files.Frederik Gladhorn2011-11-251-0/+0
| | | | | | | | These files turn out to be scripts.
| * Fix permission (no execute bit).Frederik Gladhorn2011-11-222-0/+0
| |
* | Symbian-linux crosscompilation case changesPasi Pentikainen2011-11-241-22/+22
| | | | | | | | | | | | | | | | Update the cases to match actual files in Symbian, and add EPOCROOT prefixes to data files in iby. Reviewed-by: Juha Kukkonen Task-number: QTBUG-14361
* | Symbian-linux crosscompilation debug-release alignPasi Pentikainen2011-11-241-1/+1
| | | | | | | | | | | | | | | | | | Change the Symbian Raptor configure options to use debug variant when using configure-sh on linux crosscompilation, so that it matches with result of configure.exe on windows. Reviewed-by: Miikka Heikkinen Task-number: QTBUG-14361
* | Fix Linux-Symbian parallel cross-compilation configure stepPasi Pentikainen2011-11-231-34/+63
|/ | | | | | | | | The qtconfig.flm is mostly rewritten to support parallel Raptor Linux-Symbian cross-compilation. Reviewed-by: Miikka Heikkinen Done-with: Samu Sillanpaa Task-number: QTBUG-14361
* Minor improvements to whatlog generation in Symbian tools2 builds.Miikka Heikkinen2011-11-151-4/+15
| | | | | | | | | | | - Generate temporary whatlog file under epoc32/build rather than the source directory. - Remove depenedency to qmake building from WHAT target to ensure nothing is built if "sbs -c tools2 --what" command is issued as that is supposed to just list what was built. Reviewed-by: Sami Merila
* Fix linux-symbian cross-compilation configure-phase for platform builingPasi Pentikainen2011-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | When building Symbian platform itself, the lower layer libraries are not available on configure phase, and the config.test build scripts fail, creating false "NO"-flags (also config.test currently does not work with Symbian raptor). This fix aligns the configure results of configure-sh- script with configure.exe as far as possible and fixes couple of symbian cross-compilation configure issues, as detailed below: Configure sh-script: - Disable configure tests with symbian-sbsv2 where the failing test would result to invalid disable-flags - Skip applying of X11/Unix/Mac specific QCONFIG disable-flags that are not produced by configure.exe either - Fix emitting of "QT_NO_GUI" flag (in all environments) qtconfigure.flm: - Copy mkspecs as files to /epoc32/... instead of symbolic link Reviewed-by: Miikka Heikkinen Task-number: QTBUG-14361
* Add mobile-reduced ts-files for Symbian.Pasi Pentikainen2011-11-0969-42665/+15959
| | | | | | | | Add language files translated to all Symbian supported languages, reduced to items likely seen in Symbian. Task-Number: QTBUG-4919 Reviewed-by: Miikka Heikkinen
* Improve whatlog generation for Symbian tools2 builds.Miikka Heikkinen2011-11-032-91/+68
| | | | | | | | | - Headerexport script is only called once, whatlog is stored into a file - Sed is only called once - Properly added generated tools to whatlog Task-number: QTBUG-22521 Reviewed-by: Sami Merila
* Symbian configuration parameter change for linux buildingPasi Pentikainen2011-10-261-2/+2
| | | | | | | | Symbian configuration changed to use opengl es2 parameter which works both with configure.exe (symbian windows building) and configure sh-script (symbian linux building). Reviewed-by: Miikka Heikkinen
* Put Qt translation files to rom on Symbian.Pasi Pentikainen2011-10-131-0/+13
| | | | | Task-Number: QTBUG-4919 Reviewed-by: Honglei Zhang
* Improve sbsv2 whatlog support.Miikka Heikkinen2011-09-222-2/+11
| | | | | | | | | All builds will now add anything generated via QMAKE_EXTRA_COMPILERS to whatlog. In addition, platform builds will now add to whatlog the exported mkspecs and qmake_clean.flm that were missing. Task-number: QTBUG-21591 Reviewed-by: Sami Merila
* Fix "sbs -c tools2 --what" output for Qt.Miikka Heikkinen2011-09-122-42/+102
| | | | | | | | | | | Doing "sbs -c tools2" exports Qt headers under epocroot, but didn't list the exported headers with "--what". Added "-what" parameter support to headerexport perl script and utilized that in qtconfig.flm to generate list of exported files for "sbs -c tools2 --what". Task-number: QTBUG-21155 Reviewed-by: Sami Merila
* Update environment.prfMiikka Heikkinen2011-09-091-3/+2
| | | | | | S60_VERSION and SYMBIAN_VERSION were obsolete in environment.prf. Reviewed-by: Sami Merila
* Fix qt.conf for Symbian to use $${EPOCROOT}Miikka Heikkinen2011-09-061-4/+4
| | | | | | | | | $(EPOCROOT) in qt.conf resolves epocroot from environment variable, which is wrong when doing full platform build and qmake is executed in context of sbsv2 tools build. The correct way to resolve epocroot in qt.conf is to use $${EPOCROOT}. Reviewed-by: TrustMe
* Freeze and re-enable def files for SymbianTomi Vihria2011-08-311-1/+1
| | | | | Task-number: QT-5158 Reviewed-by: Sami Merila
* Disabling DEF files to get around building problems.Sami Lempinen2011-06-101-1/+1
|
* Removed qts60plugin references also from config.profilesMiikka Heikkinen2011-05-232-7/+0
| | | | | Task-number: QTBUG-18614 Reviewed-by: TrustMe
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1311-189/+189
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Fixed Qt UDA creation for SymbianTomi Vihria2011-04-142-1/+2
| | | | | | | | | | Added a dummy Qt sis file and fixed paths in bld.inf. Otherwise build would fail when FF_QT_IN_UDA is defined. Dummy Qt sis file needs to replaced with a real one when actual UDA image is created. Task-number: QT-4888 Reviewed-by: Guoqing Zhang
* Enablers for the Qt eclipsing in SymbianTomi Vihria2011-04-143-55/+4
| | | | | | | | | Remove file listing from the stub package file to ease maintenance, generate stub sis from it and export it to the correct location to be included into ROM. Task-number: QT-4817 Reviewed-by: Guoqing Zhang
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamGuoqing Zhang2011-04-113-41/+36
|\ | | | | | | | | Conflicts: src/s60installs/qt.iby
| * Optimize loc.prf for localizationGuoqing Zhang2011-04-052-28/+36
| | | | | | | | | | Task-number: Reviewed-by: Miikka Heikkinen
| * Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-052-20/+0
| |\
| * | Remove obsolete files from qt.ibyMiikka Heikkinen2011-04-041-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - qaudio.dll is no longer built separately, it is static part of QtMultimedia.dll - s60main resources are no longer needed or generated - Webkit files are installed via separate IBY Task-number: QT-4839 Reviewed-by: Guoqing Zhang
* | | Merge remote branch 'qa-review/master' into qa-staging-masterRohan McGovern2011-04-082-2/+2
|\ \ \ | |_|/ |/| |
| * | Merge qt/qt.git master into qa-team-masterRohan McGovern2011-03-24125-32900/+6581
| |\|
| * | Update copyright year to 2011.Jason McDonald2011-01-1110-16/+16
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Removed old autotest references from Symbian build filesEckhart Koppen2011-03-242-20/+0
| |/ |/| | | | | | | | | | | Tests not in use anymore, removed from the layers and package definition files. Reviewed-by: TrustMe
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-03-16113-0/+6034
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Temporarily removed Harmattan specific patches Harmattan: fixed license headers. Added Harmattan specific debian files to master branch.
| * | Temporarily removed Harmattan specific patchesEckhart Koppen2011-03-1615-2232/+0
| | | | | | | | | | | | | | | | | | Patches are not applying properly yet, so no use to release them. Reviewed-by: TrustMe
| * | Harmattan: fixed license headers.Rohan McGovern2011-03-148-32/+295
| | |
| * | Added Harmattan specific debian files to master branch.Janne Hamalainen2011-03-10128-0/+8003
| | | | | | | | | | | | | | | | | | | | | | | | | | | Debian packaging files added to Master branch. One translation file was removed as it was a left over from an old commit. Reference to it was removed from rules file. Similar commit is done for Harmattan as well. Task: BACKEND-564 Reviewed-by: Adrian Constantin
* | | Update copyright year to 2011.Rohan McGovern2011-03-115-9/+9
|/ / | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
* | Merge remote branch 'qt-master/master'Eckhart Koppen2011-03-081-2/+2
|\ \
| * | Fixed wrong reference to bld.inf in the package_definition.xml fileEckhart Koppen2011-02-221-2/+2
| | | | | | | | | | | | | | | | | | Removed extra path component Reviewed-by: Hannu Niinimaki
* | | Simplified header export script for SymbianEckhart Koppen2011-03-012-272/+141
|/ / | | | | | | | | | | | | Removed most functionality from syncqt to get a straight copy functionality. Reviewed-by: TrustMe
* | Removed timestamp setting and checking for Symbian header exportEckhart Koppen2011-02-151-46/+16
| | | | | | | | | | | | | | For Symbian, headers get always exported, and timestamps are not needed. Reviewed-by: TrustMe
* | Phonon MMF backend enabled in configuration and deploymentDmitry Trofimov2011-02-153-4/+9
| |