summaryrefslogtreecommitdiffstats
path: root/mkspecs/common
Commit message (Collapse)AuthorAgeFilesLines
* Add libinfix support for QML plugins in Symbian.Miikka Heikkinen2010-12-091-1/+1
| | | | | Task-number: QTBUG-14736 Reviewed-by: Alessandro Portale
* Updated language map in localize_deployment.prfMiikka Heikkinen2010-11-291-1/+5
| | | | | | | | 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
* Fix symbian-mmp.conf include pathMiikka Heikkinen2010-11-221-2/+2
| | | | | | | | 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-123-11/+145
| | | | | | | | | | | | | | | | | | | 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
* Started using qtmain.lib for all Qt applications, also corelib ones.axis2010-11-081-1/+4
| | | | | | | | | | | 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-081-1/+1
| | | | | | | | | | | | | | | | | 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-051-2/+1
| | | | | | | 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-041-1/+2
| | | | | | | | | 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
* 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>
* Fixed missing QMAKE_MOC definition in certain mkspecs.axis2010-10-082-10/+8
| | | | | | | Also removed the use of DIR_SEPARATOR. It does not get defined until after symbian.conf has finished parsing. RevBy: Miikka Heikkinen
* Improved Symbian4 platform detectionMiikka Heikkinen2010-09-231-26/+36
| | | | | | | | | | Now returns correct value for Symbian4 platforms with QSysInfo::symbianVersion(). SYMBIAN_VERSION .pro file variable should also return correct value even if it doesn't get set in environment.prf. Task-number: QTBUG-13802 Reviewed-by: Shane Kearns Reviewed-by: Janne Anttila
* Add breakpad supportMarco Bubke2010-09-202-0/+5
| | | | | | | | | | Breakpad is a portable crash handler. It sends the raw crash information to a server for analysis. This analysis needs debug information. Consequently, we compile with debug info even in release mode if qt-breakpad integration is requested (via an environment variable). Reviewed-by: ossi
* Load environment.prf from Symbian SDK if it exists thereMiikka Heikkinen2010-09-171-22/+33
| | | | | | | | Environment.prf can contain SDK specific variable settings such as SYMBIAN_VERSION. Task-number: QT-3949 Reviewed-by: Janne Koskinen
* Fixes for QMAKE_EXTRA_* variable handling in symbian-sbsv2Miikka Heikkinen2010-09-061-0/+12
| | | | | | | | | | | | | | | - No longer require PRE_TARGETDEPS items to be absolute, which was difficult to achieve sometimes as qmake doesn't provide method for absolutizing paths. - Do smart command replacement for commands containing $$QMAKE_* command variables, such as $$QMAKE_COPY, when generating bld.inf extensions for QMAKE_EXTRA_* variables. $$QMAKE_* command variables cannot be passed to sbsv2 toolchain directly, as it uses cygwin in windows, and they can't simply be replaced to use sbsv2 equivalents in symbian.conf, because generated wrapper makefiles need them to be Windows compatible. Reviewed-by: axis
* Fix Symbian handling of projects with special characters in TARGETMiikka Heikkinen2010-09-031-0/+18
| | | | | | | | | Plenty of filenames got generated with spaces which didn't work as that was not taken into account. Harmonized TARGET fixing across prf files and qmake Symbian generator code. Task-number: QTBUG-13363 Reviewed-by: Thomas Zander
* QT_PLUGINS_BASE_DIR needs to be defined after load(qt_config)Miikka Heikkinen2010-09-011-1/+2
| | | | | | | QT_LIBINFIX is defined in qconfig.pri, so qt_config needs to be loaded before that is used. Reviewed-by: TrustMe
* Introduce QtOpenGL module for Symbian.Jani Hautakangas2010-08-201-1/+6
| | | | | Task-number: QT-2139 Reviewed-by: Gunnar Sletta
* Added SYMBIAN_VERSION variable to qmake.axis2010-08-031-3/+17
| | | | | | | In addition, made Symbian^3 detection depend on libstdcppv5, which seems like the only option in the public Symbian^3 PDK. RevBy: Miikka Heikkinen
* Moved the S60 version detection to the common symbian profile.axis2010-08-032-18/+19
| | | | RevBy: Trust me
* Fixed additional case differences between Gnupoc and Symbian^3.axis2010-07-307-1/+12
| | | | RevBy: Trust me
* Fixed automatic sqlite extraction on Symbian makefile build system.axis2010-07-211-0/+1
| | | | | | | | Since we cannot extract to the epocroot (it is considered R/O), we extract the header and the dso to the temporary build directories and include them from there. RevBy: Trust me
* Avkon removal configured with -no-s60mread2010-07-011-2/+2
| | | | | | | | | | | | | | | | Avkon dependencies can be configured out with the -no-s60 configure flag, conversely Qt on Symbian will use Avkon if -s60 is configured. These changes are intended to keep or introduce binary compatibility between the s60 and no-s60 configurations. To do this, it has been necessary to introduce stub equivalents of the CAknAppUi related classes into the no-s60 configuration, and override all Avkon framework virtual functions in the QS60Main... classes. Other than that, these changes are mostly just correcting the use of the Q_WS_S60 flag so that it only refers to Avkon dependencies. Reviewed-by: Sami Merila
* Change the files to camelcase as avkon now does thatThomas Zander2010-06-257-0/+8
| | | | | | | In older avkon solutions all headers were lowercase in newer they are CamelCase... Reviewed-by: Axis
* Fixed memory restrictions not being passed on to elf2e32.axis2010-06-241-2/+0
| | | | | Task: QTBUG-11351 RevBy: Trust me
* Moved QT_PLUGINS_BASE_DIR and QT_IMPORTS_BASE_DIR to symbian.confMiikka Heikkinen2010-06-221-0/+5
| | | | | | | | | 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
* Moved runonphone target to prf files for all build systems.axis2010-06-112-2/+1
| | | | | | This reduces code duplication. RevBy: Miikka Heikkinen
* Fixed S60_VERSION variable exists checksMiikka Heikkinen2010-06-031-8/+14
| | | | | | | | Apparently else:exists(xxx)|exists(yyy) syntax doesn't work as I originally expected if both xxx and yyy exist, so change the check to use nested exists. Reviewed-by: Jason Barron
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-032-8/+11
|\ | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Avoid mmap() on symbian os Fix Qt.sis content for Symbian^3 builds
| * Fix Qt.sis content for Symbian^3 buildsMiikka Heikkinen2010-06-022-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | Some build-time omissions from Qt_template.pkg are done, so qt.sis built on Symbian^3 will not work properly on most S60 3.x & 5.0 devices. This should not be an issue, as Symbian^3 builds are expected to be configured to use OpenVG anyway. If necessary, it is still possible to build Qt.sis compatible with older platforms also on Symbian^3 if you fake the S60 version when calling qmake, e.g.: 'qmake S60_VERSION=5.0' Reviewed-by: Shane Kearns
* | Make sure we don't pull inn /usr/X11 stuff in the qws mkspek confJørgen Lind2010-06-011-0/+4
|/ | | | Reviewed-by: paul
* escape backslashesOswald Buddenhagen2010-05-262-4/+4
| | | | this makes windows-style path specs *ugly*. that's intentional. :-P
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-141-0/+1
|\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update Symbian DEF files for WINSCW and EABI Fix spurious mouse click when dismissing a native menu Add 'runonphone' target for symbian / makefile Double-click support for virtual cursor in Symbian
| * Add 'runonphone' target for symbian / makefileThomas Zander2010-05-121-0/+1
| | | | | | | | | | | | This new target simply takes a sis file and runs the app on phone. Reviewed-by: Shane Kearns
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-121-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (158 commits) qdoc: Yet another revision of the top doc page. Doc: Update on web template Added QDateTime::msecsTo() Doc: Fixed tables and images for the new docs qdoc: Yet another revision of the top doc page. Revert "Improve QUrl handling of local file paths" Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively" Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to" Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs." qdoc: Another revision of the top doc page. Doc correction to css Doc: Updates to the html template and javascript tst_SuiteTest: Fix a meaningless switch statement My 4.7.0 changelog entries. qdoc: Fixed annotated list generation to use <td>, not <th>. Doc: Tuning search script qdoc: Reorganized examples panel. Doc: Chages to search feature, css and table order QtDeclarative: avoid waiting for a network load on URIs with empty schemes. QtDeclarative: RFC 3986 requires schemes to be considered case-insensitively ...
| * Support updating system locale data on SymbianDenis Dzyubenko2010-05-031-1/+1
| | | | | | | | | | | | | | | | | | Subscribing to the locale change notification to be able to update the system locale whenever the user changes the current system locale. Task-number: QTBUG-4870 Reviewed-by: Thomas Zander Reviewed-by: Jason Barron
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-031-1/+7
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | 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.
| * Cleaned up the elf2e32 options a bit.axis2010-05-031-1/+7
| |
* | s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/Oswald Buddenhagen2010-04-305-5/+5
|/ | | | Reviewed-by: joerg
* Fix default_deployment.pkg_prerulesMiikka Heikkinen2010-04-202-11/+18
| | | | | | | | Due to Symbian mkspecs refactoring, some changes from 4.6 didn't get properly merged into 4.7. Task-number: QTBUG-10050 Reviewed-by: Janne Koskinen
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-121-1/+1
|\ | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/gui/image/qimage.cpp src/openvg/qwindowsurface_vgegl.cpp
| * Improved support for OPTION and LINKEROPTION statements in MMP filesMiikka Heikkinen2010-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VERSION_FLAGS.<keyword> can now be used for all compilers and not just armcc, and version flagging can now be used with QMAKE_LFLAGS as well as QMAKE_CXXFLAGS. Also, MMP_OPTION_KEYWORDS variable is used to define supported keywords for OPTION and LINKEROPTION statements, which are defined via QMAKE_CXXFLAGS.<keyword> and QMAKE_LFLAGS.<keyword> variables. This improves flexibility in the future if new keywords need to be supported. Task-number: QTBUG-8685 Reviewed-by: Janne Koskinen
* | Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-301-7/+0
|\ \ | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/3rdparty/webkit/WebCore/WebCore.pro
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-251-5/+2
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp
| * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-251-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
* | \ \ \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-291-1/+10
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| * | | Enable armcc version specific compler options for SymbianMiikka Heikkinen2010-03-261-1/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VERSION_FLAGS.ARMCC variable is used in symbian.conf to define supported armcc compiler version flags. Values given to this variable must be directly usable as ifdef flags in mmp. QMAKE_CXXFLAGS.<version flag> variables can now be used to add compiler options to specific compiler versions. Note that options added via QMAKE_CXXFLAGS.ARMCC flag will apply to all versions of armcc compiler. Task-number: QTBUG-8685 Reviewed-by: Iain
| * | Made it possible to define more than one language using pkg_prerulesMiikka Heikkinen2010-03-241-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pkg statements were generated in invalid order if user used pkg_prerules to redefine languages supported by the pkg file. Also made it possible to override dependency statements autogenerated for Qt and QtWebkit, as these statements need to be user defined in case of multiple languages. Defining the following in .pro removes all dependencies from pkg rules: default_deployment.pkg_prerules -= \ pkg_depends_webkit \ pkg_depends_qt \ pkg_platform_dependencies Task-number: QTBUG-9279 Reviewed-by: Janne Anttila
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-221-5/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (78 commits) Moc: Add support for rvalue references in signals and slots. Add support for polyphonic greek Fix build failure on WinCE. Autotests: if you use X11 libs, you must link to X11 libs explicitly. Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x Compile Phonon in C++0x mode. Compile Qt in C++0x mode. Avoid a data relocation by not trying to store a pointer in the .data section of plugins. Fix cast-from-ascii warning Fix compilation on Linux Fix compilation with WINSCW: #include doesn't find files in the same dir Rename m_volume to m_vol Add 2 signals, introduce side widget, make it possible to reset startId Do not create native window handle just because a parent has one. Tab color fix for document mode on Snow Leopard. Revert "Don't emit open signal on session close/error." Rename networkAccess property to networkAccessible. Don't emit open signal on session close/error. Rename private signal. Autotest: fix instability by accepting rounding errors ...
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-211-5/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (75 commits) Autotests: if you use X11 libs, you must link to X11 libs explicitly. Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x Compile Phonon in C++0x mode. Compile Qt in C++0x mode. Avoid a data relocation by not trying to store a pointer in the .data section of plugins. Fix cast-from-ascii warning Fix compilation on Linux Fix compilation with WINSCW: #include doesn't find files in the same dir Rename m_volume to m_vol Add 2 signals, introduce side widget, make it possible to reset startId Do not create native window handle just because a parent has one. Tab color fix for document mode on Snow Leopard. Revert "Don't emit open signal on session close/error." Rename networkAccess property to networkAccessible. Don't emit open signal on session close/error. Rename private signal. Autotest: fix instability by accepting rounding errors Dont force height for filter widget - Fix importdir option on unix/linux configure Remove incorrect semi-colons after Q_PROPERTY ...
| | * \ Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-1912-87/+184
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
generated by cgit v0.12 at 2024-11-05 19:30:59 (GMT)