summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Re-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas KlingAndreas Kling2011-11-031-1/+1
| | | | | | | | | | | | Sentences should end with a period! (Poor man's rebuild trigger.)
| * | Re-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza ↵Ademar de Souza Reis Jr2011-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reis Jr Workaround MSVC2010 problems when linking QtWebKit Include MSVC2010 in the list of compilers where incremental build is disabled (INCREMENTAL:NO). Change suggested by Simo Falt <simo.falt@nokia.com>
| * | Re-apply change 3dd9e66baaa0848bcc2eb7daecf2b63724624358 by Ademar de Souza ↵Ademar de Souza Reis Jr2011-11-031-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reis Jr dos2unix on a webkit source file (fix support for Visual Studio) webkit/Source/WebCore/bindings/js/JSExceptionBase.h had CRLF terminations, which Visual Studio didn't like for some reason. Reported by Simo Falt. Patch is also being submited to upstream (webkit.org)
| * | Updated WebKit to 99371ddc1d61832131835964a753e1c5817f6916Zeno Albisser2011-11-0315-53/+411
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-11-011-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Missing icon in the designer documentation Fridge magnet example code snippet error qpaintdevice-qt3.html documentation errors QWebElement example missed information QSPlitter style-sheet example was invalid Errors in QSqlDriver::handle examples QGLColormap example was invalid QPointer made no mention of QWeakPointer Invalid links to http://developer.symbian.org QNetworkDiskCache documentation missed information QStyleSheet example used a property that is hidden. QList document referenced to non existing function QXmlQuery::bindVariable documentation bug Fix multiple typos in QLineF documentation. Qmake project file docs lacked information. Documentation error in SSL document Fix multiple typos in documentation. Fix for QVector::toList - code example documentation.
| * | | QWebElement example missed informationartoka2011-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the example there was told to use button.evaluateJavaScript("click()"); which doesn't work. Instead of "click()" it should be "this.click()". Changed to "this.click()". Task-number: QTBUG-17029 Merge-request: 2698 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-10-271-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Harfbuzz shaper: kerning adjustment does not need to be modified by RTL
| * | | | Harfbuzz shaper: kerning adjustment does not need to be modified by RTLJohn Tapsell2011-10-271-1/+1
| |/ / / | | | | | | | | | | | | | | | | Merge-request: 1435 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | Merge remote-tracking branch 'qt-fire-review/master'aavit2011-10-213-6/+6
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-10-101-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fixes: libpng symbols exported from QtGui.dll on Windows omit unassigned (and too recent codepoints) from the text Normalization process Fixed broken window surface flush when depth is 24 and bpp is not 32.
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-10-033-6/+6
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Added text about -random and -seed options in QTest to changelog Add another part of the source code to the snippet. Update changes-4.8.0 Update translation sources. Update the changelog for qdoc in 4.8
| | * | | Update translation sources.Casper van Donderen2011-09-293-6/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Geir Vattekar
* | | | | Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4aavit2011-10-191-6/+8
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PNG Development Group explains that libpng 1.5.4 (only) introduced a divide-by-zero bug in png_handle_cHRM(), which could lead to crashes (denial of service) for certain malformed PNGs. Ref. http://www.libpng.org/pub/png/libpng.html This commit contains the patch recommended by the PNG Development Group, ref. http://www.kb.cert.org/vuls/id/477046 Task-number: QTBUG-22168 (cherry picked from commit 55c2ea18c522bd8700f43884124e02b460cdb5e2)
* | | | Fixes: libpng symbols exported from QtGui.dll on Windowsaavit2011-10-101-0/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | The upgrade of the bundled libpng to version 1.5 had the side effect of causing the png functions to be exported from the QtGUi DLL when built with the MS Visual C++ compiler. Task-number: QTBUG-21455 Reviewed-by: Kim
* | | Sentences should end with a period! (Poor man's rebuild trigger.)Andreas Kling2011-09-221-1/+1
| | |
* | | Workaround MSVC2010 problems when linking QtWebKitAdemar de Souza Reis Jr2011-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | Include MSVC2010 in the list of compilers where incremental build is disabled (INCREMENTAL:NO). Change suggested by Simo Falt <simo.falt@nokia.com>
* | | dos2unix on a webkit source file (fix support for Visual Studio)Ademar de Souza Reis Jr2011-09-201-43/+43
|/ / | | | | | | | | | | | | | | webkit/Source/WebCore/bindings/js/JSExceptionBase.h had CRLF terminations, which Visual Studio didn't like for some reason. Reported by Simo Falt. Patch is also being submited to upstream (webkit.org)
* | Updated WebKit to 64cce10 (qtwebkit-rc1, week36)Ademar de Souza Reis Jr2011-09-1327-50/+339
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes since last sync: [https://webkit.org/b/59927 #59927]: [SH4] AssemblerLabel does not name a type [https://webkit.org/b/63259 #63259]: Warnings in JSC's JIT on 32 bit [https://webkit.org/b/67254 #67254]: [Qt][DRT] Normalize file:///tmp/LayoutTests in LayoutTestController::pathToLocalResource() [https://webkit.org/b/64527 #64527]: [Qt]Update layout test results for newer Qt 4.8.x [https://webkit.org/b/67644 #67644]: [Qt][Symbian] REGRESSION[94105] DumpRenderTree.exe doesn't build on Symbian [https://webkit.org/b/67784 #67784]: frame-loading-via-document-write.html test cases have extra slash in path [https://webkit.org/b/67958 #67958]: (restricted bug) [https://webkit.org/b/61805 #61805]: (restricted bug) [https://webkit.org/b/64753 #64753]: (restricted bug) [https://webkit.org/b/67364 #67364]: (restricted bug) [https://webkit.org/b/67488 #67488]: (restricted bug) [https://webkit.org/b/67735 #67735]: (restricted bug) [https://webkit.org/b/67748 #67748]: (restricted bug)
* | Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)Ademar de Souza Reis Jr2011-09-0626-77/+364
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes since last sync: [https://webkit.org/b/66016 #66016]: [Qt] Add test for correct order of load signals in QWebPage [https://webkit.org/b/28851 #28851]: Emit last progress notification before calling dispatchDidFinishLoad [https://webkit.org/b/67285 #67285]: [Qt] Unskip API test for load signals order [https://webkit.org/b/67307 #67307]: [Qt][Symbian] REGRESSION(93235) Missing .def update [https://webkit.org/b/49448 #49448]: (restricted bug) [https://webkit.org/b/64737 #64737]: (restricted bug) [https://webkit.org/b/64741 #64741]: (restricted bug) [https://webkit.org/b/66015 #66015]: (restricted bug) [https://webkit.org/b/66141 #66141]: (restricted bug) [https://webkit.org/b/66360 #66360]: (restricted bug) [https://webkit.org/b/66699 #66699]: (restricted bug) [https://webkit.org/b/66799 #66799]: (restricted bug) [https://webkit.org/b/67556 #67556]: (restricted bug)
* | Updated WebKit to fb3b4700aa5abbb2db471b4f0eb7946ce4850cc4Ademar de Souza Reis Jr2011-08-307-6/+65
| | | | | | | | | | | | Changes since last sync: [https://webkit.org/b/61235 #61235]: JavaScriptCore doesn't build on MinGW-w64 [https://webkit.org/b/67055 #67055]: [Qt] Do not unconditionally use pkg-config in .pro files
* | Merge remote-tracking branch 'review/master'Sergio Ahumada2011-08-29474-4847/+10382
|\ \
| * | Do not unconditionally use pkg-config in .pro filesRohan McGovern2011-08-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the first pkg-config in PATH is prone to errors when cross compiling. This is a known issue, and `configure' already avoids using pkg-config for cross compiling (unless -force-pkg-config is used). However, there was previously no way for a .pro file to test whether or not the user had passed -force-pkg-config. Let !contains(QT_CONFIG, no-pkg-config) be used to test whether or not it is safe to run pkg-config.
| * | Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427eAdemar de Souza Reis Jr2011-08-268-78/+69
| | |
| * | Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fdAdemar de Souza Reis Jr2011-08-258-2/+14
| | | | | | | | | | | | | | | This time also including WebKitLibraries/*.a, needed for the Mac build.
| * | Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0Ademar de Souza Reis Jr2011-08-2547-71/+1312
| | |
| * | Updated WebKit to 4277f8277b1daf3ec33c996f5a760ccd1113af4bAdemar de Souza Reis Jr2011-08-18301-22/+392
| | | | | | | | | | | | | | | This time including webkit/include/ files generated on a Mac (thanks to Alexis Menard).
| * | Updated WebKit to 8ed79cb10ca72b5d240beae674a7932963cbd007Ademar de Souza Reis Jr2011-08-114-2/+12
| | | | | | | | | | | | Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
| * | Updated WebKit to 66b76cdb8ef823f27a8229c5cae2d35e7f2d3c59Ademar de Souza Reis Jr2011-08-11139-4752/+8663
| | | | | | | | | | | | Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-1531-2912/+7737
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/fancybrowser.pro src/3rdparty/libpng/ANNOUNCE src/3rdparty/libpng/CHANGES src/3rdparty/libpng/CMakeLists.txt src/3rdparty/libpng/LICENSE src/3rdparty/libpng/README src/3rdparty/libpng/configure.ac src/3rdparty/libpng/example.c src/3rdparty/libpng/libpng-manual.txt src/3rdparty/libpng/libpng.3 src/3rdparty/libpng/libpngpf.3 src/3rdparty/libpng/png.5 src/3rdparty/libpng/png.c src/3rdparty/libpng/png.h src/3rdparty/libpng/pngconf.h src/3rdparty/libpng/pngerror.c src/3rdparty/libpng/pnginfo.h src/3rdparty/libpng/pnglibconf.h src/3rdparty/libpng/pngmem.c src/3rdparty/libpng/pngpread.c src/3rdparty/libpng/pngpriv.h src/3rdparty/libpng/pngread.c src/3rdparty/libpng/pngrtran.c src/3rdparty/libpng/pngrutil.c src/3rdparty/libpng/pngset.c src/3rdparty/libpng/pngstruct.h src/3rdparty/libpng/pngtest.c src/3rdparty/libpng/pngtrans.c src/3rdparty/libpng/pngvalid.c src/3rdparty/libpng/pngwrite.c src/3rdparty/libpng/pngwtran.c src/3rdparty/libpng/pngwutil.c src/gui/dialogs/qfiledialog_symbian.cpp src/gui/kernel/qsoftkeymanager.cpp src/s60installs/s60installs.pro
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-08-03127-52415/+26133
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Updating libpng: Patches to libpng 1.5.4 for building it in Qt Updating libpng: Add libpng version 1.5.4 Updating libpng: Remove version 1.4.0
| | * Updating libpng: Patches to libpng 1.5.4 for building it in Qtaavit2011-08-022-5/+18
| | |
| | * Updating libpng: Add libpng version 1.5.4aavit2011-08-0241-0/+59715
| | | | | | | | | | | | | | | | | | | | | This is a clean copy of the official libpng 1.5.4 distribution, except that various extraneous stuff (examples, tests, etc) have been removed, as usual. The minor modifications to build it in Qt will follow in a separate commit.
| | * Updating libpng: Remove version 1.4.0aavit2011-08-02124-86010/+0
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-08-021-107/+0
| |\ \ | | |/ | |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove DerivedSources.pro from WebKit.
| | * Remove DerivedSources.pro from WebKit.Jocelyn Turcotte2011-08-021-107/+0
| | | | | | | | | | | | | | | | | | | | | | | | This .pro file gets processed by qmake while looking recursively for pro files. This may cause warnings and the file isn't necessary since derived sources have to be pre-generated before importing WebKit into src/3rdparty. Reviewed-by: Benjamin Poulain
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-201-0/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
| * | Check for buffer overflow in Lookup_MarkMarkPosJiang Jiang2011-07-191-0/+3
| |/ | | | | | | | | | | | | | | That may cause crash in this function with certain fonts. Task-number: QTBUG-17238 Done-by: Alberto Garcia <agarcia@igalia.com> Reviewed-by: Jiang Jiang
| * Update licenseheader text in source filesJyri Tahtela2011-05-132-34/+34
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Forward port qt modifications for sqlite3.cCharles Yin2011-07-191-2/+16
| | | | | | | | | | | | | | | | | | Forward port from: 1. c42bc88a9f366899747945a4478492cf765c7166 2. 0d61cf15358e1ff0b5125542ed4a9c4b7e96c141 Task-number: QTBUG-16607 Reviewed-by: Michael Goddard
* | Forward port the vxworks changesCharles Yin2011-07-191-3/+28
| | | | | | | | | | | | | | forward port from d7b688870aead912690188b324d370b920a7a600 Task-number: QTBUG-16607 Reviewed-by: Michael Goddard
* | Update sqlite to 3.7.7.1Charles Yin2011-07-193-20292/+39857
| | | | | | | | | | | | | | | | Updated sqlite3.h, sqlite3.c and shell.c from sqlite.org SHA1 for sqlite3.c: d47594b8a02f6cf58e91fb673e96cb1b397aace0 Task-number: QTBUG-16607 Reviewed-by: Michael Goddard
* | Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45Alexis Menard2011-06-296-14/+109
| | | | | | | | Reviewed-by: Andreas Kling
* | 2011-05-23 Matthew Delaney <mdelaney@apple.com>Alexis Menard2011-06-294-21/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Simon Fraser. Remove safeFloatToInt() in FloatRect.cpp and replace with working version of clampToInteger() https://bugs.webkit.org/show_bug.cgi?id=58216 * wtf/MathExtras.h: (clampToInteger): (clampToPositiveInteger): 2011-05-23 Matthew Delaney <mdelaney@apple.com> Reviewed by Simon Fraser. Remove safeFloatToInt() in FloatRect.cpp and replace with working version of clampToInteger() https://bugs.webkit.org/show_bug.cgi?id=58216 No new tests. The SVG tests mask-excessive-malloc.svg and pattern-excessive-malloc.svg exercise this code path. * platform/graphics/FloatRect.cpp: (WebCore::enclosingIntRect): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@87103 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
* | 2011-06-28 Alexis Menard <alexis.menard@openbossa.org>Alexis Menard2011-06-283-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Andreas Kling. [Qt] Use <QtX/x.h> style of headers for Qt tests which rely on it. https://bugs.webkit.org/show_bug.cgi?id=63562 Some Qt auto-tests rely on <QtX/x.h> types of includes. * Api/qwebkitplatformplugin.h: * symbian/platformplugin/qwebkitplatformplugin.h: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89958 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
* | 2011-06-27 Joe Wild <joseph.wild@nokia.com>Alexis Menard2011-06-282-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Simon Fraser. Crash on www.crave.cnet.com in FrameView::windowClipRect() https://bugs.webkit.org/show_bug.cgi?id=56393 Tests that a plugin of a swf file in a hidden iframe will not crash. This test required more than 1 content file and a timeout or else it would not repeat the error condition. This test will only crash on platforms (like Symbian) that don't allow nonvirtual functions to have a null this pointer. * plugins/hidden-iframe-with-swf-plugin-expected.txt: Added. * plugins/hidden-iframe-with-swf-plugin.html: Added. * plugins/resources/iframe-content-with-swf-plugin.html: Added. 2011-06-27 Joe Wild <joseph.wild@nokia.com> Reviewed by Simon Fraser. Crash on www.crave.cnet.com in FrameView::windowClipRect() https://bugs.webkit.org/show_bug.cgi?id=56393 Check for a null renderer to fix a crash. This situation can arise when external content/plugins is referenced from html elements with style="display:none". Test: plugins/hidden-iframe-with-swf-plugin.html * page/FrameView.cpp: (WebCore::FrameView::windowClipRect): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89876 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
* | 2011-06-28 Alexis Menard <alexis.menard@openbossa.org>Alexis Menard2011-06-284-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by Andreas Kling. [Qt] Use QtQuick imports in Api tests rather than old deprecated Qt 4.x imports. https://bugs.webkit.org/show_bug.cgi?id=63533 We need to use the new QtQuick 1.x imports rather than the old deprecated version. * tests/qdeclarativewebview/resources/webviewbackgroundcolor.qml: * tests/qdeclarativewebview/resources/webviewtest.qml: * tests/qdeclarativewebview/resources/webviewtestdefault.qml: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89923 268f45cc-cd09-0410-ab3c-d52691b4dbfc Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
* | Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9bAlexis Menard2011-06-2752-2120/+2901
| | | | | | | | | | | | Beta1 of QtWebkit 2.2. Reviewed-by: Andreas Kling
* | Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90Alexis Menard2011-06-2221-76/+530
| | | | | | | | Reviewed-By: Andreas Kling
* | Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8Alexis Menard2011-06-223-8/+169
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-06-141-8/+22
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: When asking for relations, don't crash on children that don't return an interface. Remove more inconsistencies with invisible. Fix a problem where the video would'nt show on some containers QAccessibleToolButton::text should return accessibleName if set. Remove stray semicolon.
generated by cgit v0.12 at 2025-02-06 09:36:35 (GMT)