summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵v4.8.0-betaQt Continuous Integration System2011-07-0320-48/+48
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Fixing typo
| * Doc: Fixing typoSergio Ahumada2011-07-0220-48/+48
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-07-0213776-1039988/+2118711
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: (41 commits) Make sure the declarative plugin of QtWebKit is build once. Make sure JavaScriptCore is build once. Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45 2011-05-23 Matthew Delaney <mdelaney@apple.com> Fix headers generation for QtWebKit. 2011-06-28 Alexis Menard <alexis.menard@openbossa.org> Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript. Fix the auto-tests of QtWebKit. 2011-06-27 Joe Wild <joseph.wild@nokia.com> 2011-06-28 Alexis Menard <alexis.menard@openbossa.org> Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9b Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90 Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114 Make QtWebKit actually works when linked to an application. Attempt to get Symbian building with SQLite. Make the headers test pass by including QtGui/QColor instead of QColor. Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib to CONFIG. Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x. Use WTF::notFound instead of -1 to check for Vector::find() errors. The autotests don't even build on Symbian, skip them for now. ...
| * Make sure the declarative plugin of QtWebKit is build once.Alexis Menard2011-06-301-4/+0
| | | | | | | | | | | | | | | | In the old WebKit the main pro file was not triggering the build of the declarative plugin therefore it was added as a child of src.pro. It's not the case anymore. Reviewed-by: Andreas Kling
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-06-301-7/+0
| |\ | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team: Make sure JavaScriptCore is build once.
| | * Make sure JavaScriptCore is build once.Alexis Menard2011-06-301-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | In the old WebKit the main pro file was not triggering the build of JavaScriptCore therefore it was added as a child of src.pro. It's not the case anymore. Reviewed-by: Andreas Kling
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-06-3013776-1039981/+2118715
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team: (39 commits) Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45 2011-05-23 Matthew Delaney <mdelaney@apple.com> Fix headers generation for QtWebKit. 2011-06-28 Alexis Menard <alexis.menard@openbossa.org> Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript. Fix the auto-tests of QtWebKit. 2011-06-27 Joe Wild <joseph.wild@nokia.com> 2011-06-28 Alexis Menard <alexis.menard@openbossa.org> Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9b Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90 Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114 Make QtWebKit actually works when linked to an application. Attempt to get Symbian building with SQLite. Make the headers test pass by including QtGui/QColor instead of QColor. Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib to CONFIG. Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x. Use WTF::notFound instead of -1 to check for Vector::find() errors. The autotests don't even build on Symbian, skip them for now. Hack SystemTimeWin.cpp to build on MSVC2005. Make Float32Array and Int16Array build on RVCT 2.x. ...
| | * 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>
| | * Fix headers generation for QtWebKit.Alexis Menard2011-06-291-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | syncqt assumes that the pro files of modules are named the same way as the directory they are in. QtWebKit 2.2 has its main pro file called QtWebKit.pro and not qt.pro even if it's located in src/3rdParty/webkit/Source/WebKit/qt. This patch ensure that syncqt will look for a pro file if there is one in the directory in the case there isn't one named the same way as the directory. Reviewed-by:mariusSO
| | * 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>
| | * Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript.Alexis Menard2011-06-281-1/+4
| | | | | | | | | | | | | | | | | | | | | The library leaks symbols mostly due to gcc bugs. We can't really test WebKit. Reviewed-by: Thiago Macieira
| | * Fix the auto-tests of QtWebKit.Alexis Menard2011-06-285-5/+5
| | | | | | | | | | | | | | | | | | The source tree of WebKit was reorganized. The pro files needs to be updated. Reviewed-by:Andreas Kling
| | * 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
| | * Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8Alexis Menard2011-06-2390-1166/+2459
| | |\
| | * | 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-222627-16677/+99022
| | |\ \
| | * | | Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114Alexis Menard2011-06-2061-1682/+1556
| | | | |
| | * | | Make QtWebKit actually works when linked to an application.Alexis Menard2011-06-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that syncqt generates proper headers with proper paths so that headers.pri in $BUILD_DIR/lib/QtWebKit points to the right place. headers.pri in the build dir is used by qbase.pri to setup MacOS frameworks for example. Reviewed-By: Andreas Kling
| | * | | Attempt to get Symbian building with SQLite.Andreas Kling2011-06-101-0/+9
| | | | |
| | * | | Make the headers test pass by including QtGui/QColor instead of QColor.Andreas Kling2011-06-101-1/+1
| | | | |
| | * | | Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib ↵Andras Becsi2011-06-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to CONFIG. Reviewed by Andreas Kling
| | * | | Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x.Andreas Kling2011-06-081-2/+2
| | | | |
| | * | | Use WTF::notFound instead of -1 to check for Vector::find() errors.Andreas Kling2011-06-081-2/+2
| | | | |
| | * | | The autotests don't even build on Symbian, skip them for now.Andreas Kling2011-06-081-1/+3
| | | | |
| | * | | Hack SystemTimeWin.cpp to build on MSVC2005.Andreas Kling2011-06-081-0/+4
| | | | |
| | * | | Make Float32Array and Int16Array build on RVCT 2.x.Andreas Kling2011-06-082-3/+5
| | | | | | | | | | | | | | | | | | | | Partial merge of <http://trac.webkit.org/changeset/88336>.
| | * | | Fix build with RVCT 2.xAndreas Kling2011-06-071-1/+2
| | | | |
| | * | | Updated WebKit to cbc99535043a2abc98d6701943595f52fbaf5b19Andreas Kling2011-06-064-4/+14
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Alexis Menard
| | * | | Updated WebKit to 4e7dfbab30278b0427e699baaadbf3e5aab88203Alexis Menard2011-06-0365-367/+1772
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas Kling
| | * | | Updated WebKit to dbda3e9596b836ab6eb88c500766dba6745759beAlexis Menard2011-06-0313-12/+143
| | | | |
| | * | | Some qmake black magic to pick up the right file.Alexis Menard2011-06-032-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I deleted the old hack of Andreas, it's not needed. Reviewed-by: Andreas Kling
| | * | | Add a dummy Source.pro that simply includes WebKit.proAndreas Kling2011-06-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is my sneaky attempt at making Symbian build. Reviewed-by: Alexis Menard
| | * | | Updated WebKit to 7e7119292e94f55a66d391cd183a4dd6ec1a8d65Alexis Menard2011-06-028-119/+5
| | | | | | | | | | | | | | | | | | | | Reviewed by: Andreas Kling
| | * | | Updated WebKit to 7e7119292e94f55a66d391cd183a4dd6ec1a8d65Alexis Menard2011-06-0282-4251/+1705
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas Kling
| | * | | Updated WebKit to efbf910ad7c49e8cdf81411b4ac0abeea0efd8f8Alexis Menard2011-06-0219-58/+324
| | | | | | | | | | | | | | | | | | | | Reviewed by: Andreas Kling
| | * | | Fix build of Fancy Browser demo.Alexis Menard2011-06-021-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas Kling
| | * | | Updated WebKit to 9b4474ac44ee2f3311b435bd45630f5c2c357217Alexis Menard2011-06-012-0/+251
| | | | |
| | * | | Updated configure.exe to build webkit properly.Alexis Menard2011-06-011-0/+0
| | | | | | | | | | | | | | | | | | | | Reviewed by: Andreas Kling
| | * | | Updated WebKit to 9b4474ac44ee2f3311b435bd45630f5c2c357217Alexis Menard2011-05-3115-131/+58
| | | | |
| | * | | Make QtWebKit build properly. QtWebKit is not just build by WebCore.pro butAlexis Menard2011-05-313-128/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by QtWebKit.pro. We should read that one instead. I also removed some files which should not be here. Reviewed by: Andreas Kling
| | * | | Fix configure after new import of WebKit.Alexis Menard2011-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.exe still needs to be regenerated. Reviewed by: Andreas Kling
| | * | | Updated WebKit to 65360d3d3377f120aecccf1bf9b9ae9444d488e1Alexis Menard2011-05-3127-72/+232
| | | | |
| | * | | Updated WebKit to af58e9520937cc6fc3e31fe5d6682d19842e044dAlexis Menard2011-05-3119-37/+217
| | | | |
| | * | | Updated WebKit to d14495f006a09eaee01d155fa57c80537408a835Alexis Menard2011-05-309316-8/+2836070
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas Kling
| | * | | Remove old QtWebKit.Alexis Menard2011-05-305254-1758183/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas Kling
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-07-0234-216/+125
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: changelog Compile with DEBUG_FONTENGINE define minor optimization remove the old compatibility code make QFontEngineQPF1 work even without mmap(2) support Doc: Fixing typo
| * | | | | changelogHarald Fernengel2011-07-011-0/+5
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 14:37:01 +0000