| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: Andreas Kling
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/global/qnamespace.h
src/gui/text/qtextcontrol.cpp
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-18484
Task-number: WEBKIT-57841
Reviewed-by: axis
Reviewed-by: Janne Koskinen
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
The previously used name "Nokia, Qt" was not usable for Nokia
Content Signing, which only allows "Nokia" as the visible vendor
name. The unique vendor ID remains as "Nokia, Qt"
Reviewed-by: TrustMe
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| | |
This is mostly the same as for unix.
Merge-request: 2543
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/opengl/qwindowsurface_gl.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We look though SOURCES for Objective-C/C++ source files and if we find
any we warn the user and move the offending file to OBJECTIVE_SOURCES.
We also don't generate implicit rules for .mm files anymore, since
that's not supported by qmake and will break in mysterious ways.
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qwidget.cpp
src/gui/text/qfontengine_ft.cpp
|
| | |
| | |
| | |
| | |
| | |
| | | |
https://bugs.webkit.org/show_bug.cgi?id=39945
This revision is already present in QtWebKit 2.1
|
|\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
src/gui/painting/qpdf.cpp
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/painting/qrasterizer.cpp
src/network/access/qnetworkaccessmanager.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/assistant/tools/assistant/mainwindow.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Includes Jay's fix for the JSC memory consumption on Symbian
https://bugs.webkit.org/show_bug.cgi?id=34349
See also commit 03b7a3cffba609df56b4ccadacae6b6f985e96e9
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | | |
Conflicts:
configure
src/corelib/global/qglobal.h
|
| |\ \
| | |/
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/painting/qtextureglyphcache_p.h
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
|
| | |
| | |
| | |
| | | |
Reviewed-by: mariusso
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
With this patch one can configure with -webkit-debug to build Webkit
with debug symbols without having to manually edit WebCore.pro.
Merge-request: 816
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/kernel/qobject.h
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
src/declarative/util/qdeclarativelistmodel.cpp
|
| | |
| | |
| | |
| | | |
The missing install functionality is only true for mmp based systems.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Sync with qtwebkit-2.0 branch
* Includes Thiago's intel compiler fixes
* Girish' Maemo5 local rendering fixes
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure
src/corelib/global/qglobal.h
src/corelib/tools/qsimd.cpp
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
bin/syncqt
demos/declarative/snake/content/snake.js
demos/declarative/snake/snake.qml
doc/src/development/qmake-manual.qdoc
src/corelib/plugin/plugin.pri
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qdesktopwidget_win.cpp
src/gui/painting/qdrawhelper.cpp
tests/auto/qdir/tst_qdir.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
|
| | |
| | |
| | |
| | | |
The missing install functionality is only true for mmp based systems.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
|\ \ \
| |/ / |
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/painting/qpainter.cpp
src/gui/text/qtextengine.cpp
tests/auto/qimage/tst_qimage.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-html-templates.qdocconf
tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | |
| | |
| | |
| | |
| | |
| | | |
Integrated changes:
|| <https://webkit.org/b/43782> || [Qt] NPAPI plugins not drawn until page scrolled ||
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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 ||
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Test directory untouched.
This just apply those regexp:
git grep -O"sed -i 's/qVariantValue</qvariant_cast</'" qVariantValue
git grep -O"sed -i 's/qVariantSetValue(\([^&*\(),]*\), */\\1.setValue(/'" qVariantSetValue
git grep -O"sed -i 's/qVariantSetValue *<\([^>]*\)> *(\([^&*\(),]*\), */\\2.setValue<\\1>(/'" qVariantSetValue
git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert
git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*([^&*\(),]*)\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert
git grep -O"sed -i 's/qVariantFromValue\( *[(<]\)/QVariant::fromValue\\1/'" qVariantFromValue
git checkout src/corelib/kernal/qvariant*
Rev-by: dev mailing list
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Test directory untouched.
This just apply those regexp:
git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(this,* */f\\1(/'" qFindChild
git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(&\([^\(),]*\),* */\\2.f\\1(/'" qFindChild
git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*()\),* */\\2->f\\1(/'" qFindChild
git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*\):\([^\(),]*\),* */(\\2:\\3)->f\\1(/'" qFindChild
git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*\),* */\\2->f\\1(/'" qFindChild
Rev-by: dev mailing list
|
|\ \ \
| | |/
| |/|
| | |
| | | |
Conflicts:
configure
|
| |/
| |
| |
| | |
Backported various crash fixes
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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 ||
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/gui/image/image.pri
src/gui/image/qpixmapdatafactory.cpp
src/gui/painting/qgraphicssystem.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Integrated changes:
|| <https://webkit.org/b/37760> || FrameView's layout root can be detached by style recalc ||
|| <https://webkit.org/b/38922> || innerHTML decompilation issues in textarea ||
|| <https://webkit.org/b/36878> || REGRESSION: Trailing colon on hostnames (with no port specified) causes "Not allowed to use restricted network port" ||
|| <https://webkit.org/b/37781> || [XHR] Cross-Origin synchronous request with credential raises NETWORK_ERR ||
|| <https://webkit.org/b/36502> || Cross-origin bypass: iFrame.src can be set to a JavaScript URL via nodeValue or textContent ||
|| <https://webkit.org/b/28697> || WebKit crash on WebCore::Node::nodeIndex() ||
|| <https://webkit.org/b/37031> || Cross-origin bypass: Javascript URL can be set as iframe.src via multiple DOM aliases ||
|| <https://webkit.org/b/36522> || [Qt] Rename QWebSettings::XSSAuditorEnabled to XSSAuditingEnabled ||
|| <https://webkit.org/b/38583> || Use of stale pointers whilst normalizing DOM nodes with mutation event handlers that modify element attributes ||
|| <https://webkit.org/b/41412> || [Qt] Canvas arcTo() should draw straight line to p1 if p0, p1 and p2 are collinear ||
|| <https://webkit.org/b/39878> || [Qt]: REGRESSION(r58703): QWebSettings::JavascriptCanAccessClipboard has wrong case in "Javascript" part. ||
|| <https://webkit.org/b/26824> || focus() behavior permits keystrokes to be redirected across domains ||
|| <https://webkit.org/b/39508> || Crash in WebCore::toAlphabetic() while running MangleMe ||
|| <https://webkit.org/b/36571> || WebKit should treat port numbers outside of the valid range as being blacklisted ||
|| <https://webkit.org/b/38497> || Make sure that http URLs always have a host in SecurityOrigin ||
|| <https://webkit.org/b/38626> || ZDI-CAN-765: CSS Charset Text Transformation Vulnerability ||
|| <https://webkit.org/b/36838> || Cross-origin image theft via SVGs as a canvas pattern ||
|| <https://webkit.org/b/27751> || [sg:high] Copying text to the system clipboard can be done in any context ||
|| <https://webkit.org/b/36843> || REGRESSION (r47291): XHR allows arbitrary XSRF across domains ||
|| <https://webkit.org/b/37230> || REGRESSION (4.0.5): Safari asks for credentials all the time when authenticating to Windows IIS Server ||
|| <https://webkit.org/b/37618> || Memory Corruption with Drag-Drop item from a purged document. ||
|| <https://webkit.org/b/38260> || Frame.src allows javascript URLs with starting spaces ||
|| <https://webkit.org/b/38261> || Table layout crash bug ||
|
| |
| |
| |
| |
| |
| |
| | |
Integrated:
|| <https://webkit.org/b/36618> || [Qt] LayoutTests/http/tests/appcache/fallback.html crashes ||
|| <https://webkit.org/b/39359> || [Qt] TiledBackingStore updates broken when not using resizesToContents mode ||
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Integrated changes:
|| <https://webkit.org/b/38597> || [Qt] QtTestBrowser does not have a "Load" button ; therefore, unable to load pages on touch only symbian devices (portrait mode). ||
|| <https://webkit.org/b/40846> || [Qt] GraphicsLayerQt delay seems unnecessary. ||
|| <https://webkit.org/b/41160> || Spatial Navigation: make elements in inner frames nested more than 1 level deep focusable ||
|| <https://webkit.org/b/39019> || [Qt] Combobox doesn't close when scrolling in graphicsbased mode ||
|| <https://webkit.org/b/41164> || [Qt] QtWebKit crashes if <select>'s render changes in its onchange event ||
|| <https://webkit.org/b/41198> || [QT][S60] build-webkit scripts picks wrong make spec for windows build ||
|| <https://webkit.org/b/41278> || [Qt] Replace single treat-as-space characters with normal space ||
|| <https://webkit.org/b/37303> || [Qt] Application crash on exit if NPPlugin is loaded ||
|| <https://webkit.org/b/40378> || [Qt] When any geometry change happens to a node it will resize the backing cache ||
|| <https://webkit.org/b/40795> || [Qt] Crash when uploading document to Google Docs ||
|| <https://webkit.org/b/40446> || [Qt] Only 10 websites can be loaded consecutively when using QtWebkit 2.0 ||
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
* Fixed QML packaging
|| <https://webkit.org/b/39304> || Add an inlineCapacity template parameter to ListHashSet and use it to shrink the positioned object list hash set. ||
|| <https://webkit.org/b/39309> || Allocate the m_preloads list hash set dynamically and free it when done. ||
|| <https://webkit.org/b/33150> || Do not render the full frame when there is some elements with fixed positioning ||
|
| |
| |
| |
| |
| | |
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| | |
* Build fixes for package builds
* Fix build with QT_NO_COMBOBOX
* Upstream David's doc fix
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Integrated changes:
|| <https://webkit.org/b/6274> || text repainting does not account for glyphs which draw outside the typographic bounds of the font ||
|| <https://webkit.org/b/40840> || [Qt] Symbian builds in release sometimes try to link with the debug JavaScriptCore static lib. ||
|| <https://webkit.org/b/40620> || [Qt] Get rid of the the unused imageSize of ImageDecoderQt::internalHandleCurrentImage() ||
|| <https://webkit.org/b/37292> || http://trac.webkit.org/changeset/57215 caused perf regressions ||
|| <https://webkit.org/b/40077> || [Qt] Implement the simple font code path. ||
|| <https://webkit.org/b/40910> || [Qt] Avoid unnecessary image conversion in RGBA32Buffer::zeroFill() ||
|| <https://webkit.org/b/40797> || [Qt] Decode images directly to QPixmap ||
|| <https://webkit.org/b/36510> || [chromium] use integral glyph widths ||
|
| |
| |
| |
| | |
|| <https://webkit.org/b/40483> || [Qt] The new Qt's documentation text layout is messed up with QtWebKit. ||
|