summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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>
* fix -enable-stdcall-fixup usageOswald Buddenhagen2011-01-171-2/+2
| | | | | | | | the leading "-Wl," was apparently accidentally split off to the wrong line. Task-number: QTBUG-15391 Reviewed-by: mariusSO
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-01-111-2/+2
|\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove sqlite3_selfsigned.sis as it is no longer usable or needed. Allow use of command line parameters with RApaLsSession::StartApp. Fixed resource leak in Phonon MMF backend Allow IAP to be selected in Phonon MMF backend
| * Allow use of command line parameters with RApaLsSession::StartApp.Miikka Heikkinen2011-01-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a Symbian application is launched using RApaLsSession::StartApp, command line parameters can be given with CApaCommandLine::SetTailEndL and will now be correctly interpreted by Qt applications as command line parameters. There are a couple of limitations: 1) The parameters given with CApaCommandLine::SetTailEndL will not be available in main method's argv array; they can be accessed via QCoreApplication::arguments function. 2) CApaCommandLine::SetTailEndL does support any arbitrary binary data as parameter, but only 8-bit string data gets parsed properly into QCoreApplication::arguments. For other kind of tail data, you need to subclass QS60MainAppUi and implement ProcessCommandParametersL callback. Task-number: QTBUG-15987 Reviewed-by: axis
* | 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
* Update copyright year to 2011.Jason McDonald2011-01-10138-138/+138
| | | | Reviewed-by: Trust Me
* 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
* Fix incorrect file name case for OpenGL libraries in symbian.conf.Miikka Heikkinen2010-12-171-4/+4
| | | | | | | To support linux builds, file names must be cased correctly. Task-number: QT-4375 Reviewed-by: Miikka Heikkinen
* ICC: Don't print warning 1259 since it's too annoying.Thiago Macieira2010-12-151-1/+1
| | | | | ICC 12 keeps outputting this when you copy a type of larger size to a smaller, or from int to float.
* Add libinfix support for QML plugins in Symbian.Miikka Heikkinen2010-12-091-1/+1
| | | | | Task-number: QTBUG-14736 Reviewed-by: Alessandro Portale
* 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-292-2/+33
| | | | | | | | 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-222-3/+3
| | | | | | | | Use $$[QT_INSTALL_DATA] instead of $$[QT_INSTALL_PREFIX] when adding include path that points under mkspecs. Task-number: QTBUG-15501 Reviewed-by: axis
* Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-181-5/+2
|\ | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * Enable OpenGL scissors testAdrian Constantin2010-11-151-3/+0
| | | | | | | | Reviewed-by: Petri Latvala
| * Remove -fno-omit-frame-pointer and -fno-optimize-sibling-calls in mkspecs, ↵Petri Latvala2010-11-151-2/+2
| | | | | | | | | | | | add -Wno-psabi Reviewed-by: Adrian Constantin
* | Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-128-19/+273
|/ | | | | | | | | | | | | | | | | | | 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-083-16/+21
| | | | | | | | | | | 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-083-20/+40
| | | | | | | | | | | | | | | | | 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-053-7/+19
| | | | | | | 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-043-19/+7
| | | | | | | | | 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
* msvc: enable unreferenced code elimination in release with debuginfo buildsOswald Buddenhagen2010-11-034-4/+4
| | | | | | | | | that linker optimization is on by default in release builds, so override /DEBUG implicitly turning it off. as it happens, this implicitly disables incremental linking, so that option can go away now. Reviewed-by: joerg Task-number: QTBUG-14007
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-181-0/+4
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Prepend epocroot to extra target tools if they start with /epoc32/ QS60Style: ComboBox disappears after orientation switch
| * Prepend epocroot to extra target tools if they start with /epoc32/Miikka Heikkinen2010-10-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to define extra targets and extra compilers commands that use tools under EPOCROOT without having to worry whether EPOCROOT contains drive letter or not, which is demanded by sbsv2 toolchain. For example, if command to be used is "%EPOCROOT%epoc32/tools/foobar.exe", the EPOCROOT should be omitted in .pro file and the command be given simply as "/epoc32/tools/foobar.exe". Reviewed-by: Janne Koskinen
* | qmake/symbian: Make sure the destination directory exists before copyingMartin Storsjo2010-10-181-1/+1
|/ | | | | | | | | | | cp on unix doesn't create the destination directory if it doesn't exist, as xcopy on windows does. This also requires QMAKE_MKDIR to use mkdir -p to be able to create directories recursively. Merge-request: 861 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-131-3/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (51 commits) Revert "qmake: pass include directories to MS resource compiler" Fix User 46 Panic in bearer management on Symbian. Assistant: Insert all keywords with empty ids, as ids are not mendatory. qmake: delete .pdb file when making 'distclean' instead of 'clean' qmake: pass include directories to MS resource compiler use specified pkg-config qmake/symbian: Add icons with backslashes in pkg files Make qtconfig help messages translatable remove exec bits again ... Add TIFFClose to QTIffHandler::option() to avoid memory leak [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows Added missing QtWebKit example files and some whitespace fixes. Added missing native separator transforms. Doc: tuning search reasult box qdoc: Don't generate html output for png files. Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0 Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize() Doc: correct spelling Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp Doc: correcting grammar on the installation pages ...
| * 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>
* | Added --remove-destination to qmake_emulator_deployment.flmMiikka Heikkinen2010-10-131-1/+1
|/ | | | | | | This will fix the issue with deploying files when destination is owned by another user. Reviewed-by: TrustMe
* Fixed some preprocessor parameters for Mac support.axis2010-10-081-4/+4
| | | | RevBy: Liang Qi
generated by cgit v0.12 at 2024-11-08 12:58:46 (GMT)