summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-09-1315-61/+403
|\ | | | | | | | | | | Conflicts: configure src/corelib/tools/qsimd.cpp
| * QtWebKit: Update tag files to match the same content on qtwebkit.gitJocelyn Turcotte2010-09-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | NOTE: Some patches have been made in the 4.7.0 branch for src/3rdparty/webkit that are not available upstream. This shouldn't have happened, however these patches mostly address issues regarding builds of QtWebKit inside the Qt source tree so it doesn't matter so much regarding source packages. Reviewed-by: Simon Hausmann
| * QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit.Jocelyn Turcotte2010-09-082-1/+13
| | | | | | | | | | | | | | | | | | http://bugreports.qt.nokia.com/browse/QTBUG-13279 Sha1 on qtwebkit.git: 460b651cbe4f6994b492ff08614e57b0e31a24c8 Reviewed-by: Simon Hausmann
| * QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit.Jocelyn Turcotte2010-09-081-4/+4
| | | | | | | | | | | | | | | | | | http://bugreports.qt.nokia.com/browse/QTBUG-13279 Sha1 on qtwebkit.git: 8c902b12f771829cecd22edb7742636c8de816c2 Reviewed-by: Simon Hausmann
| * Merge branch '4.7' into qmldocsDavid Boddie2010-09-079-6/+298
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-067-3/+291
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (33 commits) make shadow builds not write into the source dir Fix failing tst_qmdisubwindow test after 71a3b1a0d3 Doc: update the documentation of QUrl about HTML Form encoding search translator comments Install translators earlier in assistant Fix compilation on ARM: don't include kernel headers Fix compilation of qmake with MSVC Doc: Updating known-issues page. Recognize @, #, $ and ` as word separators rebuild configure.exe Fix dependencies so JOM will handle parallellization properly Symbian: Disable IPv6 for now Doc: Fixed namespaced Qt build breakage in the model/view tutorial. Doc: Fixing links on index page and corecting HTML in the template. Accept empty authority segments in QUrl as different from not-present Doc: Adds line about non-support for Webkit on Solaris protect nil dictionary from release. Fix potential KERN-EXEC 0 on Symbian. Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments ...
| | | * Reduce memory consumption of QtScript/JSC on SymbianKent Hansen2010-09-027-3/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of Jay's patch from https://bugs.webkit.org/show_bug.cgi?id=34349 with minor modifications. Even though the original patch was rejected upstream and has been superseded by the patches for https://bugs.webkit.org/show_bug.cgi?id=43185, those patches are more involved (affecting all platforms), hence difficult/risky to backport. Task-number: QTBUG-13361 Reviewed-by: Simon Hausmann
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-061-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed incorrect Symbian scoping. Fixes for QMAKE_EXTRA_* variable handling in symbian-sbsv2 QPixmaps try to access FBS connection after the connection has been closed.
| | | * | Fixed incorrect Symbian scoping.axis2010-09-061-2/+2
| | | |/ | | | | | | | | | | | | The missing install functionality is only true for mmp based systems.
| | * | Ensure WebView gets focus when an editable node is clicked on.Martin Jones2010-09-061-1/+5
| | |/ | | | | | | | | | | | | Task-number: QTBUG-13342 Reviewed-by: Michael Brasser
| * | Doc: More work on the QML documentation.David Boddie2010-09-071-28/+58
| | |
| * | Merge branch '4.7' into qmldocsDavid Boddie2010-09-031-3/+3
| |\ \ | | |/ | | | | | | | | | Conflicts: doc/src/snippets/declarative/qml-intro/basic-syntax.qml
| | * QString usage cleanupsOswald Buddenhagen2010-09-011-3/+3
| | | | | | | | | | | | | | | - tr() already returns a QString, duh - use multi-arg arg() (heh)
| * | Doc: qdoc fixes.David Boddie2010-09-021-4/+4
| |/
| * fix qt_webkit_version.pri install for in-Qt buildsOswald Buddenhagen2010-08-311-13/+21
| | | | | | | | | | | | | | | | always add the target, even if building inside Qt - as opposed to the headers and libraries, there are no rules for that coming from qbase.pri. Task-number: QTBUG-13306
| * fix build after first webkit self-injection attemptOswald Buddenhagen2010-08-231-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it didn't work for several reasons: - if the configures don't add webkit to QT_CONFIG, src.pro doesn't even know that it needs to build WebKit at all, so WebKit would never inject itself into the build. hen-and-egg problem. - the in-Qt build doesn't use WebKit.pro in the first place, so a proper recursive qmake would never create qt_webkit_version.pri. it worked under unix because configure collects all project files irrespective of the actual SUBDIRS structure. - a proper recursive qmake will cache the qt config, so the injection wouldn't be effective during the first qmake run so instead let the configures copy the pri file.
| * let WebKit inject itself into the qt configurationOswald Buddenhagen2010-08-233-2/+8
| | | | | | | | | | | | | | | | i.e., don't explicitly deal with qt_webkit_version.pri outside of the webkit source directory. Task-number: QTBUG-12379 Reviewed-by: Simon Hausmann
* | Make phonon gst backend build properlyJørgen Lind2010-09-073-5/+7
| | | | | | | | | | | | | | | | Only software rendering for now... also fix regression I made in QWindowSystemInterface. Its allowed to send in NULL pointers for tlw in some of the functions. So dont ask for the widget data of a NULL pointer.
* | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-08-1922-189/+242
|\ \ | |/ | | | | | | Conflicts: src/opengl/qgl_p.h
| * 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
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-08-03119-881/+13671
|\ \ \ | |/ / | | | | | | | | | Conflicts: configure
| * | 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
generated by cgit v0.12 at 2024-11-15 00:55:14 (GMT)