summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-08171-1578/+3509
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (143 commits) 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 Add some debugging (disabled) to QUrl::resolved tst_qxmlquery: Fix misuse of absolute paths as URLs QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to my changes Make QCompleter cope with restricted screen real estate (mobile devices) Don't initialize Wintab if QT_NO_TABLETEVENT is defined. QDBusXmlGenerator: get the true name from QMetaType for the return type Add missing newline to static XML snippet Fix compilation in C++0x mode (narrowing of constants) My changelog entries for core and network Doc: updating html and search feature my changelog Doc - mention vcsubdirs as a possible value for TEMPLATE ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-07171-1578/+3509
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (143 commits) 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 Add some debugging (disabled) to QUrl::resolved tst_qxmlquery: Fix misuse of absolute paths as URLs QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to my changes Make QCompleter cope with restricted screen real estate (mobile devices) Don't initialize Wintab if QT_NO_TABLETEVENT is defined. QDBusXmlGenerator: get the true name from QMetaType for the return type Add missing newline to static XML snippet Fix compilation in C++0x mode (narrowing of constants) My changelog entries for core and network Doc: updating html and search feature my changelog Doc - mention vcsubdirs as a possible value for TEMPLATE ...
| | * My 4.7.0 changelog entries.Samuel Rødal2010-05-071-0/+29
| | |
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-071-6/+6
| | |\
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-073-12/+103
| | | |\
| | | * | Doc: Tuning search scriptMorten Engvoldsen2010-05-071-6/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Morten Engvoldsen
| | * | | qdoc: Fixed annotated list generation to use <td>, not <th>.Martin Smith2010-05-071-2/+2
| | | |/ | | |/|
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-078-45/+134
| | |\ \ | | | |/
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-0714-46/+164
| | | |\
| | | | * QtDeclarative: avoid waiting for a network load on URIs with empty schemes.Thiago Macieira2010-05-071-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The proper fix would be to have QNetworkAccessManager notify immediately that this load cannot work (and it knows it can't work). Then QtDeclarative can simply check what QNAM found. Reviewed-By: Alan Alpert
| | | | * QtDeclarative: RFC 3986 requires schemes to be considered case-insensitivelyThiago Macieira2010-05-072-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Alan Alpert
| | | | * Add some debugging (disabled) to QUrl::resolvedThiago Macieira2010-05-071-0/+6
| | | | |
| | | | * tst_qxmlquery: Fix misuse of absolute paths as URLsThiago Macieira2010-05-071-9/+9
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Peter Hartmann
| | | | * QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not toThiago Macieira2010-05-071-1/+1
| | | | |
| | | | * my changesaavit2010-05-071-0/+16
| | | | |
| | | * | Doc: Chages to search feature, css and table orderMorten Engvoldsen2010-05-073-18/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the search results Fixed table css Added odd&even classes to tables generated by the thmlgenerator Reviewed-by: Morten Engvoldsen
| | * | | qdoc: Reorganized examples panel.Martin Smith2010-05-073-12/+103
| | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-07166-1536/+3258
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (132 commits) Make QCompleter cope with restricted screen real estate (mobile devices) Don't initialize Wintab if QT_NO_TABLETEVENT is defined. QDBusXmlGenerator: get the true name from QMetaType for the return type Add missing newline to static XML snippet Fix compilation in C++0x mode (narrowing of constants) My changelog entries for core and network Doc: updating html and search feature my changelog Doc - mention vcsubdirs as a possible value for TEMPLATE doc: Second attempt to begin reorganizing the top doc page. Fix syntax error in configure script fix qmake project file following msvc2010 addition remove extraneous return statement cosmetics: change enum value isOnActiveSpace is available from 10.6. QTcpServer: Fix documentation for previous commit Keep support for maximum pending connections in derived QTcpServer [QNAM FTP] Check for the "ftp" scheme case-insensitively Use QUrl::isLocalFile and fix the scheme checking in local URLs. Improve QUrl handling of local file paths ...
| | | * Make QCompleter cope with restricted screen real estate (mobile devices)Dominik Holland2010-05-061-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always prefer the bottom area for the list popup - if that doesn't work out use the maximum available space (top or bottom) and resize the popup if it still does not fit. RevBy: Dominik Holland RevBy: ogoffart
| | | * Merge commit 'v4.7.0-beta1' into HEADThiago Macieira2010-05-060-0/+0
| | | |\
| | | | * 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)
generated by cgit v0.12 at 2024-10-26 10:33:23 (GMT)