summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6-s60' into 4.7-s60axis2010-03-224-4/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe mkspecs/common/symbian/symbian.conf src/gui/graphicsview/qgraphicswidget.h src/gui/kernel/qapplication.cpp src/gui/text/qtextlayout.cpp src/openvg/qpixmapdata_vg.cpp src/s60installs/s60installs.pro tools/runonphone/main.cpp tools/runonphone/serenum_unix.cpp qtextlayout.cpp fixed up together with Eskil. Kept the configure.exe from 4.7 without recompile.
| * Change fromSymbianRSgImage() to use the newer version of RSgImageJason Barron2010-03-191-1/+5
| | | | | | | | | | | | | | | | | | Symbian have changed the implementation of RSgImage to be more lightweight and have moved it to a new library. This patch changes Qt's usage of RSgImage to the new version and fixes some minor code style issues. Reviewed-by: Aleksandar Sasha Babic
| * Useful support for -qtlibinfix configure parameter in SymbianMiikka Heikkinen2010-03-183-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure parameter -qtlibinfix will now change also plugin names of plugins built and installed with Qt in Symbian. Default plugin path is changed to: /resource/qt<libinfix>/plugins. Other plugins besides the ones installed with Qt are not renamed. With infixed configuration, Qt can be installed on a phone that already has a Qt installed on ROM without interfering with the ROM version of Qt. Note that since s60main.rsc resource cannot deployed with infixed Qt, and infixing it is somewhat problematic, currently the phone needs to have proper Qt installation, too, for infixed Qt to work. It also means that any changes to Qt that would affect s60main.rsc cannot be tested on real device using infixed builds. Since this file is unlikely to need changing, this should not be a big problem. Task-number: QTBUG-9065 Reviewed-by: Jani Hautakangas
* | Switched out QT_SOURCE_TREE, which is not defined for user apps.axis2010-03-221-1/+1
| |
* | Moved QMAKE_MOC etc. variable declarations after symbian.conf inclusionMiikka Heikkinen2010-03-191-7/+8
| | | | | | | | | | | | | | | | $${DIR_SEPARATOR} wasn't yet declared in the previous place. This was only a problem for projects built outside Qt tree, as .qmake.cache also redefined these variables. Reviewed-by: axis
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-03-181-0/+2
|\ \ | |/ | | | | | | Conflicts: qmake/generators/symbian/symmake_abld.cpp
| * Make sure target path exists in qmake_extra_pre_targetdep.flmMiikka Heikkinen2010-03-161-0/+2
| | | | | | | | | | | | | | | | | | | | Since newer versions of Raptor delete all empty parent directories when cleaning up the files, qmake created moc output directories get also deleted when sbs clean is invoked. Fixed by always creating the extra compiler target directory during build. Task-number: QTBUG-6795 Reviewed-by: Janne Koskinen
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-1733-357/+1021
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (190 commits) 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 Enabled dependencies for .dso and .lib libraries only. Switched to using DEF_FILE, which is the official variable. ...
| * | Fixed Symbian applications with DESTDIR set.axis2010-03-161-1/+1
| | |
| * | Removed a warning about generated rss files.axis2010-03-162-28/+53
| | | | | | | | | | | | | | | | | | Also cleaned up the "clean" and "distclean" targets a bit. Task: QTBUG-8854
| * | Worked around case differences in Symbian^3 and Gnupoc.axis2010-03-168-0/+21
| | | | | | | | | | | | RevBy: Miikka Heikkinen
| * | Enabled compilation of plugins again.axis2010-03-162-0/+2
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-165-57/+134
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fixed a building bug where the DLL entry point was undefined.axis2010-03-153-2/+3
| | | |
| * | | Moved UID2 processing from cpp code to profiles.axis2010-03-151-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | This enables it to be used by all Symbian build systems. RevBy: Miikka Heikkinen
| * | | Moved two profiles to the correct directory.axis2010-03-112-0/+0
| | | | | | | | | | | | | | | | This gets applications building again.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-1174-3/+83
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
| * | | | Use the same concept for per-lib tweaks as armccThomas Zander2010-03-091-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the compiler specific options in gui.pro and WebCore.pro are only for the mmp based build systems. Lets make that clear and mark them as such.
| * | | | Symbian doesn't have large file support currently, just turn it offThomas Zander2010-03-091-0/+2
| | | | |
| * | | | Make sure that we have all compile flags available alwaysThomas Zander2010-03-097-46/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users may do a CONFIG -= qt which means that the qt.prf won't be loaded. So, lets make sure we don't have any critical properties in those files.
| * | | | Enabled dependencies for .dso and .lib libraries only.axis2010-03-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for .lib files, as well as removes support for all others than .dso and .lib. This builds on the original commit bdff51768dfe.
| * | | | Merge branch 'defFilesAndMisc'axis2010-03-083-48/+123
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian-makefile.conf mkspecs/symbian/features/symbian_building.prf
| | * | | | Added Symbian def file support to Linux build system.axis2010-03-083-26/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also switches the official def file variable in qmake profiles to DEF_FILE. Support for freezing def files was also added, but needs more work and is therefore disabled for now. Task: QTBUG-7510 Task: QTBUG-8052
| | * | | | Enabled conditional updating of dso files.axis2010-03-021-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves rebuilding of components that depend on the current one, by not updating the dso file unless it has changed.
| | * | | | Added dso dependencies to Symbian targets.axis2010-03-021-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required for correct intermodule building when def files are off, since otherwise the ordinals present in the DLLs and the ordinals linked to may be different. In layman's terms: If you build QtCore, QtGui will also trigger rebuilding as a result of that.
| | * | | | Reversed order of user QMAKE_POST_LINK statements and generated ones.axis2010-03-021-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the users' statements would run before the binary was fully linked.
| * | | | | Make the symbian_building.prf be shared fileThomas Zander2010-03-027-251/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the fork I made for gcce is similar enough to now be shared between gcce and armcc so move stuff around a bit to avoid the code duplication.
| * | | | | Merge branch 'master' into gcceThomas Zander2010-03-0219-242/+205
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-019-17/+73
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Corrected a wrong comment.axis2010-02-261-1/+1
| | | | | | |
| | * | | | | Removed restrictions on file names from the Symbian makefile system.axis2010-02-262-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-238-218/+125
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Properly get the paths for the compiler-provided libsThomas Zander2010-03-022-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I call g++ to tell me the library paths for the compiler so I can pass that on to ld. I'm a bit confused why this is needed, need to find out if thats expected behavior for gcce
| * | | | | | | Make per-library settings for the gcce linker/compilerThomas Zander2010-02-253-15/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The defaults are apparently not all that useful in gcce as elf2e32 doesn't like the stuff generated with them. So provide some defaults and make a simple structure to set the gcce-only defaults in one place. The qmake.conf for this mkspec
| * | | | | | | Found a way to not hardcode the paths for dso / lib filesThomas Zander2010-02-252-5/+5
| | | | | | | |
| * | | | | | | Make gcce xcompiler for symbian compile+link QtCoreThomas Zander2010-02-247-27/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves some stuff from the common to linux-armcc specific and updates the cloned gcce specs to do the right thing.
| * | | | | | | Clone the symbian/armcc mkspec for symbian/gcce. Very first start.Thomas Zander2010-02-248-14/+271
| |/ / / / / /
| * | | | | | Implemented recursive "sis" target and enabled sis_targets feature.axis2010-02-233-125/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sis target will depend on the main build target of each project, which should make it possible to simply run "make sis" in the root of a clean tree (after configure, of course), and have sis packages generated for everything. It works at least for Qt. This required some changes to the dependency generation in Qt, to make sure that s60installs builds its package after all of Qt, and that fluidlauncher has all the required files before building a package. In addition, all the sis target code was moved into its own qmake feature file, called sis_targets. It is currently enabled by default for Symbian.
| * | | | | | Enabled the "make sis" target with the Symbian makefile build system.axis2010-02-191-74/+88
| | | | | | |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2010-02-1913-4/+124
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1810-604/+18
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-with-qt-master Conflicts: mkspecs/common/symbian/symbian.conf qmake/Makefile.unix qmake/generators/makefile.cpp
| * | | | | | | | No need to specialize for this compiler, just include the common one.Thomas Zander2010-02-161-167/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-1675-3265/+1071
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/qt-s60-public into master-s60axis2010-02-161-1/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| * | | | | | | | | | Fixed binary capability assignment on Symbian.axis2010-02-161-8/+6
| | | | | | | | | | |
| * | | | | | | | | | Make sure that repeatedly calling 'make' doesn't repeatedly linkThomas Zander2010-02-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On symbian a target is forcebly called ${TARGET}.exe, so when make checks for the existence on the filesystem for ${TARGET} it can't find it and links again. Avoid this by hardlinking ${TARGET} to ${TARGET}.exe
| * | | | | | | | | | Fix capabilities forwarding for symbian/linuxThomas Zander2010-02-151-5/+9
| | | | | | | | | | |
| * | | | | | | | | | Properly clean out generated files.Thomas Zander2010-02-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rsc files are generated for the symbian build system out of rss files and end up going onto the device (much like the .exe), so we keep them around on 'make clean' but remove them on distclean.
| * | | | | | | | | | Pass in capabilities from .pro file to the symbian systemThomas Zander2010-02-121-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8055
| * | | | | | | | | | Fix syntax passed to isEmpty for QMAKE_POST_LINKThomas Zander2010-02-121-2/+2
| | | | | | | | | | |
generated by cgit v0.12 at 2024-11-15 22:48:25 (GMT)