summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore
Commit message (Collapse)AuthorAgeFilesLines
* use "win32-g++*" scope to match all MinGW makespecsMark Brand2010-06-101-1/+1
| | | | | | | | | | | | | | The scope "win32-g++" comes from the name of the makespec. However, it is frequently used to check for MinGW. This works fine as long as win32-g++ is the only makespec for MinGW. Now we need the wildcard to cover "win32-g++-cross" as well. Also reordered test of win32 before win32-g++*. Also took opportunity to use else. Merge-request: 2407 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Updated WebKit to 6db5de6d18c3ab8b74809303e4d79abacfc570a8Simon Hausmann2010-06-072-2/+17
| | | | | | | | Integrated changes: || <https://webkit.org/b/31403> || [Qt] Disable pthread_setname_np. || || <https://webkit.org/b/38324> || [Qt] Fix compilation with QT_NO_FEATURE || || <https://webkit.org/b/40221> || REGRESSION(r60169): [Qt] Selected text is not drawn with the correct color. ||
* Updated WebKit to 4696beb87359fe9236d23e0791526eb38dab341dSimon Hausmann2010-05-162-1/+21
| | | | | | | | Integrated changes: || <https://webkit.org/b/38444> || [Qt] GraphicsLayer caches directly composited images || || <https://webkit.org/b/37684> || [Qt] JSValue QtClass::fallbackObject can be optimized || || <https://webkit.org/b/37701> || [Qt] Target(WebCore,jsc,...) must depends on static library of JavaScriptCore ||
* Updated WebKit to 3d774b9df1f963452b1cfe34f9fafad0d399372aSimon Hausmann2010-05-152-0/+24
| | | | | | | | | | | Integrated changes: || <https://webkit.org/b/37665> || [Qt] Rename QtLauncher to QtTestBrowser || || <https://webkit.org/b/37381> || [Qt] animations/dynamic-stylesheet-loading.html fails with accelerated compositing || || <https://webkit.org/b/38630> || VS2010 asserts a null iterator passed to std::copy in Vector::operator= || || <https://webkit.org/b/38440> || [Qt] use QT_MOBILE_THEME in Symbian || || <https://webkit.org/b/39031> || CSSParser::parseColor() shouldn't alter 'color' unless passed a valid color string. || || <https://webkit.org/b/38949> || JavaScript unable to invoke methods declared in QML ||
* Updated WebKit to 5cf023650a8da206a8cf3130e9d4820b95e1bc7cSimon Hausmann2010-05-144-3/+15
| | | | | | | | | | | | | | | Integrated changes: * Doc day API doc overhaul || <https://webkit.org/b/38370> || [Qt] GraphicsLayer: depth-test causes flicker in certain situations || || <https://webkit.org/b/38921> || [Qt] emit initialLayoutCompleted signal from FrameLoaderClientQt::dispatchDidFirstVisuallyNonEmptyLayout || || <https://webkit.org/b/38863> || [Qt] Detect debug mode consistently || || <https://webkit.org/b/38389> || [Qt] Update the Symbian version for the user agent || || <https://webkit.org/b/39062> || [Qt] Improve QtLauncher user agent dialog resize || || <https://webkit.org/b/38841> || Ignore invalid values for various CanvasRenderingContext2D properties || || <https://webkit.org/b/38685> || [Qt] tst_QWebPage::inputMethods failing on Maemo5 || || <https://webkit.org/b/38655> || [Qt] REGRESSION(r58497) tst_QGraphicsWebView::crashOnViewlessWebPages() is failing ||
* Updated WebKit to 57d10d5c05e59bbf7de8189ff47dd18d1be996dcSimon Hausmann2010-05-132-15/+0
| | | | Disable the JIT on Symbian again, as it causes crashes.
* Updated WebKit to b4aa5e1ddc41edab895132aba3cc66d9d7129444Simon Hausmann2010-05-112-3/+26
| | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/38747> || mingw-w64 and JIT support || || <https://webkit.org/b/38119> || [Qt] QWebPage viewMode property || || <https://webkit.org/b/37097> || [Qt] Fix infinite redirection loop in QNetworkReplyHandler || || <https://webkit.org/b/38668> || [Qt] Enable YARR_JIT for X86 Mac for QtWebKit || || <https://webkit.org/b/38834> || [Qt] Adapt DNS pre-fetching to Qt DNS cache code || || <https://webkit.org/b/38574> || [Qt] Crash in QGraphicsWebViewPrivate::~QGraphicsWebViewPrivate when animation were used || || <https://webkit.org/b/31407> || [PATCH] [Qt] Compilation with Plugins disabled is broken || || <https://webkit.org/b/38514> || Crash in handleTouchEvent: using dangling node ptrs in hashmap || || <https://webkit.org/b/38646> || Potential crash in EventHandler::handleTouchEvent || || <https://webkit.org/b/38488> || Spatial Navigation: create a getter for the "fudgeFactor" || || <https://webkit.org/b/38523> || [Qt] QtWebKit has render bugs on Google Maps markers || || <https://webkit.org/b/37276> || LayoutTests/fast/canvas/pointInPath.html passed, actually it failed || || <https://webkit.org/b/37023> || [Qt] Expose HTMLTokenizer yielding parameters ||
* Updated WebKit to 992e57ee469bd8c6a2afef6b15896a161ab8aeb3Simon Hausmann2010-05-052-0/+15
| | | | | | | | | | | Fixes integrated since the last import: || <https://webkit.org/b/38339> || [Qt] Enable JIT for QtWebKit on Symbian || || <https://webkit.org/b/38116> || Media queries empty values || || <https://webkit.org/b/38125> || View modes names in CSSValueKeywords.in || Also disabled QtMultimedia support for HTML 5 Audio/Video elements and removed WebGL support.
* Updated WebKit to 2992802f35fd47e32bb94a4b1f48cce7ec7fda9dSimon Hausmann2010-04-292-8/+27
| | | | | | | | | | Integrated changes: || <https://webkit.org/b/35312> || [Qt] GraphicsLayer: preserves-3d and backface visibility || || <https://webkit.org/b/37195> || JSC's currentThreadStackBase is not reentrant on some platforms || || <https://webkit.org/b/37323> || [Qt] tst_QWebHistoryInterface::visitedLinks() fails || || <https://webkit.org/b/38316> || [Qt] REGRESSION(r57638): tst_qwebframe::objectDeleted() fails || || <https://webkit.org/b/38314> || [Qt] REGRESSION(r57982): tst_qwebpage::showModalDialog() crashes ||
* Updated WebKit to 862268aeb7150d3795d05bfc05f661bb5c598a27Simon Hausmann2010-04-2825-322/+532
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated bugfixes: || <https://webkit.org/b/33280> || [RVCT] ACID3 test crash || || <https://webkit.org/b/37635> || Spatial Navigation: make hasOffscreenRect() to earlier return 'true' if absoluteClippedOverflowRect() gives an empty rect || || <https://webkit.org/b/37637> || Repaint of fixed, transformed element is broken || || <https://webkit.org/b/37313> || [Qt] Fix or remove the runtime flag for accelerated compositing. || || <https://webkit.org/b/36365> || [Qt] [Performance] GraphicsLayer: constructing the layers takes too long || || <https://webkit.org/b/37135> || Spatial Navigation: bail out as soon as algorithm finds a focus candidate is not applicable || || <https://webkit.org/b/38062> || [Qt] HTTP pipelining efficiency increase || || <https://webkit.org/b/35607> || Allow building smoothly on win32 and win64 using GCC || || <https://webkit.org/b/37530> || No default selection for <select multiple> menu lists. || || <https://webkit.org/b/37152> || [Qt] Rendering artifacts on Qt plugins when scrolling the page || || <https://webkit.org/b/36773> || Spatial Navigation: proper handle negative x or y coordinates || || <https://webkit.org/b/34729> || [Qt] Exposing an QVariantMap containing QObjectStar to Javascript causes Segmentation Fault || || <https://webkit.org/b/34730> || [Qt] Null QObjects properties cause Segmentation Fault || || <https://webkit.org/b/37163> || [Qt] inputMethodQuery returns coordinates in web page coordinates rather than in item coordinates. || || <https://webkit.org/b/37934> || [Qt] QtLauncher: make FPS measurement accurate || || <https://webkit.org/b/36783> || Update of fixed elements is not made correctly when the page has been scrolled || || <https://webkit.org/b/37683> || [Qt] WebCore::Font::font() causes a QFont detach || || <https://webkit.org/b/36532> || [Qt] Use integer pixel metric QFont API to fix rounding errors in text rendering on the Mac || || <https://webkit.org/b/37303> || [Qt] Application crash on exit if NPPlugin is loaded || || <https://webkit.org/b/37816> || [Qt] Multitouch mocking in QtLauncher doesn't work with QGraphicsView || || <https://webkit.org/b/38111> || [Qt] Fix compilation against Qt 4.7 || || <https://webkit.org/b/37821> || [Qt] loads APP directory when calling "window.open" || || <https://webkit.org/b/35393> || [Qt] GraphicsLayer: performance optimizations || || <https://webkit.org/b/32196> || Make it possible to distinguish between NPAPI plugins and Application plugins || || <https://webkit.org/b/37319> || [Qt] tst_QWebFrame::overloadedSlots() fails || || <https://webkit.org/b/34888> || Mac OS X: Use deployment target to determine whether memory tagging should be enabled || || <https://webkit.org/b/36621> || Fix build if NPAPI support is disabled || || <https://webkit.org/b/37461> || Spatial Navigation: make renderRectRelativeToRootDocument method to fallback to getRect() of Element when needed || || <https://webkit.org/b/37719> || Some HTML5 Input tags not treated as needing an input method. || || <https://webkit.org/b/36312> || Support viewport meta tag || || <https://webkit.org/b/36751> || [Qt] Windows CE build is broken || || <https://webkit.org/b/37980> || Fix the build on MSVC 64bit || || <https://webkit.org/b/37727> || [Qt] Webkit fixes for RVCT4 || || <https://webkit.org/b/36832> || [Qt] crash in debug mode just before exit || || <https://webkit.org/b/37867> || [Qt] Patches to upstream from Qt for 2.0 || || <https://webkit.org/b/37615> || Changing view mode names due to specification changes || || <https://webkit.org/b/36853> || REGRESSION(r56552): Broken scrollbars size || || <https://webkit.org/b/36216> || [Qt] GraphicsLayer: support fill-modes || || <https://webkit.org/b/36859> || [Qt]QtLauncher crash on page with CSS 3D transform || || <https://webkit.org/b/37802> || Spatial Navigation: at @updateFocusCandidateIfCloser make an assignment shortcut when FocusCandidate is null ||
* Compile fix for Visual Studio 2010 (VC10)Prasanth Ullattil2010-04-213-3/+7
| | | | Reviewed-by: Jocelyn Turcotte
* Remove overloaded placement new operatorsJanne Koskinen2010-04-191-1/+0
| | | | | | WINSCW and Sun OS build fix. placement new is already defined in NonCopyable, no need for overloading. Reviewed-by: Simon Hausmann
* WINSCW compile fix for HashMapJanne Koskinen2010-04-191-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
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-182-0/+6
|\ | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fixed compile of JavaScriptCore for Symbian^3. Fix compilation: StringImpl has no public, default constructor JavaScriptCore doesn't need QtGui Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
| * Fixed compile of JavaScriptCore for Symbian^3.Rohan McGovern2010-04-161-0/+2
| | | | | | | | | | | | Need some additional include paths. Reviewed-by: Thiago Macieira
| * JavaScriptCore doesn't need QtGuiThiago Macieira2010-04-141-0/+1
| |
| * Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile ↵Thiago Macieira2010-04-141-0/+3
| | | | | | | | any time soon with C++0x
* | Set library path properly for all systemsThomas Zander2010-04-161-1/+2
|/ | | | This makes webkit link again on symbian/linux
* QtWebKit: Corrects symbols visibility for JavaScriptCore.Jocelyn Turcotte2010-04-131-0/+4
| | | | | | | | Since it is now a static library, this configuration has to be added explicitely. This patch should be overwritten by the next WebKit import. Reviewed-by: Simon Hausmann
* QtWebKit: Build fix for WinCE.Jocelyn Turcotte2010-04-121-2/+2
| | | | | | | | Moved the include of an incompatible header inside platform guard macros. This commit should be overwritten with the next WebKit import. Reviewed-by: Simon Hausmann
* QtWebKit: Fix build on mac.Jocelyn Turcotte2010-04-122-8/+14
| | | | | | | | | | - Enables debug_and_release explicitely since qbase.pri does - Make DESTDIR always go in JavaScriptCore/<configuration>, not dependent on the debug_and_release config - Use different targets for debug and release to prevent file clashes This commit should be overwritten on the next WebKit import Reviewed-by: TrustMe
* QtWebKit: Fix build on WinCE, adding missing include path.Jocelyn Turcotte2010-04-121-0/+3
| | | | | | This patch should be overwritten on next import from WebKit. Reviewed-by: TrustMe
* Update src/3rdparty/webkit from trunk.Jocelyn Turcotte2010-04-126-25/+51
| | | | | | | | Imported from 862268aeb7150d3795d05bfc05f661bb5c598a27 in branch qtwebkit-2.0 of repository git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git Reviewed-by: TrustMe
* Fix failing assertions in debug buildsSimon Hausmann2010-04-091-0/+2
| | | | | | Cherry-pick of http://trac.webkit.org/changeset/57320 Don't mix NDEBUG and DEBUG between JSC and WebCore.
* QtWebKit: Fix build on mac.Jocelyn Turcotte2010-04-082-8/+14
| | | | | | | | | | - Enables debug_and_release explicitely since qbase.pri does - Make DESTDIR always go in JavaScriptCore/<configuration>, not dependent on the debug_and_release config - Use different targets for debug and release to prevent file clashes This commit should be overwritten on the next WebKit import Reviewed-by: TrustMe
* QtWebKit: Build fix for WinCE.Jocelyn Turcotte2010-04-071-2/+2
| | | | | | | | Moved the include of an incompatible header inside platform guard macros. This commit should be overwritten with the next WebKit import. Reviewed-by: Simon Hausmann
* QtWebKit: Fix build on WinCE, adding missing include path.Jocelyn Turcotte2010-04-071-0/+3
| | | | | | This patch should be overwritten on next import from WebKit. Reviewed-by: TrustMe
* Update src/3rdparty/webkit from trunk.Jocelyn Turcotte2010-04-06367-12768/+35216
| | | | | | | | Imported from 839d8709327f925aacb3b6362c06152594def97e in branch qtwebkit-2.0 of repository git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git Rubber-stamped-by: Simon Hausmann
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-311-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (31 commits) Fix compilation with Sun CC: no semi-colon after Q_ENUM. Remove the "Insert unicode control character" menu entry on X11. adds a timeout option to QThreadPool::waitForDone(); Remove leading whitespace from Qt header macros. Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch. Add QDateTime members that operate on 64-bit milliseconds. Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct. qdoc: Added <div> elements to some html output for class references. Fix compile error on mingw. MONILITY-645 Do not override alternate background color in Plastique Fix QComboBox ignoring foreground role in some styles Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined Fix compilation with Sun CC: Ensure that we return QPair<long,long> in all cases. Update PLATFORM(SPARC64) to CPU(SPARC64) jui files are no c++ ... scan some more file types by default Support EtchDisabledText with spin box on Windows style QNAM HTTP: Fix invoking a method when being destructed right now ...
| * Trivial fix to JavaScriptCore to fix building with MSVC 2010John Brooks2010-03-271-2/+2
| | | | | | | | Reviewed-By: Thiago Macieira
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-316-38/+304
|\ \ | |/ |/| | | | | | | | | | | Conflicts: configure doc/src/modules.qdoc src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicswidget.h
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-03-306-38/+304
| | | | | | | | | | | | | | | | ( ecfa4583e573ce4dff1f0df12f6bdba3022376e5 ) Changes in WebKit/qt since the last update: * r56370 - https://bugs.webkit.org/show_bug.cgi?id=34350 -- [Symbian] More efficient aligned memory allocation for JSC Collector
* | Fix compile on symbian better.Thomas Zander2010-03-221-2/+2
| |
* | gcc for Symbian doesn't support gcc extensions like atomicity.h - disableIain2010-03-191-2/+2
|/
* Fix the WebKit buildSimon Hausmann2010-02-101-1/+1
| | | | | | It's PLATFORM(SYMBIAN) in 4.x, not OS() like in the trunk Reviewed-by: Trust me
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-02-102-0/+17
| | | | | | | ( ffae5e11181a3961193fa21ea405851cad714d4b ) Changes in WebKit/qt since the last update: * https://bugs.webkit.org/show_bug.cgi?id=34170 -- [Qt] Javascript undefined > 0 returns true on Symbian
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-202-17/+0
| | | | | | | | | | | | | | | | | ( e15bd5454732bab9ffff4e1e5a755f41fd4e2eff ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-19 Jocelyn Turcotte <jocelyn.turcotte@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Fix QWebInspector destruction problem. https://bugs.webkit.org/show_bug.cgi?id=31664 * Api/qwebpage.cpp: (QWebPage::~QWebPage):
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-073-8/+38
| | | | | | | | | | | | | | | | | | | | | ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-01-07 Yael Aharon <yael.aharon@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Allow the application to override online/offline network status https://bugs.webkit.org/show_bug.cgi?id=32684 Add a setting so that applications can overide the network status. Applications that use this setting still need to block network access through QNAM. * Api/qwebsettings.cpp: (qt_networkAccessAllowed):
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-072-0/+18
| | | | | | | | | | | | | | | | | | | | ( b217cdfedc7b5e7581325bda718192247f03dd5d ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-01-07 Yongjun Zhang <yongjun.zhang@nokia.com>, Laszlo Gombos <laszlo.1.gombos@nokia.com> Reviewed by Simon Hausmann. [Qt] need an API to suspend and resume active Javascript DOM objects. https://bugs.webkit.org/show_bug.cgi?id=31673 Add suspend and resume DOM objects private API to QWebFrame. * Api/qwebframe.cpp: (qt_suspendActiveDOMObjects): (qt_resumeActiveDOMObjects):
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-052-1/+21
| | | | | | | | | | ( 5d691a1c283938dfbdf891883d8cff8a6ef040bf ) Changes in WebKit/qt since the last update: * Prospective build fix for IA64 Task: QTBUG-6948
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-12-301-5/+5
| | | | | | | | | ( c07df5686b431aa5d11643d00308d8f8f59d88b1 ) Changes in WebKit/qt since the last update: * Disable HTML5 Datagrid * Fix RVCT build
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-12-292-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-12-14 Holger Hans Peter Freyther <zecke@selfish.org> Reviewed by Kenneth Rohde Christiansen. [Qt] Fix JavaScript prompt behavior for empty/null strings. https://bugs.webkit.org/show_bug.cgi?id=30914 The patch is based on the work done by Gupta Manish. In the default implementation of the JavaScript prompt we are using a QInputDialog to get the text and this has one quirk with regard to not entering any text. In other WebKit ports and in Firefox an empty string is returned but in the Qt case it is a null string. Change the API documentation in QWebPage to mention we want to have a non null string but do the fixup in the ChromeClientQt to support existing code. * Api/qwebpage.cpp: (QWebPage::javaScriptPrompt): Change API documentation * WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::runJavaScriptPrompt): Fixup null QString
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-11-303-2/+28
| | | | | | ( 9de63cde0ac8aa08e207d4ffce2846df1a44a364 ) Changes in WebKit/qt since the last update:
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-11-252-2/+12
| | | | ( 27984c8c8d021a6bff604da57520959d420a642c )
* Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-11-232-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | ( efa69b6181ce5c045097351cdcf6c158da3f4888 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-19 Olivier Goffart <ogoffart@trolltech.com> Reviewed by Simon Hausmann. [Qt] Normalize signal and slot signatures. * Api/qgraphicswebview.cpp: (QGraphicsWebView::setPage): * Api/qwebview.cpp: (QWebView::setPage): * WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::setFrame): * docs/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp: (wrapInFunction): * tests/qwebframe/tst_qwebframe.cpp: * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::modified): (tst_QWebPage::database):
* Revert "Revert "Fix detection of linux-g++""Simon Hausmann2009-11-191-1/+1
| | | | | | This reverts commit baab5f7e77c1216ede839766c97abef1a708b365. Reviewed-by: Paul
* Merge branch '4.6' of oslo-staging-1 into 4.6Simon Hausmann2009-11-191-0/+12
|\
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-11-181-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 7bdf90f753d25fb1b5628b0980827df11110ad5a ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-18 Paul Olav Tvete <paul.tvete@nokia.com> Reviewed by Simon Hausmann. [Qt] Make the QWebElement::render() test pass when pixmaps aren't 32 bit. * tests/qwebelement/tst_qwebelement.cpp: (tst_QWebElement::render): 2009-11-18 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Tor Arne Vestbø. Clarify and simplify the legal section in the overview documentation, after review with our legal team. * docs/qtwebkit.qdoc: 2009-11-18 Simon Hausmann <simon.hausmann@nokia.com> Reviewed and suggested by Tor Arne Vestbø. Fix the autotest after commit ecbb2c0dd21bfc197e1f7b53150ec9b1a1d8cb8f to compare the Qt::ImFont property's family against an explicitly previously configured family. * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::inputMethods):
* | Revert "Fix detection of linux-g++"Paul Olav Tvete2009-11-191-1/+1
|/ | | | | | | | | This reverts commit 333bd2e761af8aaf6efd3d66eb028af046c4dfc2. The change broke compilation of QWS, since QtGui depends on glib, but doesn't link with it directly. This needs to be fixed properly, but not just before the release. Reviewed-by: Harald Fernengel
* Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-177-345/+860
|\
generated by cgit v0.12 at 2024-10-27 10:24:45 (GMT)