summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-1418-162/+291
|\ | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| * Removed reference to nonexistant profile.axis2011-03-041-1/+0
| | | | | | | | | | | | | | Probably this was a result of backporting symbian-gcce support from 4.8 to 4.7. RevBy: Liang Qi
| * Corrected a mismerge in GCCE link parameters.axis2011-03-041-1/+1
| | | | | | | | RevBy: Trust me
| * Fixed incorrect referral to an include file.axis2011-03-041-1/+1
| | | | | | | | | | | | | | Better to make it relative to the profile. That way it is always found, regardless of where Qt is located. RevBy: Liang Qi
| * Fixed GCCE libdir handling if the paths have spaces in them.axis2011-03-041-9/+9
| | | | | | | | RevBy: Trust me
| * Added MinGW support for adding lib prefix and extension via profile.axis2011-03-041-0/+2
| | | | | | | | RevBy: Oswald Buddenhagen
| * Stopped honoring the RVCT22INC variable on symbian-armcc mkspec.axis2011-03-041-6/+6
| | | | | | | | | | | | | | This usually points to the RVCT include directory, but those headers are not appropriate for Symbian. RevBy: Trust me
| * Added object script support to RVCT when using MinGW qmake generator.axis2011-03-041-0/+2
| | | | | | | | RevBy: Oswald Buddenhagen
| * Added Symbian makefile building support using MinGW backend.axis2011-03-041-1/+5
| | | | | | | | RevBy: Oswald Buddenhagen
| * Fixed some tools definitions and properties in symbian profiles.axis2011-03-042-2/+3
| | | | | | | | | | | | This is needed for Symbian development on Windows using makefiles. RevBy: Trust me
| * Added missing header.axis2011-03-041-0/+41
| |
| * Unified the usage of $${EPOCROOT} for symbian.axis2011-03-042-9/+9
| | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen Conflicts: mkspecs/symbian-gcce/qmake.conf
| * Added Symbian deployment localization for makefile build system.axis2011-03-044-51/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | This is a complement to the 16575f7aef840b6aae0dc767468ab713fbcfd7a6 commit, which adds localization based on TRANSLATIONS keywords for Raptor and abld. In addition, since the __PRODUCT_INCLUDE__ define was creating a lot of trouble regarding < and >, it was refactored into its own source file, which is automatically included before every source file. Task: QTBUG-15292 RevBy: Miikka Heikkinen
| * Made the translations dependency work for shadow builds.axis2011-03-041-1/+1
| | | | | | | | RevBy: Miikka Heikkinen
| * Fixed PREPEND_INCLUDEPATH being executed too early.axis2011-03-043-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | It used to be carried out inside qt.prf, but was moved to default_post.prf. However, since qt.prf is executed after default_post.prf, it would still prepend its own include paths at the very front, which is wrong. Fixed by introducing a new feature profile for PREPEND_INCLUDEPATH, which is run after qt.prf (features in $$CONFIG are executed in reverse order). RevBy: Miikka Heikkinen
| * Moved the default dependency targets to default_post.prf.axis2011-03-042-47/+47
| | | | | | | | | | | | | | | | | | | | | | | | The file that they were in would not be parsed if CONFIG -= qt, but it always needs to be parsed, otherwise apps that don't use Qt will fail the sis file creation. RevBy: Miikka Heikkinen Conflicts: mkspecs/features/symbian/default_post.prf
| * Fix some build issues for building Qt for Symbian on Mac OS X.axis2011-02-211-1/+2
| | | | | | | | | | | | | | | | | | | | Need to add edllstub.lib and change a bit because some refactored work for mkspecs in 86636e0c4ab91bfb60be1e18d6daff34d41a5927. RevBy: axis Conflicts: mkspecs/symbian-gcce/qmake.conf
| * Got rid of some "duplicate library" warnings.axis2011-02-211-1/+1
| | | | | | | | RevBy: Trust me
| * Changed various qmake constructs to support Windows.axis2011-02-182-9/+28
| | | | | | | | | | | | | | | | RevBy: Thomas Zander Conflicts: mkspecs/features/symbian/symbian_building.prf
| * Fixed various quotation problems when porting to Windows.axis2011-02-182-8/+13
| | | | | | | | | | | | These should work for both Windows and UNIX platforms. RevBy: Thomas Zander
| * Renamed the symbian/linux-* mkspecs to symbian-*.axis2011-02-188-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done for a number of reasons: - In order to get better consistency with the other mkspecs, which have the target system name followed by a hyphen and the compiler name. - There is no real reason why we should have specific mkspecs for compiling Symbian under Linux, when it is equally likely to work under other operating systems. RevBy: Thomas Zander Conflicts: src/s60main/s60main.pro
* | Implement language fallback logic for localize_deploymentMiikka Heikkinen2011-03-092-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When querying system locale it does return both language and country, so sometimes users want to have both in their .ts file names (e.g. myapp_zh_CN.ts). This is bit problematic in Symbian, where there are separate language codes for only very few language + country combinations. Until now, the unsupported combinations were simply dropped from deployment localization. More proper way to handle these unknown language + country combinations is to fall back to using the plain language code for them instead of dropping them altogether. This is somewhat analogous to how QTranslator::load() loads .ts files if it can't find the file for specified language + country combination. E.g. User defines: TRANSLATIONS += myapp_zh_CN.ts myapp_zh_HK.ts myapp_zh_TW.ts There are separate Symbian language codes for HongKong Chinese (zh_HK = 30) and Taiwanese Chinese (zh_TW = 29), but rest of the world is expected to use just Chinese (zh = 31). This means "zh_CN" mapping is not provided as it would be same as plain "zh". With this fix, qmake will now automatically generate a fallback mapping from "zh_CN" to "31" for deployment localization purposes, and is able to read application captions and pkg names from myapp_zh_CN.ts. If there are multiple TRANSLATIONS defined that would result in same Symbian language code, only the first one is used. Task-number: QTBUG-17927 Reviewed-by: Oswald Buddenhagen
* | Adding quote around files in QMAKE_CLEAN to tackle wildcard issueGuoqing Zhang2011-03-091-1/+1
| | | | | | | | | | Task-number: QTPROD-875 Reviewed-by: Miikka Heikkinen
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-261-5/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update QtOpenGL def files Fix extern usage in qpixmapdata_gl.cpp Fix for loading QPixmaps from file in GL graphics system Fix code style in qgl_symbian.cpp QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system. Use the 'convertInPlace' versions of QImage in QGLPixmapData load. Recreate GL surface when native window is resized on Symbian
| * | QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system.Jani Hautakangas2011-02-251-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Implementation of Symbian specific conversion functions for converting Symbian native bitmap to QPixmap and QPixmap to Symbian native bitmap. Task-number: QTBUG-16977 Reviewed-by: Jason Barron
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-251-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Always prepend drive letter to $$EPOCROOT in Windows Symbian builds Add files deployed using qmake_emulator_deployment.flm to 'what' list
| * | Add files deployed using qmake_emulator_deployment.flm to 'what' listMiikka Heikkinen2011-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since anything copied using this flm is part of application deployment, those files should be present in the 'what' list. Task-number: QTBUG-17727 Reviewed-by: Janne Koskinen
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-213-3/+26
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added support for QMAKE_CLEAN in symbian-sbsv2 Only add NetworkServices capability automatically if no caps are set.
| * | Added support for QMAKE_CLEAN in symbian-sbsv2Miikka Heikkinen2011-02-212-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | Files specified in QMAKE_CLEAN variable will now be properly cleaned in symbian-sbsv2 builds. Task-number: QTBUG-17004 Reviewed-by: Janne Koskinen
| * | Only add NetworkServices capability automatically if no caps are set.Miikka Heikkinen2011-02-211-3/+3
| |/ | | | | | | | | | | | | | | | | | | This allows overriding the NetworkServices capability for the applications that do not need the capability even though they link network, webkit, or declarative. It is also more intuitive as there are no magic additions to user defined capabilities. Task-number: QTBUG-17540 Reviewed-by: Janne Koskinen
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-142-7/+4
|\ \ | |/ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Worked around a SC issue in S60 3.x vs 5.0 versions. Apply the gcce link rules for LIBS_PRIVATE too. Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X.
| * Apply the gcce link rules for LIBS_PRIVATE too.Liang Qi2011-02-111-3/+3
| | | | | | | | | | | | It's needed by building QtOpenGL of Qt for Symbian on Linux and Mac with gcce at least. RevBy: axis
| * Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X.Liang Qi2011-02-111-4/+1
| | | | | | | | | | | | | | | | Remove the define of _STLP_NO_EXCEPTION_HEADER after OpenC team's suggestion. Remove the hardcoded include path for openc, it is already provided by mkspecs/features/symbian/platform_paths.prf. RevBy: Miikka Heikkinen Backport from 7c12d841fb2e2963b506c1ffc857cdd88bf78f6c in master.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-101-1/+1
|\ \ | |/ |/| | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix QMAKE_COPY_DIR for mingw+sh
| * fix QMAKE_COPY_DIR for mingw+shOswald Buddenhagen2011-02-101-1/+1
| | | | | | | | Task-number: QTBUG-17315
* | Change paging attributes for Symbian binariesIain2011-02-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed UNPAGED workaround from QtCore and QtSql on OS releases where data paging is supported. Depends on new macro being defined in the OS builds (SYMBIAN_DLL_DATA_EXPORTS_SUPPORTED) to allow us to detect this. Data exports are supported in all S^3 builds after early 2009, however, this macro is only added recently (and thus isn't defined in, eg. Symbian Foundation PDKs (v3.0.4), or current releases (v0.9) of the S^3 SDK from Nokia). Thus building Qt against these older S^3 builds will still result in QtCore and QtSql being unpaged. Also, remove PAGED keyword from all Qt-based software. This changes the code paging field in the Symbian (E32Image) header from "paged" to "default". Thus it is left to the configuration of the particular device whether paging is used for the binary or not. All devices that support code paging should have it turned on (the value is stored in the HAL, so can be checked using eg. fshell); data paging may or may not be turned on depending on the device characteristics. Leaving both code and data paging as "default" means that any limitations in the device (eg. around flash wear) can be controlled by that device by disabling the appropriate types of paging. This change also leaves the way open to deprecated PAGED as a keyword in the Symbian build systems, so you can only opt out of paging. This makes more sense, as the default for code paging will be on, the default for data paging will be on if the device can handle it, and binaries should only be opting out of paging if they have some specific real-time requirements that paging inhibits. Task-number: QT-3503 Task-number: QTBUG-13931 Reviewed-by: Shane Kearns
* | Avoided the Linux version of the --no-undefined switch.axis2011-02-041-1/+1
| | | | | | | | RevBy: Trust me
* | Added missing edllstub.lib for GCCE.axis2011-02-041-0/+1
| | | | | | | | RevBy: Trust me
* | symbian/linux-gcce: Use -u _E32Dll when linking DLLsMartin Storsjo2011-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | This is required when using older binutils versions (CodeSourcery 2009q1 requires it, while CodeSourcery 4.4-172 doesn't require it) with the linux-gcce mkspec. The -u option is already used in the same way for exe files, and the abld build system invokes ld with -u _E32Dll, too. Signed-off-by: axis <qt-info@nokia.com> Merge request: 2560
* | Revert "Implement Symbian support for enable_backup CONFIG value"Miikka Heikkinen2011-02-042-23/+0
| | | | | | | | | | | | | | This reverts commit 10c7730877d314ec4eda6728e2d66c38beff8d62. Maemo/Meego support for this needs to be verified before this can be added so reverting this for now.
* | Implement Symbian support for enable_backup CONFIG valueMiikka Heikkinen2011-02-042-0/+23
| | | | | | | | | | | | | | | | | | | | | | The enable_backup CONFIG value can be used to generate deployment for backup registration file for an application. BACKUP_REGISTRATION_FILE variable can be used to specify a custom backup registration file. Task-number: QTBUG-17214 Reviewed-by: axis
* | Fixed wrong static library extension on Symbian.axis2011-02-031-2/+0
| | | | | | | | | | | | | | | | | | | | After commit a1ba5568da6c57e, which moved the extension definitions from the symbian-makefile.conf to symbian.conf, the QMAKE_EXTENSION_STATICLIB was wrong because unix.conf was included later and overwrote it. Turns out we don't need unix.conf, so I just removed it. RevBy: Trust me
* | Remove dependencies to pre-Symbian3 platforms from Symbian3 packagesMiikka Heikkinen2011-02-031-6/+8
| | | | | | | | | | | | | | | | | | | | Qt applications built against Symbian3 SDK will not run on older devices, so remove the platform dependency to those devices so that the user will get a proper warning if he tries to install incompatible software to an older device. Task-number: QTBUG-17187 Reviewed-by: Janne Koskinen
* | Make emulator deployment depend on post linking in symbian-sbsv2.Miikka Heikkinen2011-01-312-4/+6
|/ | | | | | | | | | | | | | | | Post linking output was not previously possible to deploy as there was no dependency from deployment to post linking, which meant deployment was usually attempted first. Now all post linking in project tree needs to be done before any deployment is done. Note that you can still get warnings about missing dependencies as sbsv2 checks those before it actually executes the targets. These warnings are harmless, but difficult to get rid of using a general solution, as qmake cannot make any guesses what QMAKE_POST_LINK handling might output. Task-number: QTBUG-17037 Reviewed-by: axis
* Fix generated mif file cleaning in symbian-abldMiikka Heikkinen2011-01-281-1/+1
| | | | | | | Mif file cleaning was incorrectly done at distclean phase. Task-number: QTBUG-16893 Reviewed-by: axis
* No longer replace dash and dot in TARGET with underscore in SymbianMiikka Heikkinen2011-01-272-57/+58
| | | | | | | | | | | | | There is no fundamental reason to not have dash or dot in binary names in Symbian, so do not replace them with underscore. One thing that doesn't work with a dot in the filename is launching an application via resources, so automatic resource generation is suppressed for applications that have a dot in filename portion of the TARGET value. Task-number: QTBUG-16888 Reviewed-by: axis
* Make QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs.Miikka Heikkinen2011-01-212-3/+3
| | | | Reviewed-by: axis
* don't assign MANIFEST_DIR if we don't need itOswald Buddenhagen2011-01-202-4/+4
| | | | | | | | avoids warnings with qmake -Wall about overriding the variable (as typically both scripts are in CONFIG, but only one is actually used). Task-number: QTBUG-13911 Reviewed-by: mariusSO
* Generate createpackage calls with absolute path.Miikka Heikkinen2011-01-181-7/+6
| | | | | | | This ensures that the correct version of the script is always called. Task-number: QTBUG-16687 Reviewed-by: axis
* Added detection of bat files to the qtPrepareTool function.axis2011-01-181-1/+7
| | | | | | Not all tools end with .exe. Some also end in .bat. RevBy: Oswald Buddenhagen
generated by cgit v0.12 at 2024-11-26 04:21:22 (GMT)