summaryrefslogtreecommitdiffstats
path: root/src/s60installs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-306-3/+48
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix desktopservices demo missing icon in Symbian Fix path removal from target in Symbian builds Fix compilation errors in tst_qfileinfo Symbian (installation) docs. Make 'make sis' recursive again. Fix libinfix usage Make symbian-resource files aware of libInfix configure feature Update symbian def files for 4.7 Correction to EGL stub implementation Fix 'make sis' when media services is disabled and multimedia is not
| * Update symbian def files for 4.7Shane Kearns2010-04-285-3/+45
| | | | | | | | Reviewed-by: Trust Me
| * Fix 'make sis' when media services is disabled and multimedia is notThomas Zander2010-04-281-0/+3
| | | | | | | | These two libs are separately configurable so we should check individually
* | S60 mediaservices backendhawcroft2010-04-291-1/+7
|/ | | | Reviewed-by: Justin McPherson
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-2611-73/+119
|\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: DEF file updates for BWINS and EABI for Symbian Fix typo Revert "Add QML imports to s60installs.pro" Assigned a UID3 to qml.exe.
| * DEF file updates for BWINS and EABI for SymbianIain2010-04-2610-54/+119
| | | | | | | | Reviewed-by: TrustMe
| * Revert "Add QML imports to s60installs.pro"Thomas Zander2010-04-261-19/+0
| | | | | | | | | | | | This reverts commit e1b1b11afbddbe260d4de61f20181ffd3b941996. Seems this was not tested, it doesn't work.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-245-1358/+1358
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (27 commits) Remove trace code from directshowaudioendpointcontrol.h. New configure.exe binary Add support for MSBuild, which is the project format for MSVC 2010 Only add qvideowidget test once. Multimedia causes build failure when Qt is configured with -embedded Player demo: load not only local files but playlists and urls passed as Gstreamer media backend: preserve playback rate after seeks and media QT7 mediaservice; fix leaking strings. Fixed Qt build with mediaservices disabled. Multimedia tests; fix for missing dependency Disabled QMediaPlayer states debug output. Fixed typo in QMediaPlayer::play() error reporting Fixed QVideoWidget test, waiting for video surface painted. Tests; Fix media tests, make sure they are using mediaservies. Fix warning about illegal empty declaration. Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-235-1358/+1358
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (27 commits) Remove trace code from directshowaudioendpointcontrol.h. New configure.exe binary Add support for MSBuild, which is the project format for MSVC 2010 Only add qvideowidget test once. Multimedia causes build failure when Qt is configured with -embedded Player demo: load not only local files but playlists and urls passed as Gstreamer media backend: preserve playback rate after seeks and media QT7 mediaservice; fix leaking strings. Fixed Qt build with mediaservices disabled. Multimedia tests; fix for missing dependency Disabled QMediaPlayer states debug output. Fixed typo in QMediaPlayer::play() error reporting Fixed QVideoWidget test, waiting for video surface painted. Tests; Fix media tests, make sure they are using mediaservies. Fix warning about illegal empty declaration. Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-185-1358/+1358
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. QtMediaservices -> QtMediaServices. configure; Fixes for changes to use mediaservices. Fixed compile errors in pulseaudio backend for soundeffect Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d Fixed compile errors with gstreamer plugin Create Mediaservices lib, separate from Multimedia. Gstreamer media backend: seek to media start on end of stream.
| | | * Three fixes from Shane after QtMultimedia was split into two dlls.Espen Riskedal2010-04-165-1358/+1358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix1: QtMultimedia to get .def files from the correct location multimedia was split into 2 subdirectories, which means the general purpose rule in qbase.pri no longer works. Task-number: QTBUG-9983 Reviewed-by: Miikka Heikkinen Fix2: Fix QtMultimedia .def files As a result of the split of multimedia into two DLLs, made the following changes: 1. Revert QtMultimediau.def to v4.6.2 (compatibility baseline) 2. Freeze QtMultimedia and QtMediaServices This is compatible with 4.6.2, but not compatible with any previous 4.7 build. Task-number: QTBUG-9983 Fix3: Add QtMediaServices.dll to Qt.sis The new dll will now be installed by the symbian sis package. Task-number: QTBUG-9983 Reviewed-by: Miikka Heikkinen
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-242-97/+97
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix for EGL for symbian on 3.1/3.2/5.0, define QT_NO_EGL. Stub implementations for EGL for symbian
| * | | Stub implementations for EGL for symbianShane Kearns2010-04-232-97/+97
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done to keep binary compatibility between Qt built with openvg vs Qt built without openvg support. The problem is that Symbian uses .def files to map between exported symbol names and ordinals in the DLL export table. The alternative of manually maintaining two versions of the QtGui def files proved to be too error prone and time consuming. Note that the EGL exports are defined in a private header, for use by the openvg and opengl graphics system plugins. These plugins should always be compiled against Qt configured with support for the graphics system, as the headers contain default parameters which are inlined into the plugin binary. Task-number: QTBUG-7870 Reviewed-by: Tom Cooksey
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-232-6/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Try to use multisampled opengl graphicssystem on all platforms Make sure recreateEglSurface creates a surface if there isn't one QX11GL: Implement QX11GLWindowSurface::grabWidget QX11GL: Cleanup the window surface & remove some synchronisation QX11GL: Move the shared context ownership into a seperate class QX11GL: Don't do glFinish in endPaint Implement QGLPaintDevice::metric() Remove dead code left after a merge conflict resolution Fixed autotest failures in tst_QPainterPath. Removed bezier intersection code in path clipper. Diagram scene example (graphicsview/diagramscene) refresh problem. When using Qt::BypassGraphicsProxyWidget with QMenu the application is not stuck anymore
| * | | Removed bezier intersection code in path clipper.Samuel Rødal2010-04-222-6/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The bezier intersections caused a lot of numerical stability issues, so instead we now convert them to line segments. In the future it might be possible to keep track of which bezier curve a line segment originated from and reconstruct the bezier curves at the end. Task-number: QTBUG-8035 Reviewed-by: Gunnar Sletta
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-181-0/+19
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits) Recognize identifiers containing unicode escape sequences. Fix README Fix doc: QML_DECLARE_TYPE is no longer necessary Fix doc: remote contents requires qmldir Fixed parsing of inner labelled statements. Doc Remove unsupported plugin version flags in .pro files of declarative examples Documentation typo. More QML doc consistency. Ensure existing image is gone before next photo selection. Don't use zoomfactor. Doc: in QML use "real" and "enumeration", not "qreal" and "enum" Doc: Put "default" property label on same line as property name Wait for debug clients asynchronously instead of blocking creation of Test not reliable ResizeMode support for QGraphicsWidgets created with QDeclarativeView More class documentation fixes for declarative. Simplify QML import plugin deployment lines Add QML imports to s60installs.pro Cleanup photoviewer demo. ...
| * | Add QML imports to s60installs.proJoona Petrell2010-04-161-0/+19
| |/ | | | | | | | | Task-number: QTBUG-9784 Reviewed-by: Martin Jones
* | EABI and BWINS DEF file updates for SymbianIain2010-04-168-46/+139
|/ | | | Reviewed-by: TrustMe
* Update to def files for 4.7.0-beta1Shane Kearns2010-04-148-65/+234
| | | | | | | | Frozen against qt-releases/4.7.0-beta1 commit 4061d0ff3e8ed72ecb83ef1026492511a0afb9fa Task-number: QTBUG-9892 Reviewed-by: Trust Me
* Update Symbian def files for 4.7Shane Kearns2010-04-0711-508/+1106
| | | | Reviewed-by: Trust Me
* Fix 'make sis' working on symbian makefile based system again.Thomas Zander2010-04-061-3/+9
| | | | Only use EPOCROOT as the source for libs on symbian-abld|symbian-sbsv2
* Merge commit 'origin/4.7' into symbian47Thomas Zander2010-03-312-6/+6
|\ | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/WebCore/WebCore.pro src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-302-248/+8
| |\ | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| | * Exporting QFontDatabase::removeAllApplicationFonts()Alessandro Portale2010-03-292-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | It was missing and not covered by the standard autotests, so its missing was not detected for quite some time. Task-number: QTBUG-8423 Reviewed-By: Shane Kearns
* | | Update EABI def files for 4.7Shane Kearns2010-03-306-3508/+3456
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge remote branch 'qt/4.7' into 4.7Shane Kearns2010-03-301-1/+4
|\ \ \ | |/ / | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-251-1/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| | * Changed Symbian pkg files to deploy from under epoc32Miikka Heikkinen2010-03-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Exporting QFontDatabase::removeAllApplicationFonts()Alessandro Portale2010-03-292-2/+4
|/ / | | | | | | | | | | | | | | It was missing and not covered by the standard autotests, so its missing was not detected for quite some time. Task-number: QTBUG-8423 Reviewed-By: Shane Kearns
* | Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-38/+46
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Enable s60main.rsc infixing.Miikka Heikkinen2010-03-191-5/+3
| | | | | | | | | | | | | | | | Now s60main.rsc file is also infixed, making infixed and vanilla builds indepenendent of each other. Task-number: QTBUG-9065 Reviewed-by: Shane Kearns
| * Useful support for -qtlibinfix configure parameter in SymbianMiikka Heikkinen2010-03-181-34/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-171-29/+40
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | Revert "Temporarily disable problematic dll."axis2010-03-161-3/+1
| | | | | | | | | | | | This reverts commit a65738d8e81f165e32d948ffbaea98702717d8db.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-164-79/+37
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Temporarily disable problematic dll.axis2010-03-111-1/+3
| | | | | | | | | | | | | | | | This should be reverted later, and investigated.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-1114-8/+9019
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
| * | | | Fixed location of dll for the makefile based Symbian build system.axis2010-03-011-1/+1
| | | | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-011-1/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 library locations for deployment on Symbian.axis2010-02-251-1/+1
| | | | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-232-0/+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
| * | | | | | Enabled the "make sis" target with the Symbian makefile build system.axis2010-02-191-0/+1
| | | | | | |
| * | | | | | Merge branch 'master' into merge-with-qt-masteraxis2010-02-191-11/+7
| |\ \ \ \ \ \
| | * | | | | | Fixed plugin locations in the pkg file.axis2010-02-161-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This broke after commit cfdf813056c5e6063e97bd01266c249ec2f9ecf1.
| | * | | | | | Fixed location of dll on Symbian after QtMultimedia was added.axis2010-02-161-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-161-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Fixed position of plugins on Symbian.axis2010-02-121-1/+1
| | | | | | | |
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-127-18/+151
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | | | | | | | Implemented pkg generator for the symbian/linux-armcc mkspec.axis2010-02-041-27/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It reuses almost everything from the original pkg generator, but the code had to be restructured to accomodate for the new makefile generator. In addition a few new codepaths and profile changes had to be introduced to cope with the fact that this mkspec puts files in different places than Symbian does (inside $QTDIR/lib instead of $EPOCROOT/...). This enables the pkg generator to generate correct pkg files for Qt itself, but applications will not work yet because they also require generated rss files.
generated by cgit v0.12 at 2024-11-16 16:51:18 (GMT)