Changeset 769 for trunk/src/3rdparty

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (view diffs)
• src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp (modified) (view diffs)
• src/3rdparty/harfbuzz/src/harfbuzz-shaper-private.h (modified) (view diffs)
• src/3rdparty/harfbuzz/tests/shaping/main.cpp (modified) (view diffs)
• src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h (modified) (view diffs)
• src/3rdparty/phonon/ds9/videowidget.cpp (modified) (view diffs)
• src/3rdparty/phonon/mmf/abstractaudioeffect.cpp (modified) (view diffs)
• src/3rdparty/phonon/mmf/abstractaudioeffect.h (modified) (view diffs)
• src/3rdparty/phonon/mmf/abstractmediaplayer.cpp (modified) (view diffs)
• src/3rdparty/phonon/mmf/abstractmediaplayer.h (modified) (view diffs)
• src/3rdparty/phonon/mmf/abstractplayer.cpp (modified) (view diffs)
• src/3rdparty/phonon/mmf/abstractplayer.h (modified) (view diffs)
• src/3rdparty/phonon/mmf/abstractvideooutput.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/abstractvideooutput.cpp ) (view diffs)
• src/3rdparty/phonon/mmf/abstractvideooutput.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/abstractvideooutput.h ) (view diffs)
• src/3rdparty/phonon/mmf/abstractvideoplayer.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp ) (view diffs)
• src/3rdparty/phonon/mmf/abstractvideoplayer.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/abstractvideoplayer.h ) (view diffs)
• src/3rdparty/phonon/mmf/ancestormovemonitor.cpp (modified) (view diffs)
• src/3rdparty/phonon/mmf/ancestormovemonitor.h (modified) (view diffs)
• src/3rdparty/phonon/mmf/audioplayer.cpp (modified) (view diffs)
• src/3rdparty/phonon/mmf/backend.cpp (modified) (view diffs)
• src/3rdparty/phonon/mmf/backend.h (modified) (view diffs)
• src/3rdparty/phonon/mmf/defs.h (modified) (view diffs)
• src/3rdparty/phonon/mmf/mediaobject.cpp (modified) (view diffs)
• src/3rdparty/phonon/mmf/mediaobject.h (modified) (view diffs)
• src/3rdparty/phonon/mmf/mmf_videoplayer.cpp (deleted)
• src/3rdparty/phonon/mmf/mmf_videoplayer.h (deleted)
• src/3rdparty/phonon/mmf/utils.cpp (modified) (view diffs)
• src/3rdparty/phonon/mmf/videooutput.cpp (deleted)
• src/3rdparty/phonon/mmf/videooutput.h (deleted)
• src/3rdparty/phonon/mmf/videooutput_dsa.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/videooutput_dsa.cpp ) (view diffs)
• src/3rdparty/phonon/mmf/videooutput_dsa.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/videooutput_dsa.h ) (view diffs)
• src/3rdparty/phonon/mmf/videooutput_surface.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/videooutput_surface.cpp ) (view diffs)
• src/3rdparty/phonon/mmf/videooutput_surface.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/videooutput_surface.h ) (view diffs)
• src/3rdparty/phonon/mmf/videoplayer_dsa.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/videoplayer_dsa.cpp ) (view diffs)
• src/3rdparty/phonon/mmf/videoplayer_dsa.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/videoplayer_dsa.h ) (view diffs)
• src/3rdparty/phonon/mmf/videoplayer_surface.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/videoplayer_surface.cpp ) (view diffs)
• src/3rdparty/phonon/mmf/videoplayer_surface.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/phonon/mmf/videoplayer_surface.h ) (view diffs)
• src/3rdparty/phonon/mmf/videowidget.cpp (modified) (view diffs)
• src/3rdparty/phonon/mmf/videowidget.h (modified) (view diffs)
• src/3rdparty/phonon/qt7/audiodevice.mm (modified) (view diffs)
• src/3rdparty/webkit/ChangeLog (modified) (view diffs)
• src/3rdparty/webkit/JavaScriptCore/ChangeLog (modified) (view diffs)
• src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri (modified) (view diffs)
• src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp (modified) (view diffs)
• src/3rdparty/webkit/JavaScriptCore/runtime/Collector.h (modified) (view diffs)
• src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp (modified) (view diffs)
• src/3rdparty/webkit/JavaScriptCore/wtf/symbian (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/webkit/JavaScriptCore/wtf/symbian ) (view diffs)
• src/3rdparty/webkit/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/webkit/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.cpp ) (view diffs)
• src/3rdparty/webkit/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/src/3rdparty/webkit/JavaScriptCore/wtf/symbian/BlockAllocatorSymbian.h ) (view diffs)
• src/3rdparty/webkit/VERSION (modified) (view diffs)
• src/3rdparty/webkit/WebCore/ChangeLog (modified) (view diffs)
• src/3rdparty/webkit/WebCore/WebCore.pro (modified) (view diffs)
• src/3rdparty/webkit/WebCore/config.h (modified) (view diffs)
• src/3rdparty/webkit/WebCore/css/CSSParser.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/dom/XMLTokenizer.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/dom/XMLTokenizer.h (modified) (view diffs)
• src/3rdparty/webkit/WebCore/dom/XMLTokenizerLibxml2.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/html/HTMLFormElement.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/html/HTMLImageElement.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/html/HTMLImageElement.h (modified) (view diffs)
• src/3rdparty/webkit/WebCore/html/HTMLInputElement.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/html/HTMLParser.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/loader/FrameLoader.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/page/FrameView.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/page/FrameView.h (modified) (view diffs)
• src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/platform/MIMETypeRegistry.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/platform/ScrollView.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/platform/ScrollView.h (modified) (view diffs)
• src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/platform/network/ResourceRequestBase.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/platform/qt/KURLQt.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/platform/qt/PopupMenuQt.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/platform/qt/RenderThemeQt.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/platform/qt/RenderThemeQt.h (modified) (view diffs)
• src/3rdparty/webkit/WebCore/platform/qt/ScrollbarThemeQt.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/platform/qt/ScrollbarThemeQt.h (modified) (view diffs)
• src/3rdparty/webkit/WebCore/platform/text/StringHash.h (modified) (view diffs)
• src/3rdparty/webkit/WebCore/plugins/symbian/PluginContainerSymbian.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/plugins/symbian/PluginContainerSymbian.h (modified) (view diffs)
• src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/rendering/RenderBlock.h (modified) (view diffs)
• src/3rdparty/webkit/WebCore/rendering/RenderBox.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/rendering/RenderBoxModelObject.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/rendering/RenderObject.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/rendering/RenderText.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.h (modified) (view diffs)
• src/3rdparty/webkit/WebKit/qt/Api/qwebelement.h (modified) (view diffs)
• src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebKit/qt/Api/qwebkitversion.h (modified) (view diffs)
• src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebKit/qt/ChangeLog (modified) (view diffs)
• src/3rdparty/webkit/WebKit/qt/WebCoreSupport/EditorClientQt.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def (modified) (view diffs)
• src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def (modified) (view diffs)
• src/3rdparty/webkit/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp (modified) (view diffs)
• src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp (modified) (view diffs)