| 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
|
| |
| |
| |
| |
| |
| |
| | |
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:
configure
src/corelib/global/qglobal.h
|
| |
| |
| |
| | |
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>
|
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
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:
configure
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
| |
| |
| |
| | |
also renaming the embedded_lite qmake switch to be qpa
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure
mkspecs/common/qws.conf
src/corelib/io/qresource.cpp
src/gui/image/qpixmapdata_p.h
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
src/opengl/qgl_p.h
src/plugins/mediaservices/gstreamer/gstreamer.pro
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (62 commits)
Use native locale aware string comparison on Symbian.
Temporary fix for regression in QSslCertificate::fromPath()
doc: Added more DITA output to the XML generator
Fix symbian building of TARGET with a slash
Fix a minor typo in QAbstractItemModel's documentation.
QXmlSchema: allow usage of xsd:all
QSslSocket: fix build for MinGW and VS 2005
Fix symbian-abld build failure with bearer plugins
remove certificate bundle
make QSslSocket::systemCaCertificates() use system certs
Adjusted RegExp in QSslCertificate::fromPath()
Fix QSystemTrayIcon::supportsMessages() on Windows
Use NIM_SETVERSION to get the latest behavior
Cleanup obsolete stuff
doc: Added DITA XML generator
Fixed a broken merge.
Changed the way we detect touch screen on Windows.
Fixed error deploying qsymbianbearer.qtplugin on Symbian.
Revert "Attempt to fix build failure on Symbian."
Attempt to fix build failure on Symbian.
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| |/
| |
| |
| |
| |
| | |
Integrated fix:
|| <https://webkit.org/b/40487> || [Qt] The qt_webkit_version.pri file gets overwritten on install ||
|
| |
| |
| |
| | |
|| <https://webkit.org/b/40116> || [Qt] Compilation fails when compiling against Qt 4.7 and Qt Mobility is installed ||
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Integrated changes:
|| <https://webkit.org/b/39694> || [Qt] GraphicsLayer: warnings when reloading page ||
|| <https://webkit.org/b/38762> || [Qt] Flash Plugin is not working on mac-cocoa-32 ||
|| <https://webkit.org/b/39918> || REGRESSION(58615): Scroll events are sent twice per keypress for ports that don't have a platformWidget scrollbar ||
|| <https://webkit.org/b/26224> || [Qt, Gtk] Allows build-webkit script to receive an install prefix as parameter ||
|| <https://webkit.org/b/35861> || [Qt] Add documentation to the QtWebkit bridge ||
|| <https://webkit.org/b/33176> || [Qt] The FIRST letter in the PASSWORD field is taken in UPPERCASE by DEFAULT in gmail.com web page ||
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Integrated changes:
|| <https://webkit.org/b/36826> || [Qt] QtWebkit.pc is broken ||
|| <https://webkit.org/b/39189> || Bring CanvasRenderingContext2D's createImageData() in line with HTML5 spec ||
|| <https://webkit.org/b/39175> || Properly handle invalid arguments to CanvasRenderingContext2D's getImageData() and putImageData() ||
As well as fixes for the qt_webkit_version.pri module installation.
|
| |
| |
| |
| |
| |
| |
| |
| | |
Integrated changes:
|| <https://webkit.org/b/36826> || [Qt] QtWebkit.pc is broken ||
Plus a fix for the installation/setup of qt_webkit_version.pri
|
| |
| |
| |
| | |
Integrate https://trac.webkit.org/changeset/60435 - [Qt] Escape backslashes in the .pro files by Ossi.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Changes integrated:
|| <https://webkit.org/b/39488> || [Qt] QtTestBrowser is still called QtLauncher in the code ||
|| <https://webkit.org/b/38722> || [Qt] qwebframe auto test doesn't compile ||
|| <https://webkit.org/b/39491> || [Qt] QtTestBrowser has two graphicsview options that aren't enabled correctly ||
|| <https://webkit.org/b/39063> || [Qt] Tiled backing store checker pattern does not paint correctly when scaling factor is not 1 ||
|| <https://webkit.org/b/39217> || Add an optional "starting node' parameter to scrollRecursively and scrollOverflow of EventHandler ||
|| <https://webkit.org/b/38389> || [Qt] Update the Symbian version for the user agent ||
|| <https://webkit.org/b/35702> || [Qt] Add more support for InputTextController ||
|| <https://webkit.org/b/39513> || [Qt] Using Accelerated Composing the rocket back animation on http://www.the-art-of-web.com/css/css-animation/ works differently as when not using AC. ||
|| <https://webkit.org/b/39609> || [Qt] Running with accelerated compositing enabled sometimes result in a crash ||
Plus autotest fix.
|
| |
| |
| |
| | |
this makes windows-style path specs *ugly*. that's intentional. :-P
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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 ||
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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 ||
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Integrated changes:
|| <https://webkit.org/b/32922> || [Qt] fast/text/find-hidden-text.html ||
|| <https://webkit.org/b/36187> || Rename window.media to window.styleMedia ||
|| <https://webkit.org/b/38286> || Need to call FrameView::scrollPositionChanged when changing the scroll position when the ScrollView does not have a platformWidget ||
|| <https://webkit.org/b/37334> || [Qt] fast/frames/flattening/frameset-flattening-subframesets.html fails intermittently on Qt bot ||
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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 ||
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/gui/egl/egl.pri
src/gui/painting/qwindowsurface_p.h
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Bugzilla fixes integrated in this commit:
|| <https://webkit.org/b/37445> || [Qt] Regression: Google calendar edit event details gets stuck on loading ||
|| <https://webkit.org/b/38439> || [Qt] QT_MOBILE_THEME compile time flag ||
|| <https://webkit.org/b/37803> || Spatial Navigation: adapt the logic of {deep}findFocusableNodeInDirection to do traversal starting from Node* not Document* ||
|| <https://webkit.org/b/36755> || [Qt] REGRESSION: Loading of external CSS and JS files over network fails in some cases ||
|| <https://webkit.org/b/36533> || [Qt] Compilation error on Qt for Embedded Linux built with -qconfig small ||
|| <https://webkit.org/b/38585> || Spatial Navigation: add a layout test which runs with Frame Flattening ON ||
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| | |
* Integrated http://trac.webkit.org/changeset/58673 -- Fix qtlibraryinfix not to contain space
|
| |
| |
| |
| |
| |
| |
| |
| | |
Fixes integrated:
|| <https://webkit.org/b/33875> || [Qt] QWebPage::userAgentForUrl is terrible API ||
|| <https://webkit.org/b/38371> || [Qt] GraphicsLayer: animation incorrect when scrolling ||
|| <https://webkit.org/b/32196> || Make it possible to distinguish between NPAPI plugins and Application plugins ||
|| <https://webkit.org/b/37207> || [Qt] QtWebKit 2.0 library version needs to be maintained in WebCore.pro ||
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to 540ae4ccd25609e1bfe1673195ce126255e36774
Updated WebKit to 2c346f58ae70470d88dcd856bfe59b04a144b65a
Updated WebKit to 1a40220a82197023c1b1ac6eff027be6dd3168d3
Updated WebKit to 2992802f35fd47e32bb94a4b1f48cce7ec7fda9d
Updated WebKit to 862268aeb7150d3795d05bfc05f661bb5c598a27
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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 ||
|
| |/ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Three fixes from Shane after QtMultimedia was split into two dlls.
Fix compile errors in Direct Show media service.
Add EXPORT defines for QtMediaServices library.
Fixed configure check for gstreamer.
WebKit; build with change to mediaservices.
QtMediaservices -> QtMediaServices.
configure; Fixes for changes to use mediaservices.
Fixed compile errors in pulseaudio backend for soundeffect
Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d
Fixed compile errors with gstreamer plugin
Create Mediaservices lib, separate from Multimedia.
Gstreamer media backend: seek to media start on end of stream.
|