summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-0/+1
| | | | ...and a set of functional group pages.
* Add version 0.42 of libconninet.Aaron McCarthy2010-08-1636-0/+9977
| | | | Minor update. Fixes infinite loops.
* Remove version 0.41 of libconninet.Aaron McCarthy2010-08-1639-10054/+0
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Justin McPherson2010-08-129-6/+63
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-08-114-3/+16
| |\ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 72b1c38579ca1fdb3f242e29cd16e5bfb4925813
| | * Updated WebKit to 72b1c38579ca1fdb3f242e29cd16e5bfb4925813Simon Hausmann2010-08-104-3/+16
| | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/43782> || [Qt] NPAPI plugins not drawn until page scrolled ||
| * | doc: Changed some titles so lists of contents sort better.Martin Smith2010-08-101-1/+1
| |/
| * Updated WebKit to 413404da27312051bb3ff2cfd0f3fca42aa4b245Simon Hausmann2010-08-056-4/+48
| | | | | | | | || <https://webkit.org/b/43530> || [Qt] Input mode states are not reset after entering a password field ||
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Justin McPherson2010-08-0612-42/+114
|\ \ | |/ | | | | into 4.7
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-08-042-4/+4
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Phonon; Use correct Phonon version numbers.
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-08-0311-41/+113
| |\ \ | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to d6aa024c84f61d0602bef4eef84efaed7cfeefcc
| | * | Updated WebKit to d6aa024c84f61d0602bef4eef84efaed7cfeefccSimon Hausmann2010-08-0311-41/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/36723> || Crash while uploading a PDF document on www.largefilesasap.com || || <https://webkit.org/b/40572> || [Qt] Stack overflow when converting navigator object to QVariant || || <https://webkit.org/b/43037> || [Qt] Incorrect input method hints ||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-021-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: updating index page, x platform and platform spec. Removing redundant style files Added notice that some links are online documents. Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed. Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression) configure: don't symlink the mkspecs/features directory Doc: adding changes to getting started and fixing redirection links doc: Fixed many qdoc errors. Fixed potential infinite loop in QFileSystemWatcher on Mac. qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527. Simplify network manager settings code. Use an enum to return the bearer type of a network configuration. Rename QNetworkConfiguration::bearerName() function.
| | * | doc: Fixed many qdoc errors.Martin Smith2010-08-021-1/+1
| | | |
* | | | Phonon; Update CMakeLists.txtJustin McPherson2010-08-041-1/+1
| |_|/ |/| |
* | | Phonon; Use correct Phonon version numbers.Justin McPherson2010-08-042-4/+4
|/ / | | | | | | | | Task-number: QTBUG-12627 Reviewed-by: Andrew den Exter
* | Fixed build break on Symbian versions earlier than S^3Gareth Stockwell2010-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The following overload was added in S^3: TInt RApaLsSession::RecognizeData(const TDesC8& aBuffer, TDataRecognitionResult& aDataType) const In order to allow the backend to compile against earlier versions of the platform, this patch calls the RecognizeData overload which taking the same arguments as above, plus a filename (for which KNullDesC is passed). Task-number: QTBUG-6562 Reviewed-by: trustme
* | Added support to Phonon MMF backend for playback of Qt resource filesGareth Stockwell2010-08-0212-20/+123
|/ | | | | | | | | | | | | | | | | | | | | The backend accesses the resource file path via MediaSource::url(). A small patch to Phonon was required to enable this, because by default, Phonon passes a QIODevice, rather than the resource file path, to the backend. The backend uses this path to create a QResource object, through which the memory buffer into which the resource file has been read can be accessed. This buffer is wrapped in a Symbian 8-bit descriptor and passed to the OpenDesL() function of the appropriate MMF client utility API. Playback only works for certain file formats, as the Symbian MIME type recognizer does not always work. For example, playback of an audio WAV resource file works, while playback of an MP3 resource file does not. Task-number: QTBUG-6562 Reviewed-by: Justin McPherson
* Updated WebKit to e6e692bb056670e2781dd0bc473a60757ae53992Simon Hausmann2010-07-2923-65/+393
| | | | Backported various crash fixes
* Add libgq version 0.4+0m6.Aaron McCarthy2010-07-2826-0/+2830
| | | | | | libgq is required by the ICD Bearer Management plugin. Task-number: QTBUG-12354
* Add libconninet version 0.41+0m6.Aaron McCarthy2010-07-2840-0/+10072
| | | | | | libconninet is required by the ICD Bearer Management plugin. Task-number: QTBUG-12354
* QScriptEngineAgent: recompile all the function when installing a debugger.Olivier Goffart2010-07-271-6/+4
| | | | | | | | | | | | | | Recompile all the function is necessary to ger the debug opcode that notifies us when the position changes. The change in CollectorHeapIterator.h is nessesary to get it work as Debugger::recompileAllJSFunctions uses LiveObjectIterator, LiveObjectIterator initialied m_cell to -1 and to ++(*this) in its constructor. But as m_cell is of type size_t (unsigned) then the < comparison will always fail as it is an unsigned comparison. This was already fixed upstream in r54672 Reviewed-by: Jedrzej Nowacki
* Updated WebKit to 0be9ff9f2b1ec2b748885ac15299bc1c65aca590Simon Hausmann2010-07-2613-12/+182
| | | | | | | | | Integrated changes: || <https://webkit.org/b/42474> || Spatial navigation: do not consider outline for focusable element boundaries || || <https://webkit.org/b/41484> || [Qt] Clamp color stops passed to QGradient to 1.0 || || <https://webkit.org/b/29381> || [Qt] [Regression] QWebView::setHtml() executes script body twice || || <https://webkit.org/b/30879> || Loading HTML with a JS alert() when the DocumentLoader has been set to not defer data load results in ASSERT ||
* Updated WebKit to 669858f9bbd4913fd16c642090375c81acbfdb04Simon Hausmann2010-07-236-2/+54
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-211-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert "Compile fix for MSVC" Compile fix for MSVC Improve QAccessible for QAccessibleTabBar Improve QAccessible for QTabBar fix the export macros for the QtDBus module rebuild configure.exe make "configure -qt-gif" work again on Windows Fix a typo in harfbuzz thai line breaking. Ensure that font sizes that are > 0 and < 1 are still respected
| * Fix a typo in harfbuzz thai line breaking.Ritt Konstantin2010-07-211-1/+1
| | | | | | | | Reviewed-by: Lars Knoll
* | Merge branch 'raptorConfigurePatches' into 4.7-s60axis2010-07-211-2/+10
|\ \ | |/ |/| | | | | | | Conflicts: configure src/sql/drivers/drivers.pri
| * Added automatic sqlite extraction for Symbian to QtWebKit.axis2010-07-211-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Also added sqlite detection in case sqlite is not present in the SDK. This is possible if WebKit is compiled standalone. The inclusion part is a consequence of commit c578c6c1d6d in the Qt repository. It will not work on Qt versions < 4.7.1, but that is ok, since the only build system it will affect is marked as experimental in the whole 4.7 series. RevBy: Kenneth Rohde Christiansen Task: https://bugs.webkit.org/show_bug.cgi?id=42744
* | Remove some more unneeded files from libjpeg, avoiding GPLaavit2010-07-192-775/+0
| | | | | | | | | | Task-number: QT-3584 Reviewed-by: Trustme
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-1660-182/+1004
|\ \ | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt.qdocconf
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-102-1/+5
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (59 commits) Doc: Cleaning style and adding support for Creator Add NTLMv2 authentication support to QAuthenticator. QIODPLB: Sync behavior of ungetBlock() and ungetChar() QFileIconProvider: Load icons on demand. Doc: fixing offline style Fix handling of SSL certificates with wildcard domain names Doc: fixing examples link doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. SSL library loading: load system libs only once Revert "SSL backend: load libraries for certificates only once" doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. Doc: Adding support for Qt Creator style doc: Fixed last of the declarative/QML qdoc warnings. qdoc: Marked some missing declarative properties and functions as \internal. qhelpgenerator: Fix namespace syntax checking. ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-102-1/+5
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (59 commits) Doc: Cleaning style and adding support for Creator Add NTLMv2 authentication support to QAuthenticator. QIODPLB: Sync behavior of ungetBlock() and ungetChar() QFileIconProvider: Load icons on demand. Doc: fixing offline style Fix handling of SSL certificates with wildcard domain names Doc: fixing examples link doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. SSL library loading: load system libs only once Revert "SSL backend: load libraries for certificates only once" doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. doc: Fixed several qdoc warnings. Doc: Adding support for Qt Creator style doc: Fixed last of the declarative/QML qdoc warnings. qdoc: Marked some missing declarative properties and functions as \internal. qhelpgenerator: Fix namespace syntax checking. ...
| * | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-07-1059-160/+979
| |\ \ \ | | |/ / | |/| | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to ad96ca2f9b57271da4ea7432022ac686ee0981c2
| | * | Updated WebKit to ad96ca2f9b57271da4ea7432022ac686ee0981c2Simon Hausmann2010-07-0959-160/+979
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/37760> || FrameView's layout root can be detached by style recalc || || <https://webkit.org/b/38922> || innerHTML decompilation issues in textarea || || <https://webkit.org/b/36878> || REGRESSION: Trailing colon on hostnames (with no port specified) causes "Not allowed to use restricted network port" || || <https://webkit.org/b/37781> || [XHR] Cross-Origin synchronous request with credential raises NETWORK_ERR || || <https://webkit.org/b/36502> || Cross-origin bypass: iFrame.src can be set to a JavaScript URL via nodeValue or textContent || || <https://webkit.org/b/28697> || WebKit crash on WebCore::Node::nodeIndex() || || <https://webkit.org/b/37031> || Cross-origin bypass: Javascript URL can be set as iframe.src via multiple DOM aliases || || <https://webkit.org/b/36522> || [Qt] Rename QWebSettings::XSSAuditorEnabled to XSSAuditingEnabled || || <https://webkit.org/b/38583> || Use of stale pointers whilst normalizing DOM nodes with mutation event handlers that modify element attributes || || <https://webkit.org/b/41412> || [Qt] Canvas arcTo() should draw straight line to p1 if p0, p1 and p2 are collinear || || <https://webkit.org/b/39878> || [Qt]: REGRESSION(r58703): QWebSettings::JavascriptCanAccessClipboard has wrong case in "Javascript" part. || || <https://webkit.org/b/26824> || focus() behavior permits keystrokes to be redirected across domains || || <https://webkit.org/b/39508> || Crash in WebCore::toAlphabetic() while running MangleMe || || <https://webkit.org/b/36571> || WebKit should treat port numbers outside of the valid range as being blacklisted || || <https://webkit.org/b/38497> || Make sure that http URLs always have a host in SecurityOrigin || || <https://webkit.org/b/38626> || ZDI-CAN-765: CSS Charset Text Transformation Vulnerability || || <https://webkit.org/b/36838> || Cross-origin image theft via SVGs as a canvas pattern || || <https://webkit.org/b/27751> || [sg:high] Copying text to the system clipboard can be done in any context || || <https://webkit.org/b/36843> || REGRESSION (r47291): XHR allows arbitrary XSRF across domains || || <https://webkit.org/b/37230> || REGRESSION (4.0.5): Safari asks for credentials all the time when authenticating to Windows IIS Server || || <https://webkit.org/b/37618> || Memory Corruption with Drag-Drop item from a purged document. || || <https://webkit.org/b/38260> || Frame.src allows javascript URLs with starting spaces || || <https://webkit.org/b/38261> || Table layout crash bug ||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-081-22/+25
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes the sqlite driver bug QTBUG-11904 (pointer aliasing) Add test and fix style for the SSE2 implementation of ARGB32 conversion Build fix, the header of QImageData did not declare QImageWriter. SSE2 implementation of convert_ARGB_to_ARGB_PM_inplace for QImage Moved primitive SSE2 painting utilities to qdrawingprimitive_sse2_p.h Move logic for building SIMD extensions to gui.pro Fix text drawing into alpha pixmap with opengl engine
| | * | Fixes the sqlite driver bug QTBUG-11904 (pointer aliasing)Charles Yin2010-07-081-22/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Applying upstream sqlite patch from: http://www.sqlite.org/src/info/d6ae275122 Task-number: QTBUG-11904 Reviewed-by: Michael Goddard
* | | | Doc: Fixed incorrect QML property type.David Boddie2010-07-081-1/+1
| |_|/ |/| | | | | | | | Reviewed-by: Trust Me
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-082-1/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) fix build with sqlite2 respect UI_DIR when creating image collections Doc: more cleaning Doc: fixing escape character Doc: cleaning html generator Doc: changing index page Doc: fixing link to devnet Doc: adding HTML class names and style docs to the generator Doc: Fixing typo - background file name doc: Added doc for accessing views and models from delegates. Doc: Fixing broken link Doc: fixing typo Doc: fixing typos qdoc: Fixed table of contents for namespace pages. SSL backend: load libraries for certificates only once immediately set function context when entering a namespace Phonon MediaSource fails to load when passed as a resource file Set QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH to default value qdoc: Fixed a few links to QtObject (QML:QtObject) Simplify *= to += after contains() test ...
| * | Phonon MediaSource fails to load when passed as a resource fileJens Bache-Wiig2010-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Files fail to load when passing resoure path to mediasource. The original regression seems to be caused by a behavior change as reported here: http://bugreports.qt.nokia.com/browse/QTBUG-12015 Note a merge request is also pending on Gitorious http://gitorious.org/phonon/phonon/merge_requests/17 Task-number: QTBUG-9323 Reviewed-by: thierry
| * | Consolidate sql driver configuration redundancyMark Brand2010-07-071-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | Previously sql driver recipes each appeared in both the plugin pro file and src/sql/drivers/drivers.pri for building into QtSql. Split driver recipes into shared pri files. Also split bundled 3rd party sqlite code recipe into a shared pri. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Use lower case for including system header filesGareth Stockwell2010-07-076-6/+6
| | | | | | | | | | | | | | | | | | | | | | All platform includes are now lower case, i.e. '#include <foobar.h>' rather than '#include <FooBar.h>'. Note that Qt includes are still camel case, e.g. '#include <QtGui/QWidget>' Task-number: QTBUG-6528 Reviewed-by: trustme
* | Added trace statements to Phonon MMF backendGareth Stockwell2010-07-071-0/+17
| | | | | | | | Reviewed-by: trustme
* | MMF Phonon backend: call winId() from VideoWidget constructorGareth Stockwell2010-07-072-4/+2
| | | | | | | | | | | | | | | | This is to be consistent with the backends for other platforms, which also call QWidget::winId() on the VideoWidget (or one of its children) during construction. Reviewed-by: Thierry Bastian
* | Fixed crash which occurs when switching between video clipsGareth Stockwell2010-07-072-13/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Phonon::MediaObject::setCurrentSource() is called when the MediaObject is connected to a Phonon::VideoWidget, the MMF::AbstractVideoOutput pointer is propagated inside the backend from the first MMF::AbstractVideoPlayer to the second. If the VideoWidget is subsquently re-sized, the code path enters the ScaleFactors branch of the MMF::SurfaceVideoPlayer::handleParametersChanged function. At this point, m_displayWindow is still set to the inital null value, and the assertion therefore fails. This change ensures that m_displayWindow is updated before attempting to apply the scale factor change. Task-number: QTBUG-11377 Reviewed-by: Thierry Bastian
* | Close media clip before creating new player objectGareth Stockwell2010-07-075-1/+9
| | | | | | | | | | | | | | | | | | | | Failure to Close() an existing MMF player utility object before creating a new one - which happens in the MMF backend's implementation of Phonon::MediaObject::setCurrentSource() - causes intialization of the newly-created utility to fail later on. Task-number: QTBUG-11377 Reviewed-by: Thierry Bastian
* | Enable bufferStatus signal during video clip loading on NGA platformsGareth Stockwell2010-07-072-2/+2
| | | | | | | | | | | | | | | | CVideoPlayerUtility::RegisterForVideoLoadingNotification() was only called in the DSA, not the NGA, variant of the Phonon MMF backend. Task-number: QTBUG-11378 Reviewed-by: Thierry Bastian
* | Prevent crash when video is played without a VideoWidgetGareth Stockwell2010-07-073-4/+18
|/ | | | | | | | | The Phonon API allows video to be played via a Phonon::MediaObject, even if no Phonon::VideoWidget has been connected to it. This patch prevents the Phonon MMF backend crashing in this scenario due to dereferencing a null pointer. Reviewed-by: Thierry Bastian
* fix symbian buildOswald Buddenhagen2010-07-031-2/+2
| | | | | as absolutely braindead as it is, symbian is a unix as far as qmake is concerned.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-036-0/+158
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Consolidate zlib configuration redundancy Fixed whitespace formatting Fix incomplete support for built-in jpeg, mng, tiff and gif handlers Split image handler plugin project files No explicit link to zlib/jpeg for system mng/tiff Removed stray line continuations Long live else! qdoc: Added a solution for creating tables of contents for manuals. Doc: Fixed markup. Fixed size hint for combo box on windows
| * Consolidate zlib configuration redundancyMark Brand2010-07-021-0/+14
| | | | | | | | | | Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
generated by cgit v0.12 at 2025-01-04 01:06:35 (GMT)