summaryrefslogtreecommitdiffstats
path: root/qmake/generators/symbian
Commit message (Collapse)AuthorAgeFilesLines
* Fixed pre-built resources deployment in SymbianMiikka Heikkinen2010-06-301-0/+14
| | | | | | | Pre-built resources didn't get properly copied under \epoc32\data\z. Task-number: QTBUG-11519 Reviewed-by: Janne Koskinen
* Fix precompiled binary deploymentMiikka Heikkinen2010-06-221-25/+28
| | | | | | | | Precompiled binaries were not copied under /epoc32/data/z to support deployment properly. Task-number: QTBUG-11519 Reviewed-by: Janne Koskinen
* Change $${EPOCROOT} to also have drive if EPOCROOT env variable has itMiikka Heikkinen2010-06-152-4/+3
| | | | | | | Since sbsv2 toolchain supports having sources and SDK on different drives, $${EPOCROOT} needs to contain drive letter to make it work. Reviewed-by: Jason Barron
* Moved runonphone target to prf files for all build systems.axis2010-06-114-19/+0
| | | | | | This reduces code duplication. RevBy: Miikka Heikkinen
* Change the directory where smart-installable application package isMiikka Heikkinen2010-06-081-1/+1
| | | | | | | | | For security reasons, it is better to install application packages into the private directory of the smart installer rather than a public directory. Task-number: QTBUG-11288 Reviewed-by: Aleksandar Sasha Babic
* Fixed def file usage for Qt plugins under the makefile build system.axis2010-06-045-37/+40
| | | | | | Previously it would not use the autogenerated def files. RevBy: Thomas Zander
* Fix build break in SymbianMiikka Heikkinen2010-05-192-2/+2
| | | | | | | | | | | Fix this makefile syntax error when building Qt from root: "makefile:60: *** target pattern contains no `%'. Stop." Break was caused by having absolute path in $(MAKEFILE) variable, which broke subdir targets. Reviewed-by: Janne Koskinen
* Fix pkg_prerules handling for installer packagesMiikka Heikkinen2010-05-181-5/+0
| | | | | | | | | The removed check was causing dropping of vendor info from installer package files. No need to check for header in rawPkgPreRules as it would never get there in the first place; it gets placed into headerRules instead. Reviewed-by: Shane Kearns
* Fix generation of stub sis filesShane Kearns2010-05-141-14/+69
| | | | | | | | 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
* Shadow building on Symbian fixes: part 1 - files to right placeIain2010-05-143-16/+14
| | | | | | | | | First in a set of fixes for shadow building on Symbian - make sure we generate all the files into the shadow directory, *not* the source directory Task-number: QTBUG-10432 Reviewed-by: Miikka Heikkinen
* Fix requires keyword handling in qmake in SymbianMiikka Heikkinen2010-05-141-0/+6
| | | | | | | | Now qmake doesn't generate bld.inf etc. files for projects that fail requires check. An error message is also printed. Task-number: QTBUG-10698 Reviewed-by: Iain
* Fix path removal from target in Symbian buildsMiikka Heikkinen2010-04-301-3/+6
| | | | | | | Qt generic slash separator must be supported also in platforms that do not have that as platform specific separator. Reviewed-by: Thomas Zander
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-151-1/+3
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Shouldn't call epocRoot() in non-epoc builds in generatePkgFile
| * Shouldn't call epocRoot() in non-epoc builds in generatePkgFileMiikka Heikkinen2010-04-151-1/+3
| | | | | | | | Reviewed-by: Janne Koskinen
* | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-04-151-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Provide overview for Symbian capabilities. Fix QNX screen initialization tst_qftp: Attempting to reproduce a crash QNAM HTTP: Do not pipeline with WebLogic servers Autotest: update path location on the test server Autotest: update location of fluke.gif on test server Make qsTr work in global scope Not possible to show selected text in virtual keyboard Fix typos, there is no QT_NO_SSL Export .flm files always if they are different Make qmake possible to build with mingw using qmake.pro QS60Style: Single Click UI support for SD 9.2 time-box
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-141-1/+1
| |\ | | | | | | | | | | | | Conflicts: src/script/api/qscriptengine.cpp
| | * Export .flm files always if they are differentMiikka Heikkinen2010-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are valid cases where Qt .flm files found under /epoc32/tools/makefile_templates/qt/ have newer timestamp than those in Qt repo one is developing against but still need to be overwritten, so always export .flm files when the timestamp is different instead of just when the files to be exported are newer. Task-number: QT-3253 Reviewed-by: TrustMe
* | | Fixed installer_sis target for 4.7Miikka Heikkinen2010-04-141-4/+24
|/ / | | | | | | | | | | | | | | Due to pkg file generation refactoring in 4.7, these fixes hadn't been ported from 4.6 to 4.7 previously. Task-number: QTBUG-9864 Reviewed-by: Janne Koskinen
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-122-110/+62
|\ \ | |/ | | | | | | | | | | 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-122-110/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-015-10/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
| * | Cleanup the deployment codeThomas Zander2010-03-315-10/+8
| | | | | | | | | | | | | | | Remove local defines and passing of a list while its never used, only define it where its actually used.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-301-2/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits) Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct. qdoc: Added <div> elements to some html output for class references. Fix compile error on mingw. MONILITY-645 Do not override alternate background color in Plastique Fix QComboBox ignoring foreground role in some styles Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined Fix compilation with Sun CC: Ensure that we return QPair<long,long> in all cases. Update PLATFORM(SPARC64) to CPU(SPARC64) jui files are no c++ ... scan some more file types by default Support EtchDisabledText with spin box on Windows style QNAM HTTP: Fix invoking a method when being destructed right now Fixed a typo in the QDoubleValidotor doc. Trivial fix to JavaScriptCore to fix building with MSVC 2010 Autotest: oops, fix oops: remove qguard from auto.pro Autotests: oops, remove last traces of QGuard Remove QGuard. Unskip test that used to crash ...
| * | Compile on Maemo 5Harald Fernengel2010-03-261-2/+3
| | | | | | | | | | | | | | | | | | qmake for Maemo 5 needs to be bootstrapped with an older gcc, which doesn't like foreach() in templates. Use a traditional for loop to iterate over the container instead.
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-292-12/+43
|\ \ \ | |/ / |/| / | |/ | | | | | | 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-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-12/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Changed Symbian pkg files to deploy from under epoc32Miikka Heikkinen2010-03-231-3/+18
| | | | | | | | | | | | | | | | | | | | Since the build process copies everything that is deployed using DEPLOYMENT variable under epoc32 somewhere, pkg files might as well look for the files from there. This can be useful for binary releases if the release needs to be repackaged. Task-number: QT-3147 Reviewed-by: Janne Anttila
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-03-182-0/+4
|\ \ | |/ | | | | | | Conflicts: qmake/generators/symbian/symmake_abld.cpp
| * Fixed recursive QMAKE_EXTRA_TARGETS for symbian makefiles.Rohan McGovern2010-03-182-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | When using recursive QMAKE_EXTRA_TARGETS, qmake will use CHK_DIR_EXISTS and MKDIR when ensuring each subdir has a Makefile created. These previously weren't defined for Symbian. Note that this problem was hidden in most cases, because a `qmake -r' would have created the necessary makefiles already. The problem is revealed when a .pro file does SUBDIRS+=foo.pro and foo.pro is also a subdirs project. Reviewed-by: Michael Goddard
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-179-834/+1093
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (192 commits) Fix dependency so it works also on massive parrallel systems This should likely get webkit linking again on windows/sbsv2 Fixed Symbian applications with DESTDIR set. Removed a warning about generated rss files. Revert "Temporarily disable problematic dll." Fixed "Cannot install protected application" message on Symbian. Worked around a crash in the elf2e32 postlinker tool. Worked around case differences in Symbian^3 and Gnupoc. Enabled compilation of plugins again. Fixed a building bug where the DLL entry point was undefined. Moved UID2 processing from cpp code to profiles. Added rpp and rsg files to ignore filter. Moved two profiles to the correct directory. Fix build break caused by undefined symbol SetDialogPreference Temporarily disable problematic dll. Use the same concept for per-lib tweaks as armcc Consistently use the * in configure Symbian doesn't have large file support currently, just turn it off Remove largefile config test Make sure that we have all compile flags available always ...
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-165-15/+80
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/embedded/anomaly/anomaly.pro demos/embedded/flightinfo/flightinfo.pro demos/embedded/lightmaps/lightmaps.pro demos/embedded/weatherinfo/weatherinfo.pro examples/network/fortuneclient/fortuneclient.pro examples/network/fortuneserver/fortuneserver.pro examples/network/network-chat/network-chat.pro mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/platform_paths.prf qmake/generators/symbian/symmake.cpp qmake/generators/symbian/symmake.h src/s60installs/s60installs.pro
| * | | Moved UID2 processing from cpp code to profiles.axis2010-03-151-17/+1
| | | | | | | | | | | | | | | | | | | | | | | | This enables it to be used by all Symbian build systems. RevBy: Miikka Heikkinen
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-114-3/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
| * | | | Fix src!=build issueThomas Zander2010-03-041-1/+2
| | | | |
| * | | | Corrected a mismerge by Git.axis2010-03-011-1/+1
| | | | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-018-103/+142
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/symbian/symbian.conf qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.cpp qmake/generators/symbian/symmake_sbsv2.cpp src/plugins/plugins.pro
| * | | | | Removed restrictions on file names from the Symbian makefile system.axis2010-02-264-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spaces in filenames still won't work, but that is very tricky to fix because you cannot escape filenames inside the QMAKE_EXTRA_COMPILERS section. Task: QTBUG-8555
| * | | | | Fixed a bug where the library extension would be embedded in pkg nameaxis2010-02-251-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake is a bit inconsistent in what it assigns to QMAKE_ORIG_TARGET and TARGET, so we need to cope with the case where QMAKE_ORIG_TARGET contains the proper target name and also when TARGET contains it.
| * | | | | Added missing header after merge with master.axis2010-02-231-0/+3
| | | | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-236-152/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/symbian/qt.prf qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/generators/symbian/initprojectdeploy_symbian.cpp src/src.pro
| * | | | | | Fixed copy/paste error after commit a31e40295d.axis2010-02-231-1/+1
| | | | | | |
| * | | | | | Prevented pkg generation unless there are files to deploy.axis2010-02-221-1/+17
| | | | | | |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2010-02-195-134/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-with-qt-master Conflicts: qmake/generators/symbian/symmake.cpp
| * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2010-02-181-12/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-with-qt-master Conflicts: mkspecs/common/symbian/symbian.conf qmake/Makefile.unix qmake/generators/makefile.cpp
| * \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-162-18/+75
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/application_icon.prf qmake/generators/makefile.cpp qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake.cpp tools/assistant/tools/assistant/assistant.pro
| * \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-125-36/+157
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.cpp qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro Conflict resolution was heavily based on manual application of commit 9cc4ae77a73bd28ff495f36f26dd87c78b76b976.
| * | | | | | | | | | Made some changes after code review.axis2010-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed makefile generator name to SYMBIAN_UNIX, to be more in line with the other generators. - Explained the reason for avoiding virtual inheritance in a bit more detail. - Removed an unnecessary string replacement. - Fixed the location of s60 plugins for MMP based generators. RevBy: Miikka Heikkinen
| * | | | | | | | | | More src!=builddir fixes for symbian makefile generatorThomas Zander2010-02-111-3/+10
| | | | | | | | | | |
| * | | | | | | | | | Place the generated pkg file in the build dir.Thomas Zander2010-02-101-3/+3
| | | | | | | | | | |
generated by cgit v0.12 at 2024-12-02 10:21:53 (GMT)