summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* Fix compilation: StringImpl has no public, default constructorThiago Macieira2010-04-152-0/+3
| | | | | | | | Error was: platform/text/AtomicStringImpl.h:29: error: base `WebCore::StringImpl' with only non-default constructor in class without a constructor Reviewed-by: Janne Koskinen (cherry picked from commit 42bbbfb3cd36a935d30e7f49f87ab8d7f1d2b53e)
* Fix compilation on Solaris, AIX and HP-UX.Thiago Macieira2010-04-151-5/+0
| | | | | | | | | | | There's no bzero function in POSIX. It's a 4.3BSD function, legacy in POSIX.2001 and removed in POSIX.2008. And good compilers will inline the function anyway by a builtin. It's one of the most basic algorithms. Reviewed-by: Trust Me (cherry picked from commit 59b9f56a18ef0080938626df4a30bc869f8096ef)
* qdoc: Removed all <table> attributes in favor of using css.Martin Smith2010-04-151-40/+25
| | | | (cherry picked from commit a3c73742d9b9b9329492f8f70d74d6701840062f)
* qdoc: Checked for empty title.Martin Smith2010-04-151-2/+4
| | | | (cherry picked from commit 4607210dfef3b51933f03deab1037c98cbb8869c)
* qdoc: Added TOC to class ref pages.Martin Smith2010-04-151-0/+1
| | | | | | | It isn't a full TOC yet. It only includes h1, h2, etc from the Detaled Description part. In many classes, there aren't any of these, so many classes won't have a TOC yet. (cherry picked from commit 61726600cc7d6412a3d25674a4f785c23c8a8f64)
* Doc: updating scriptsMorten Engvoldsen2010-04-152-4/+12
| | | | | Revieved-by: trust-me (cherry picked from commit 7e33165aa680e5b334182bdb34fae0f1aca69233)
* Doc: Fixing design bugs. Updating the index page and script/style files. ↵Morten Engvoldsen2010-04-1514-524/+1559
| | | | | | | Adding some image files. Reveiwed-by: trustme (cherry picked from commit c0d02030333c9f96188b5a425f2552472ab53325)
* qdoc: Fixed .qdocconf files for assistant.Martin Smith2010-04-154-4/+113
| | | | (cherry picked from commit 114cb018c088570ff0640eeb0d57594905ff9fcf)
* Fix previous merge commit.Jason McDonald2010-04-151-0/+3
|
* Revert "Update Phonon ds9 backend to 4.4.0."Jason McDonald2010-04-1534-624/+1001
| | | | | | | | | | | | | | This reverts commit 19a3fc3bd817628070e5637caf158b0be79eee82. The phonon backend in 4.4.0 is outdated. Qt has the most recent one. Conflicts: src/3rdparty/phonon/ds9/iodevicereader.cpp (cherry picked from commit 6253ced81bcd60c04803f1a52bc59a239022b9c4) Conflicts: src/3rdparty/phonon/ds9/mediaobject.cpp
* Update to def files for 4.7.0-beta1Shane Kearns2010-04-158-65/+234
| | | | | | | | | Frozen against qt-releases/4.7.0-beta1 commit 4061d0ff3e8ed72ecb83ef1026492511a0afb9fa Task-number: QTBUG-9892 Reviewed-by: Trust Me (cherry picked from commit e40fea6a052f172d3eb3c0901ee502d1747c3817)
* Reduce QML runtime capabilities to NetworkServices and ReadUserDataJoona Petrell2010-04-152-2/+2
| | | | | | Task-number: Reviewed-by: Martin Jones (cherry picked from commit 5a1a3ab59e96bb5b2968883160564eb24d011859)
generated by cgit v0.12 at 2025-08-25 14:20:51 (GMT)