summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added missing UID3 for qsymbianbearer.dll.v4.7.0-beta1Espen Riskedal2010-05-041-0/+1
| | | | | | | | | Without a proper UID3 it is not possible to sign Qt.sis at symbiansigned.com. I also reserved the UID3 in our Wiki pages Reviewed-by: Aleksandar Babic (cherry picked from commit dfa6c04356d4fe93a88f2c237a920367220b9ed6)
* 2010-04-14 Kent Hansen <kent.hansen@nokia.com>Kent Hansen2010-05-042-8/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Maciej Stachowiak. Mac OS X: Use deployment target to determine whether memory tagging should be enabled https://bugs.webkit.org/show_bug.cgi?id=34888 When building on (Snow) Leopard but targeting Tiger (TARGETING_TIGER defined, BUILDING_ON_TIGER not defined), WebKit would crash on Tiger because the tags passed to mmap caused those function calls to fail. Conversely, when building on Tiger but targeting Leopard (BUILDING_ON_TIGER defined, TARGETING_LEOPARD defined), WebKit would crash on Leopard because the tags passed to vm_map and vm_allocate caused those function calls to fail. Solution: Use TARGETING_TIGER rather than BUILDING_ON_TIGER to govern the tag definitions. Use the same tags for vm_map and vm_allocate regardless of target, since they work on both. Fall back to the mmap tags that work on Tiger (that is, "no tags") if targeting Tiger, since those tags also work on Leopard. * wtf/VMTags.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@57583 268f45cc-cd09-0410-ab3c-d52691b4dbfc
* Removed fullscreen responsiveness of softkeysMiikka Heikkinen2010-04-292-18/+0
| | | | | | | | | | | | | | The CEikCba class casting is not binary compatible between at least S60 3.2 and 5.0 platforms, even though it is source compatible. The removed code was causing stack corruption on emulator when binaries were built on S60 3.2 SDK and run on S60 5.0 SDK. Another solution for this feature needs to be found. Task-number: QTBUG-10199 Reviewed-by: Shane Kearns Reviewed-by: Janne Anttila (cherry picked from commit d3b5460674e1ab8e11f05961390a6e62364032a8)
* Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and ↵Thiago Macieira2010-04-271-1/+1
| | | | | | | | | | | | other minor compile errors" The compile fix for SunCC caused a build failure for MinGW with gcc 3.4. However, QtConcurrent is not supported for Sun CC, so revert the fix (let mingw compile and SunCC break). This reverts part of commit a354e98838e67e9bbd9473d4cd42b89f45d0e3fe (MR 547). (cherry picked from commit 756c8e10b96f4b4f7b2e3d2d2c248ec261a3d407)
* DEF file fixJanne Koskinen2010-04-241-25/+24
| | | | | | | Open C unnecessarily exports inlined getloc. entry removed. Reviewed-by: Shane Kearns (cherry picked from commit 02c65146610cdd5bfe1f3ee4656ba07af82afcc7)
* QtWebkit WINS DEF file freezeJanne Koskinen2010-04-231-1/+27
| | | | | | | Freeze against previous release 4.6.2 to maintain BC. Reviewed-by: Miikka Heikkinen (cherry picked from commit 9cc9da431fd99869a83b91f5be4911e0ead2f15f)
* QtWebKit: Fixes compilation on MSVC 64Jocelyn Turcotte2010-04-223-4/+4
| | | | | | | This patch should be overwritten by the next import of QtWebKit trunk Reviewed-by: TrustMe (cherry picked from commit 594f81c553d52901209c079e2887fb13990ecba4)
* Fixed vendor info in fluidlauncher sis package.Miikka Heikkinen2010-04-221-1/+2
| | | | | | | | | Fluidlauncher was using default vendor info while all other demos used Nokia as vendor. Task-number: QTBUG-10051 Reviewed-by: Janne Koskinen (cherry picked from commit 88a332f92a5c660ce934ea0132c9814de0cb02b6)
* Fix default_deployment.pkg_prerulesMiikka Heikkinen2010-04-222-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 (cherry picked from commit 040b480b58f76ec689eea3b0f0518a0997080cc9)
* Remove overloaded placement new operatorsJanne Koskinen2010-04-212-2/+0
| | | | | | | WINSCW and Sun OS build fix. placement new is already defined in NonCopyable, no need for overloading. Reviewed-by: Simon Hausmann (cherry picked from commit cc26a3ec5c6bfde206c7354f87bebd36b70e1205)
* WINSCW compiler fix, too eager to solve inlinesJanne Koskinen2010-04-211-2/+4
| | | | | | | | WINSCW tries immediately solve inlines causing forward declared classes to be used before they are defined. Reviewed-by: Simon Hausmann (cherry picked from commit 0d1739197015a651b88d710c9c961eb0f20278f9)
* WINSCW boolean fix for XPATHJanne Koskinen2010-04-212-2/+16
| | | | | | | | WINSCW cannot determine boolean type unless it is explicitly defined. This fix needs to be re-applied always when files are regenerated. Reviewed-by: Simon Hausmann (cherry picked from commit 07aa94196e5ab6827099c683c0be96edbc62e6c0)
* WINSCW compile fix for HashMapJanne Koskinen2010-04-211-4/+4
| | | | | | | | WINSCW with templates function declarations and definitions will have to use same names for variables or you get 'undefined identifier' Reviewed-by: Miikka Heikkinen (cherry picked from commit c16ca6d08d7e3e7a0972aa1975a72882559edb26)
* WINSCW compile fix for WebCoreJanne Koskinen2010-04-211-2/+3
| | | | | | | | WINSCW fails to parse function pointer name if it is not introduced before use. Reviewed-by: Miikka Heikkinen (cherry picked from commit e0314fa999e58a057604cdbd4bd6fdfe5248d75e)
* Build fix for mingwThierry Bastian2010-04-211-1/+1
| | | | | | | | | This was preventing the activeQt tools to build Don't know exactly why though.... Task-number: 10003 Reviewed-by: Zeno Albisser (cherry picked from commit 90bac7f779b642ef1db5363012a994784ad029c4)
* Just use the path as the url can have an anchor attached etc...kh12010-04-212-4/+5
| | | | | | | | | Fixes the broken topic chooser and keyword resolving. We are only interested in the extention, which fails if we get an url e.g. with anchor attached. Reviewed-by: ck (cherry picked from commit 139497b6871d73d3366c21b51db9a74046855552)
* qdoc: Avoided putting bad chars in linksMartin Smith2010-04-212-7/+10
| | | | (cherry picked from commit 0a6faf00f06c8a0e2e0f4714bb14645172ee8922)
* Revert "Make offline docs the default for package generation."Jason McDonald2010-04-211-0/+1
| | | | This reverts commit d66a6da84af01f1a6d4fd52d9b1cbec72a4fae3c.
* Doc: Cleaning HTML generator and updating index.qdocMorten Engvoldsen2010-04-212-73/+68
| | | | | | | Adding links to the index page and removing HTML attributes like align and valing form the HTML generator Reviewed-by: Martin Smith (cherry picked from commit 019af5ecb5dbc9c173109ba670180177713a51ad)
* Doc: Correcting qdocconf files for assistantMorten Engvoldsen2010-04-204-28/+53
| | | | | | | Linking correct files to the qdocconf files Reviewed-by: Daniel Molkentin (cherry picked from commit 84eadc0bc232d8196e08f5aa5614ce9a17ea93bd)
* Quick fix to make the documentation work, needs a proper solution though.kh12010-04-203-4/+23
| | | | | Reviewed-by: kh (cherry picked from commit 0fd81e81a357edb9f9e615cff28a1876bd363b2e)
* Fix crash on startup on Symbian OSShane Kearns2010-04-202-6/+17
| | | | | | | | | | | | | | | | The changes to QThread introduced by commit 9aa4538b219ed759a47e8d1f93c2797bf07b5e2f mean that the QThread constructor calls into the event dispatcher. The Symbian event dispatcher owns a QThread, so it crashed when the code re-entered the partially constructed event dispatcher and used an uninitialised pointer. This change delays construction of the QThread until the point of use, so that the event dispatcher is fully constructed. Task-number: QTBUG-10029 Reviewed-by: Jason Barron (cherry picked from commit 2b55d52669beb72396f94e449fdf172735349b3b)
* Make offline docs the default for package generation.Jason McDonald2010-04-201-1/+0
| | | | Acked-by: Martin Smith
* qdoc: Added online flag to the qdocconf file.Martin Smith2010-04-194-141/+157
| | | | | | | | To generate the offline docs, do nothing. To generate the online docs, add this to your qdocconf file: "online = true" (cherry picked from commit 22c44d7da7682fb2500c9b11c884e50ed4dcd042)
* Shouldn't call epocRoot() in non-epoc builds in generatePkgFileMiikka Heikkinen2010-04-191-1/+3
| | | | | Reviewed-by: Janne Koskinen (cherry picked from commit 9e66838d0e766da45524d38c7235441500877c41)
* Fixed installer_sis target for 4.7Miikka Heikkinen2010-04-191-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 (cherry picked from commit c7f27ceea8f2bd420c07ce05809d0ecb06a6dc9a)
* Fix option(recursive)Miikka Heikkinen2010-04-191-1/+1
| | | | | | | | | | QMakeProject::init initializes the whole project, while QMakeProject::reset initializes the parser for a single file. "recursive" needs to apply to the whole project. Task-number: QTBUG-9847 Reviewed-by: Oswald Buddenhagen (cherry picked from commit 8295acce8b1ec3959bfd1d93028c31f49d5a5a67)
* Fixed automatic patching of self-signed packagesMiikka Heikkinen2010-04-192-10/+30
| | | | | | | | | | | | | - Don't autopatch when just preprocessing pkg or creating stub package - Copy binaries before patching so that originals are preserved. - Only autopatch the preprocessed file so that original template is preserved. - Added clear warning to patch_capabilities.pl to notify users that patched package is not suitable for distribution. Task-number: QTBUG-9972 Reviewed-by: Shane Kearns (cherry picked from commit 33aac2ca5b79afcb08c13c2b4092acfdb5056fdb)
* Fix warning about illegal empty declaration.Andrew den Exter2010-04-191-1/+1
| | | | | | | Q_PRIVATE_SLOT declarations don't require a semi-colon. Reviewed-by: Justin McPherson (cherry picked from commit 017cf88ef18cdbf5d302a658c625f605320005f8)
* qdoc: Improved TOC for class ref pages.Martin Smith2010-04-182-10/+39
| | | | (cherry picked from commit 8c942f6d2998ffcd024437e408f92d38750dd025)
* Three fixes from Shane after QtMultimedia was split into two dlls.Espen Riskedal2010-04-187-1360/+1370
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 (cherry picked from commit 095d5b74e571c71e04cc98ba4d372e3c5c2b1f9c)
* qdoc: Added the index and fixed images in the extra files list.David Boddie2010-04-165-27/+30
| | | | | Reviewed-by: Trust Me (cherry picked from commit 5b975e1dc61eaee055afc40fef13358bcd55c7d2)
* qdoc: Added TOC to module pages.Martin Smith2010-04-161-15/+19
| | | | (cherry picked from commit 68eea9b1006074853a42853f9a34cc4eb1e04b8f)
* qdoc: Changed <ul> elements in TOC.Martin Smith2010-04-161-2/+11
| | | | | Each <ul> is now <ul class="leveli">, where i is 1..n. (cherry picked from commit 3d3bff79216a24625ac7e5aa33b40c5363a228fc)
* Fix compile errors in Direct Show media service.Andrew den Exter2010-04-162-2/+2
| | | | | | | The service links against the multimedia library in addition to the mediaservices libarary, and QAbstractVideoSurface is defined in QtMultimedia, no QtMediaServices. (cherry picked from commit 9471428742ba59dbb174fc275742052e4bb629ff)
* Fix duplicate project entry in visual studio solution file.Andrew den Exter2010-04-161-1/+1
| | | | | | | The marshal project was being appended to SUBDIRS twice. Reviewed-by: Justin McPherson (cherry picked from commit 551d704cdafae46cdccc6217bb7f36da7e84be2d)
* Add EXPORT defines for QtMediaServices library.Andrew den Exter2010-04-1627-41/+49
| | | | | Reviewed-by: Justin McPherson (cherry picked from commit 6514ecd97cb455082b6e6a3521dee7c623e6393d)
* Fixed configure check for gstreamer.Dmytro Poplavskiy2010-04-161-1/+1
| | | | | | | | Gstreamer should be detected not only when phonon or mediaservices are enabled, but also when they are not disabled. Reviewed-by: Justin McPherson (cherry picked from commit 2a26cf1a76c954f8e619b24d61650a0adf655551)
* WebKit; build with change to mediaservices.Justin McPherson2010-04-161-3/+3
| | | | | Reviewed-by: Dmytro Poplavskiy (cherry picked from commit 690e0f27ae23189200d98e9300b63914d8e1fe30)
* QtMediaservices -> QtMediaServices.Justin McPherson2010-04-16121-565/+565
| | | | | Reviewed-by: Dmytro Poplavskiy (cherry picked from commit 24d5c396903c1ce12578a32c2cc10e0ae391e6d5)
* configure; Fixes for changes to use mediaservices.Justin McPherson2010-04-161-2/+2
| | | | | Reviewed-by: Dmytro Poplavskiy (cherry picked from commit 30cd548679d5e2ae026eb5e435e9bdceac6e4987)
* Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2dAndrew den Exter2010-04-161-0/+0
| | | | (cherry picked from commit 506a39d19961aadf02946db1b4496bf98d494d8d)
* Fixed compile errors in pulseaudio backend for soundeffectKurt Korbatits2010-04-161-1/+1
| | | | | Reviewed-by:Dmytro Poplavskiy (cherry picked from commit 16c6227415a05b8bc50162eb2a4941cb993c3377)
* Fixed compile errors with gstreamer pluginKurt Korbatits2010-04-163-3/+3
| | | | | Reviewed-by:Justin McPherson (cherry picked from commit ba0d2829f3e173d4c95c49f3bbbe0cd030ff3f5f)
* Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-16214-650/+714
| | | | (cherry picked from commit e85223d233c0e1d6beca748332b8fbaba3ebbf2d)
* Don't create delegates when destroying view.Martin Jones2010-04-161-1/+4
| | | | | Task-number: QTBUG-9840 (cherry picked from commit 114f627d14e7c4f06f82a7286c38c78388fe7623)
* Fix compilation of ShivaVG, which does not have EGL.Rhys Weatherley2010-04-161-0/+2
| | | | | | Task-number: QTBUG-9809 Reviewed-by: Sarah Smith (cherry picked from commit d20bf43e3f7b3d39fddd28eee5a5594de6930873)
* Attempt again to fix minGW compile error, while not breaking WinCEJason McDonald2010-04-161-1/+1
| | | | Reviewed-by: Andrew den Exter
* Revert "Revert "Update Phonon ds9 backend to 4.4.0.""Jason McDonald2010-04-1634-1001/+624
| | | | This reverts commit 1d267f33d179abbac753a72c2235e7fb07c4def7.
* Revert "Fix previous merge commit."Jason McDonald2010-04-161-3/+0
| | | | This reverts commit ab31654127d7a6e9a06a2c75bc8b2832d68cdfc0.
generated by cgit v0.12 at 2024-11-21 11:41:34 (GMT)