summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Collapse)AuthorAgeFilesLines
* Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-251-2/+2
| | | | | | | | The patch applies everything from the original, except for the filename case changes in LIBS which are handled differently based on the auto-detected is_using_gnupoc CONFIG value. Reviewed-by: Laszlo Agocs
* Update the detection of is_using_gnupoc for S3.Liang Qi2011-05-251-1/+1
| | | | | | The akndoc.h was moved to epoc32/include/mw. Reviewed-By: axis
* Revert "Fixing Linux compatibility issues for Symbian"Laszlo Agocs2011-05-251-2/+2
| | | | | | | | | | Changing the library names to lowercase breaks 5.0-based Linux builds. It will be investigated if it is possible to change the SDKs instead. If not, the patch will have to be extended to use the original names for 5.0 and the lowercased ones otherwise. This reverts commit 5933d4e4fb8b48ebed641e7f6b1d032df253df30.
* Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-181-2/+2
| | | | Reviewed-by: Laszlo Agocs
* Add enablers for Symbian App BoosterSimon Frost2011-05-031-0/+32
| | | | | | | | | | | | To use the Symbian App Booster, a registration file (matching the filename of the executable, eg helloworld.applite) must be copied to the import folder within QtAppBooster's private directory. The appropriate library (qdeclarativebooster) must also be linked against. With this change, the required actions are carried out by adding "CONFIG += symbian_appbooster" to the application's .pro file. Task-number: QT-4892 Reviewed-by: Miikka Heikkinen
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-04-132-0/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits) Have the backing store destroyed also in special Symbian scenarios. Use FixNativeOrientation on Symbian when the application wants it. QS60Style: itemview item with checkbox and text is drawn incorrectly Revert "Have the backing store destroyed also in special Symbian scenarios." Add focus frame support in style sheet Two QListView autotests do not pass on Symbian^3 releases tst_QStyle::drawItemPixmap test case fails on Symbian^3 Add the auto detection for OpenVG in configure Add focus frame support in stylesheet Make QS60Style to support new Tab graphics in new Symbian releases GraphicsView is not reset if focusItem is not set when keyboard closes Check the validity of qt_desktopWidget before dereferencing Labels are not visible in dialogs with all themes (part2) Labels are not visible in dialogs with all themes Enable webkit for symbian-gcce in configure Enable webkit build for the makefile build system with gcce Add the rules for gcce in do_not_build_as_thumb.prf Correct some parameters for the makefile build sytem, armcc and gcce Support QMAKE_LFLAGS.ARMCC and QMAKE_LFLAGS.GCCE in makefile build system Do not unnecessarily draw application twice in landscape ...
| * Add the rules for gcce in do_not_build_as_thumb.prfLiang Qi2011-04-071-0/+5
| | | | | | | | Reviewed-by: axis
| * Support QMAKE_LFLAGS.ARMCC and QMAKE_LFLAGS.GCCE in makefile build systemLiang Qi2011-04-071-0/+2
| | | | | | | | Reviewed-by: axis
* | make uic3-generated moc files depend on mocinclude.tmpOswald Buddenhagen2011-04-121-0/+1
| | | | | | | | | | Task-number: QTBUG-16951 Reviewed-by: mariusSO
* | clean up visual studio identification codeOswald Buddenhagen2011-04-125-15/+9
|/ | | | | | | TEMPLATE is (now) reliably prefixed with "vc" when a vs generator is used. Reviewed-by: mariusSO
* QSysInfo support for next generation Symbian devices.Miikka Heikkinen2011-03-241-2/+2
| | | | | | | | | | | A new QSysInfo::S60Version enum value SV_S60_5_3 is introduced. QSysInfo::symbianVersion still returns SV_SF_3 for the new platform. The official name of the platform is still pending, so documentation will be updated later. Task-number: QT-4593 Reviewed-by: Sami Merila
* Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-147-123/+182
|\ | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| * 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
| * Unified the usage of $${EPOCROOT} for symbian.axis2011-03-041-1/+1
| | | | | | | | | | | | | | | | RevBy: Miikka Heikkinen Conflicts: mkspecs/symbian-gcce/qmake.conf
| * Added Symbian deployment localization for makefile build system.axis2011-03-041-44/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fixed PREPEND_INCLUDEPATH being executed too early.axis2011-03-042-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * 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-181-6/+11
| | | | | | | | | | | | These should work for both Windows and UNIX platforms. RevBy: Thomas Zander
| * Renamed the symbian/linux-* mkspecs to symbian-*.axis2011-02-182-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-091-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | 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
* 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
* Added missing edllstub.lib for GCCE.axis2011-02-041-0/+1
| | | | RevBy: Trust me
* Revert "Implement Symbian support for enable_backup CONFIG value"Miikka Heikkinen2011-02-041-15/+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-041-0/+15
| | | | | | | | | | | 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
* 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
* 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-271-50/+56
| | | | | | | | | | | | | 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
* 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
* don't misdetect powermac host systems when determining target archKonstantin Tokarev2011-01-171-1/+1
| | | | | | Task-number: QTBUG-6150 Merge-request: 2549 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Install each test in a separate directoryAdrian Constantin2011-01-111-1/+1
| | | | | | It prevents collision of test data. Reviewed-by: Lucian Varlan
* Do not override the target path if already definedLucian Varlan2011-01-111-1/+4
| | | | Reviewed-by: Adrian Constantin
* Fix def file names for libinfixed testlibMiikka Heikkinen2011-01-041-1/+1
| | | | Reviewed-by: Janne Koskinen
* Ignore static_and_shared in Symbian builds.Miikka Heikkinen2011-01-031-1/+1
| | | | | | | | | The function addExclusiveBuilds doesn't work on Symbian and is unlikely to ever work due to build system mandated target directories, so ignore static_and_shared in Symbian builds that rely on Symbian toolchains. Task-number: QTBUG-16298 Reviewed-by: axis
* Cleaned up sis_targets.prfMiikka Heikkinen2010-12-021-48/+36
| | | | | | | | | | | Removed the unnecessary checks for the case where pkg file doesn't exist are no longer needed as we now have dependencies to pkg files and no sis creation targets are generated if pkg is not generated. Also improved documentation a bit and added the missing ok_installer_sis target generation. Reviewed-by: Janne Koskinen
* Updated language map in localize_deployment.prfMiikka Heikkinen2010-11-291-1/+28
| | | | | | | | Added missing Symbian language codes for which an Qt equivalent was available. Some codes were mapped to language/country pairs. Task-number: QTBUG-15293 Reviewed-by: Janne Koskinen
* Add NetworkServices capability automatically for network appsMiikka Heikkinen2010-11-291-4/+11
| | | | | | | | | | Any application linking to QtNetwork, QtWebKit, or QtDeclarative is likely to utilize network, so add NetworkServices capabiltity for these applications by default in Symbian. Also increased the default epocheap maximum size for these applications. Task-number: QTBUG-14472 Reviewed-by: Janne Koskinen
* Fix symbian-mmp.conf include pathMiikka Heikkinen2010-11-221-1/+1
| | | | | | | | Use $$[QT_INSTALL_DATA] instead of $$[QT_INSTALL_PREFIX] when adding include path that points under mkspecs. Task-number: QTBUG-15501 Reviewed-by: axis
* Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-125-8/+128
| | | | | | | | | | | | | | | | | | | If developer specifies "CONFIG += localize_deployment" in .pro file, the generated .loc and .pkg will now use translatable strings from .ts files defined in TRANSLATIONS. The .ts files must have an underscore and Qt language code at the end of the filename body to be compatible with deployment localization. E.g. myapp_en.ts. Running lupdate will generate these entries into .ts files: - Application short caption - Application long caption - Package name - Smart installer package name Task-number: QTBUG-13917 Reviewed-by: Oswald Buddenhagen Reviewed-by: Janne Anttila Reviewed-by: axis
* Fixed deployment for symbian/linux-armcc when using shadow builds.axis2010-11-082-4/+12
| | | | RevBy: Miikka Heikkinen
* Started using qtmain.lib for all Qt applications, also corelib ones.axis2010-11-082-15/+17
| | | | | | | | | | | This commit also fixes the issue that 564058a1bb didn't, namely that config tests broke on Symbian. It does this by continuing to use the Open C libcrt0.lib library for non-Qt applications. This is also more correct, since you should not have to compile the Qt libs to compile a non-Qt app. Task: QTBUG-14735 RevBy: Miikka Heikkinen
* Make default application deployment removableMiikka Heikkinen2010-11-082-19/+39
| | | | | | | | | | | | | | | | | Default application deployment was hard coded in qmake, so it was impossible to replace with custom deployment. Now the default deployment is generated via .prf files and is removable. Cherry picked to 4.7 branch from master branch as part of QTBUG-15068, original commit: 494ce0dac35c7ade0ce78589878597a7ca912864 Task-number: QTBUG-15068 Task-number: QTBUG-13367 Reviewed-by: axis Conflicts: qmake/generators/symbian/symbiancommon.cpp
* Revert "Use qtmain.lib to provide entry point for all Symbian applications"axis2010-11-052-5/+18
| | | | | | | This reverts commit 564058a1bbfb1c67bc3d68b7c7a2ebfe83481334. It breaks massively on the symbian/linux-armcc mkspec. Will find a different solution.
* Use qtmain.lib to provide entry point for all Symbian applicationsMiikka Heikkinen2010-11-042-18/+5
| | | | | | | | | Using Open C's libcrt0.lib to provide entry point caused problems for applications that launched other processes, as Open C retains a handle to all launched processes even after said processes terminate. Task-number: QTBUG-14735 Reviewed-by: axis
* use specified pkg-configMark Brand2010-10-111-3/+4
| | | | | | | | Respect the pkg-config tool specified in qmake.conf. This is useful when crossbuilding. Merge-request: 850 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fixed some preprocessor parameters for Mac support.axis2010-10-081-4/+4
| | | | RevBy: Liang Qi
generated by cgit v0.12 at 2024-11-22 08:41:34 (GMT)