summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
Commit message (Collapse)AuthorAgeFilesLines
* Fixed make runonphone that looked for the package in the wrong place.axis2010-06-241-3/+7
| | | | | Task: QTBUG-11670 RevBy: Trust me
* Fixed several problems with the postlinker for Symbian (elf2e32).axis2010-06-242-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fixes were too complicated for a profile and so a perl script was introduced. These are the issues that were addressed: - Made sure that we link correctly in all cases where there is a mismatch between the DEF file and the ELF file. Specifically, these two cases: - If elf2e32 detects a symbols in the ELF file that is marked as absent in the DEF file, an ordinal mapping will not be generated in the dso file. This means that binaries linking to the library will not find the symbol, even though it exists in the code. Since this is completely useless behavior, this was fixed to include the symbol regardless. - If the DEF file contains a symbol that is not present in the ELF file, an ordinal mapping will be created in the dso file regardless, which means applications can link to a symbol that does not exist. This is even worse than point one, since it is not detected until runtime, when the dynamic link will fail. Fixed by leaving the symbol out of the dso file if it does not exist in the ELF file. Both fixes require rerunning elf2e32 to fix the symbol mappings that were broken in the first run, but it only happens if at least one symbol is broken in the way described above. Also, freezing the DEF files will "save" the symbols, so that it does not occur after that. Note that this does not remove the ability to get the postlinker to tell you about mismatches. By doing "QMAKE_ELF2E32_FLAGS -= --unfrozen", the symbol mismatches will be considered errors instead of warnings, and they can be caught that way. - Code that was previously in the profile was moved to the perl script: - Detecting that there are errors in the postlink and return nonzero. elf2e32 does not do this on its own (at least not when using Wine). - Only overwriting the old dso file if the new one is different. This saves build time, since binaries that depend on the library do not trigger relink if the dso has not changed. These two points simplify the code, and they will also help the porting to Windows, since the old shell script tricks would not have worked there. RevBy: Trust me
* Fixed memory restrictions not being passed on to elf2e32.axis2010-06-241-0/+7
| | | | | Task: QTBUG-11351 RevBy: Trust me
* Fix "missing store_build" errorsMiikka Heikkinen2010-06-231-0/+6
| | | | | | | | Create a dummy store_build target in projects that do not deploy anything when building for symbian-abld. Task-number: QTBUG-11656 Reviewed-by: Janne Koskinen
* Moved QT_PLUGINS_BASE_DIR and QT_IMPORTS_BASE_DIR to symbian.confMiikka Heikkinen2010-06-221-2/+0
| | | | | | | | | These definitions are not platform dependent as they must be exactly what configure sets for plugins and imports paths, so moved them out of data_caging_paths.prf into symbian.conf. Task-number: QTBUG-11619 Reviewed-by: axis
* Always add QtNetwork include path when linking with QtWebkit in SymbianMiikka Heikkinen2010-06-181-1/+2
| | | | | | | | | | Due to relative include problem with Symbian toolchains, it is necessary to have include/QtNetwork in systeminclude paths when there is #include <QtWebkit> statement in a source file, as QtWebkit header includes QtNetwork header. Task-number: QTBUG-11494 Reviewed-by: Janne Koskinen
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-161-0/+25
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Provide 'make unsigned_sis' target for Symbian mkspecs
| * Provide 'make unsigned_sis' target for Symbian mkspecsMiikka Heikkinen2010-06-161-0/+25
| | | | | | | | | | | | | | | | | | | | | | Rationale for this is that currently there is no simple way to create a sis package that can be properly signed via Symbian open signed mechanism, as 'make sis' will by default use self-signed certificates and automatically patch capabilities of binaries to remove non-self-signable ones. Task-number: QTBUG-11455 Reviewed-by: Janne Koskinen
* | Fix symbian building of TARGET with a slashThomas Zander2010-06-151-2/+2
|/ | | | | | | In case there is a slash in the target (for example; ../foo) then we don't want to add a faulty cxxflags to the compile line. Reviewed-by: Axis
* Added prependEpocroot replacement function to platform_paths.prfMiikka Heikkinen2010-06-141-1/+19
| | | | | | | | | | | | | | | | This function can be used to do smart prepending of epocroot to paths defined by platform_paths.prf, though it'll work for any string. This is useful because paths defined in platform_paths.prf can start either with full epocroot or just slash depending on environment. E.g. exists($$prependEpocroot($$MW_LAYER_PUBLIC_EXPORT_PATH(foobar.h))) { ... } Reviewed-by: Janne Koskinen
* Merge branch 'runonphone_targets' into 4.7-s60axis2010-06-111-5/+27
|\
| * Moved runonphone target to prf files for all build systems.axis2010-06-111-6/+23
| | | | | | | | | | | | This reduces code duplication. RevBy: Miikka Heikkinen
| * Fixed destdir not being defined.axis2010-06-101-0/+4
| | | | | | | | | | | | Local variables can't be counted upon between different profiles. RevBy: Trust me
| * Enable runonphone target for libraries as well.axis2010-06-101-2/+3
| | | | | | | | RevBy: Miikka Heikkinen
* | Fix recursive 'make sis' for symbian buildsMiikka Heikkinen2010-06-111-2/+13
|/ | | | | | | | | | | | | It makes no sense for 'sis' to depend on 'first' or really any target in symbian-abld and symbian-sbsv2 builds, as all builds are recursive anyway. Also do not generate real sis targets for projects that do not actually deploy anything, making the check equivalent to one in qmake for generating pkg files. Task-number: QTBUG-5312 Reviewed-by: Janne Koskinen
* Explicit EXPORTUNFROZEN will prevent default defBlock generationMiikka Heikkinen2010-06-102-2/+3
| | | | | | | If MMP_RULES contains EXPORTUNFROZEN, no DEFFILE statements should be generated to mmp files. Reviewed-by: Janne Koskinen
* Fixed DEPLOYMENT variable check in sis_targets.prfMiikka Heikkinen2010-06-091-1/+1
| | | | | | | Checking just for count can fail when default_deployment is replaced with single custom deployment item. Reviewed-by: Janne Koskinen
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-052-1/+4
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed def file usage for Qt plugins under the makefile build system. Fixed def file usage for the makefile build system on the SDK plugin.
| * Fixed def file usage for Qt plugins under the makefile build system.axis2010-06-042-1/+4
| | | | | | | | | | | | Previously it would not use the autogenerated def files. RevBy: Thomas Zander
* | Fixed unescaped backslashes in testcase.prfRohan McGovern2010-06-041-2/+2
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-032-35/+66
|\ \ | |/ |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Add a test for the `make check' feature. Fix `make check' for debug-and-release on Windows. Move `check' target for autotests into testcase.prf
| * Fix `make check' for debug-and-release on Windows.Rohan McGovern2010-06-021-2/+16
| |
| * Move `check' target for autotests into testcase.prfRohan McGovern2010-06-022-35/+52
| | | | | | | | | | testcase.prf is installed, thus allowing `make check' to work outside of the Qt source tree.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-282-4/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add missign license headers. Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian. Make link on linux/symbian Fix double slashes on few data caging paths Fix for QRuntimePixmapData serial number setting. Enable QTouchEvent for S60 5.0 Add missing license header. Fix build error on S60 3.1 environments QRuntimeGraphicsSystem Fix replacement functions in platform_paths.prf
| * \ Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-2717-44/+44
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/plugins/bearer/symbian/qnetworksession_impl.h
| * | | Fix double slashes on few data caging pathsMiikka Heikkinen2010-05-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QT_PLUGINS_BASE_DIR and QT_IMPORTS_BASE_DIR paths had double slash in front of them. Reviewed-by: Janne Koskinen
| * | | Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-215-1/+14
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: src/corelib/global/qglobal.h
| * | | Fix replacement functions in platform_paths.prfMiikka Heikkinen2010-05-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Clearing epocroot_prefix at the end of the file caused it to be empty at the time replacement functions were resolved. Reviewed-by: Janne Koskinen
* | | | fix escaping - by not using evalOswald Buddenhagen2010-05-271-3/+3
| |_|/ |/| | | | | | | | | | | the left-hand-side of qmake assignments is expanded, so there is no need to use eval.
* | | escape quotes meant for the shellOswald Buddenhagen2010-05-261-1/+1
| | |
* | | escape backslashesOswald Buddenhagen2010-05-2616-43/+43
| |/ |/| | | | | this makes windows-style path specs *ugly*. that's intentional. :-P
* | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-05-215-1/+14
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: My 4.6.3 changes. Added my 4.6.3 changes. My 4.6.3 changes. Add my 4.6.3 changes Fix WebKit version dependency in pkg files Add support for including module specific .pri files as part of qt.prf handling My changelog entries for 4.6.3 Add my changes to the 4.6.3 changes log my changelog for 4.6.3 Switch Symbian^3 QCursor implementation back to 5.0 way fix qmake -project once more
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-05-215-1/+14
| |\
| | * Fix WebKit version dependency in pkg filesSimon Hausmann2010-05-201-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to the Qt major/minor/patch version for WebKit, but use them only if it wasn't specified in mkspecs/modules/qt_webkit.pri, which is read by qt.prf Task-number: QTBUG-10847 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
| | * Add support for including module specific .pri files as part of qt.prf handlingSimon Hausmann2010-05-201-0/+3
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10847 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
| | * fix qmake -project once moreOswald Buddenhagen2010-05-183-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | default_pre.prf adds "uic" and "resources" to CONFIG, but not "qt". as a consequence, the former do not find qtPrepareTool(), as nobody includes qt_functions.prf if no qmake spec is loaded. Reviewed-by: joerg
* | | Merge commit 'remotes/origin/4.7' into symbian47Thomas Zander2010-05-199-32/+21
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_s60.cpp
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-05-191-2/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: removed test file, part of mediaservice removal. Rebuild configure.exe Rebuild configure following the removal of media services. More mediaservices removal work. Removed mediaservices.
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-182-16/+29
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/imports/multimedia/qdeclarativeaudio.cpp src/imports/multimedia/qdeclarativeaudio_p.h src/multimedia/mediaservices/mediaservices.pro src/plugins/mediaservices/mediaservices.pro src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h src/s60installs/s60installs.pro src/src.pro
| | * | | Removed mediaservices.Kurt Korbatits2010-05-181-2/+1
| | | | |
| * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-178-30/+20
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
| | * | fix regexpOswald Buddenhagen2010-05-141-1/+1
| | | |
| | * | define qtPrepareTool() function and use it throughoutOswald Buddenhagen2010-05-148-30/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the function provides a cross-platform way to determine the exact pathname of our build tools (moc, etc.). use it in our .prf files, so we don't have to rely on qmake's unreliable path separator normalization magic in extra compiler commands, which broke on mingw+sh in silent mode. remove the bootstrap tool path setting from configure, as it is redundant now. Reviewed-by: joerg Task-number: QTBUG-10633
* | | | Make the 'freeze' target work for linux/symbian.Thomas Zander2010-05-191-3/+3
| | | | | | | | | | | | | | | | | | | | Users can type 'make freeze' to get the def files updated right in the git source tree
* | | | Fix generation of stub sis filesShane Kearns2010-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert paths in DEPLOYMENT to the rom drive (z:) Filter out unwanted parts of the header (dependencies) Task-number: QTBUG-10118 Reviewed-by: Alessandro Portale
* | | | Re-enable suppression of --export_all_vtbl for static librariesIain2010-05-141-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert fix for QTBUG-10680 - the reasoning in the original fix was wrong. Internal typeinfo and vtable exports should be suppressed even for static libraries, as these will leak through into the final DLL when it links against that static lib (my testing at the time must have been faulty, as I thought I had found that they didn't). This change may cause problems if anyone has already frozen (internal) TI and VT symbols into their DEF files through linking with a static library. However, it should be perfectly safe to mark those symbols as ABSENT in the DEF file. An alternate solution must be found for QTBUG-10680. Task-number: QTBUG-10678 Reviewed-by: Alessandro Portale
* | | | Add 'runonphone' target for symbian / makefileThomas Zander2010-05-121-0/+9
|/ / / | | | | | | | | | | | | | | | This new target simply takes a sis file and runs the app on phone. Reviewed-by: Shane Kearns
* | | Run autotests with minimal capabilitiesShane Kearns2010-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autotests were previously run with ALL-Tcb capability which gives them more access to the filesystem etc. than a typical Qt application. To have more realistic testing environmnent, tests are run with no capabilities other than those required for the Qt APIs they use. i.e. NetworkServices for network tests, None for others. Reviewed-by: Liang Qi
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-031-15/+28
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enabled previously disabled Qt features. Fix includes so it compiles Use lowercase includes so it compiles in Linux too Fixed library dependency for Gnupoc. Removed the --export_all_vtbl from linking. Cleaned up the elf2e32 options a bit.
| * | Removed the --export_all_vtbl from linking.axis2010-05-031-2/+4
| | | | | | | | | | | | | | | | | | It causes wrong exports. This required rearranging some libraries to avoid undefined symbols.
generated by cgit v0.12 at 2025-02-01 10:49:55 (GMT)