summaryrefslogtreecommitdiffstats
path: root/mkspecs/common
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | | Add flag to indicate that network sessions are expected on a platform.Aaron McCarthy2010-03-181-3/+0
| | | | |
| | * | | Bugfix the Symbian implementationThiago Macieira2010-03-171-2/+2
| | | | |
* | | | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-1/+5
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | 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.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-1712-87/+184
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| * | Worked around case differences in Symbian^3 and Gnupoc.axis2010-03-166-0/+6
| | | | | | | | | | | | RevBy: Miikka Heikkinen
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-161-2/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-113-2/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
| * | | | Symbian doesn't have large file support currently, just turn it offThomas Zander2010-03-091-0/+2
| | | | |
| * | | | Merge branch 'defFilesAndMisc'axis2010-03-081-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian-makefile.conf mkspecs/symbian/features/symbian_building.prf
| | * | | | Added Symbian def file support to Linux build system.axis2010-03-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Make the symbian_building.prf be shared fileThomas Zander2010-03-021-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-022-13/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-011-2/+3
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-231-11/+11
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Make gcce xcompiler for symbian compile+link QtCoreThomas Zander2010-02-242-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves some stuff from the common to linux-armcc specific and updates the cloned gcce specs to do the right thing.
generated by cgit v0.12 at 2024-10-24 22:28:50 (GMT)