| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: Ibb5165f3f4ac4aca23cf28a504b8ef7179b018b1
Reviewed-by: Andras Becsi <andras.becsi@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Prospective build fix for Mac OS X Mountain Lion
Change-Id: Ia6e83bba30788cd473bd01f7217e6153970f60be
Reviewed-by: Mike McQuaid <mike@mikemcquaid.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Fresh import from qtwebkit-2.2 branch that includes -Werror fix
The bison changes are due to a local bison upgrade.
Change-Id: I61a413a5550c748c56b39362e2a0f67c321afb4d
Task: QTBUG-23987
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
|
|
|
|
|
|
| |
Includes version bump and backport of build fix with newer glib versions
Change-Id: I42a7c6c835b3d7ae6e79f30f308b350b67dd1e7b
Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
QNX fixes for https://bugs.webkit.org/show_bug.cgi?id=77013 and
http://trac.webkit.org/changeset/109105 backported by
Nicolas Arnaud-Cormos <nicolas.arnaud-cormos.qnx@kdab.com>
Change-Id: I4b57f26bac6ed61a8a48ea6ef4c2dedf0503675b
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
|
|
|
|
|
|
|
| |
Backport Casper's doc fix from https://bugs.webkit.org/show_bug.cgi?id=82893
Change-Id: I85bd671132fe6e1bb8798960ef0db7f02e10b4b4
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
|
|
|
|
|
|
| |
Includes windows fix and fixes the shared library version.
Change-Id: Ia4b66661323cc4176bdfdf700aa072e9670b3bd2
Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
|
|
|
|
|
|
|
| |
QNX build fix.
Change-Id: I72b31faba88a569f62667f7803f6c7434ce6b15e
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-18101
Task-number: QTBUG-8673
Task-number: QTBUG-14194
Task-number: QTBUG-9109
Task-number: QTBUG-9466
Task-number: QTBUG-8323
Task-number: QTBUG-7924
Task-number: QTBUG-20355
Task-number: QTBUG-19367
Task-number: QTBUG-21295
Task-number: QTBUG-14554
Task-number: QTBUG-8331
Task-number: QTBUG-8329
Task-number: QTBUG-8786
Task-number: QTBUG-8787
Change-Id: I4b6403df4a0078fa385abbfab5b6c3a94f175295
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Updated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Set execution bits for more scripts.
Set execution bits for .test files.
Fix more permissions (no execute bit).
Fix permission (no execute bit).
QGraphicsLayoutItem - bound constraint the minimum and maximum size
Notify X11 of its resizable state through MWM Hints.
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Symbian-linux crosscompilation case changes
Symbian-linux crosscompilation debug-release align
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Update the cases to match actual files in Symbian, and add EPOCROOT
prefixes to data files in iby.
Reviewed-by: Juha Kukkonen
Task-number: QTBUG-14361
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
ISO/IEC 14882 2.2 Phases of translations: "user defined string literals"
are recognized as single preprocessor token in Phase 3, left unchanged by
"...preprocessing executed" in Phase 4. Previously, there were no user
defined liteal, and the intended concatanation was done in Phase 6
"adjacent string literal tokens are concatenated", after the macro expansion.
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com
Task-number: QTBUG-22847
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Re-apply change e3208a8d44423bc3b5c32e2e90f68675e51a3b73 by Andreas Kling
Re-apply change 37cde52cb17b57f8ec89c248f06331ed4977e51c by Ademar de Souza Reis Jr
Re-apply change 945c44d0865cf44363e6c860995f971ce952dd5f by Ademar de Souza Reis Jr
Updated WebKit to 52a11cec052aa40d3bbc06861be1177b649b4a99
|
| |
| |
| |
| | |
Sentences should end with a period! (Poor man's rebuild trigger.)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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)
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Re-apply change a14033620fab5edca44293ec6dfcc904e2e0eb20 by Andreas Kling
Re-apply change 3489808c1dcd157ac09dd6da16bc057b56696d59 by Ademar de Souza Reis Jr
Re-apply change 3dd9e66baaa0848bcc2eb7daecf2b63724624358 by Ademar de Souza Reis Jr
Updated WebKit to 99371ddc1d61832131835964a753e1c5817f6916
|
| |
| |
| |
| | |
Sentences should end with a period! (Poor man's rebuild trigger.)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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)
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
|\ \
| |/ |
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
Include MSVC2010 in the list of compilers where incremental
build is disabled (INCREMENTAL:NO).
Change suggested by Simo Falt <simo.falt@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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)
|
|/
|
|
| |
Reviewed-By: Geir Vattekar
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
| |
This time also including WebKitLibraries/*.a, needed for the
Mac build.
|
| |
|
|
|
|
|
| |
This time including webkit/include/ files generated on a Mac
(thanks to Alexis Menard).
|
|
|
|
| |
Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
|
|
|
|
| |
Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
|
|
|
|
| |
Reviewed-by: Andreas Kling
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Beta1 of QtWebkit 2.2.
Reviewed-by: Andreas Kling
|
|
|
|
| |
Reviewed-By: Andreas Kling
|