| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (69 commits)
re-add overriding of tool paths to configure
fix regexp
Support linked fonts (.ltt) from standard font locations.
fix path separators in install targets for MinGW+sh
fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
define qtPrepareTool() function and use it throughout
QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike
QNAM HTTP: And one more testcase
QNetworkAccessManager: Backends were tried in wrong order
Fix QUrl::isValid if the host contains invalid caracter.
Fix anomaly demo control strip icon placement
QUrl: parsing of host name with an undercore.
Fixed race condition compiling xmlpatterns tests.
Remove qdbusserver from tests/auto/dbus.pro
QNAM HTTP: Preemptive anti crash if() statement
QNAM HTTP: More testcases
Fixing compiling issues.
Remove garbage test.
OpenVG blending modes from VG_KHR_advanced_blending extension
Fix spurious mouse click when dismissing a native menu
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
|
| | |
| | |
| | |
| | |
| | |
| | | |
AudioDeviceGetProperty().
Reviewed-by:Andrew den Exter
|
| | |
| | |
| | |
| | | |
Cherry pick http://trac.webkit.org/changeset/59606 to fix auto-test regression of r59563
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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 ||
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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 ||
|
|\ \
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to 57d10d5c05e59bbf7de8189ff47dd18d1be996dc
|
| | |
| | |
| | |
| | | |
Disable the JIT on Symbian again, as it causes crashes.
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (159 commits)
Doc: Adding loading image to search textbox
qdoc: Yet another revision of the top doc page.
Doc: Update on web template
Added QDateTime::msecsTo()
Doc: Fixed tables and images for the new docs
qdoc: Yet another revision of the top doc page.
Revert "Improve QUrl handling of local file paths"
Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively"
Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to"
Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs."
qdoc: Another revision of the top doc page.
Doc correction to css
Doc: Updates to the html template and javascript
tst_SuiteTest: Fix a meaningless switch statement
My 4.7.0 changelog entries.
qdoc: Fixed annotated list generation to use <td>, not <th>.
Doc: Tuning search script
qdoc: Reorganized examples panel.
Doc: Chages to search feature, css and table order
QtDeclarative: avoid waiting for a network load on URIs with empty schemes.
...
|
| | |
| | |
| | |
| | | |
Still more to come.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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 ||
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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 ||
|
| |
| |
| |
| | |
Integrated Ossy's fix for building without Qt Multimedia
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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 ||
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix bold text rendering of Thai and Vietnamese on Symbian
Event dispatcher slow down using delays rather than thread priority
Fixed incorrect runtime platform version check in Phonon MMF backend
Removing unused code.
Support 'Text' mode in Symbian specific input methods
Map Symbian touch points to the screen's coordinate system.
Revert "Event dispatcher slow down using delays rather than thread priority"
Fixed a leak in QTextDocument::print().
Fix crash in QDBusInterface when invoking a method in a derived class.
tst_selftest: Fix off-by-one error in cleaning up line numbers and filenames
Fix long menu item texts causing crash
Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix bold text rendering of Thai and Vietnamese on Symbian
Event dispatcher slow down using delays rather than thread priority
Fixed incorrect runtime platform version check in Phonon MMF backend
Removing unused code.
Support 'Text' mode in Symbian specific input methods
Map Symbian touch points to the screen's coordinate system.
Revert "Event dispatcher slow down using delays rather than thread priority"
Fixed a leak in QTextDocument::print().
Fix crash in QDBusInterface when invoking a method in a derived class.
tst_selftest: Fix off-by-one error in cleaning up line numbers and filenames
Fix long menu item texts causing crash
Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
|
| | |\ \
| | | |/ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In S60 3.2, CMdaAudioPlayerUtility::SetVolume(TInt) was changed from
having a void return type to returning TInt. The code in the Phonon
MMF backend which calls this function uses a runtime platform version
check to ensure that only on S60 3.2 and above is the return value
from SetVolume treated as valid.
This check was previously testing for the wrong platform version (5.0
rather than 3.2).
Reviewed-by: Shane Kearns
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Re-apply change f14ae11e6731bd7416f45c3ef7ce464587862223 by Iain
Update WebKit DEF files on Symbian
Add/absent function with altered signature to BWINS DEF file.
Correct ordinal numbering in EABI DEF file, it was broken and causing
the build to fail.
Reviewed-by: TrustMe
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
( 4fb414b38f7c7c8439ce6a4323f1acb057a3ff20 )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-04-26 Thiago Macieira <thiago.macieira@nokia.com>
Reviewed by Simon Hausmann.
[Qt] Fix the include header <qstring.h> -> <QtCore/qstring.h>
The module/header.h style inclusion removes the need to have -I$QTDIR/include/depending-module
in the include search path for the application.
* Api/qwebkitversion.h:
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: TrustMe
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fail earlier. Use constant that was introduced in one of the previous
commits.
Reviewed-by: Peter Hartmann
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Update WebKit DEF files on Symbian
Add/absent function with altered signature to BWINS DEF file.
Correct ordinal numbering in EABI DEF file, it was broken and causing
the build to fail.
Reviewed-by: TrustMe
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Symbol visibility fixes for RVCT4 on Symbian
RVCT 4 is far more strict with regards to symbol visiblity that RVCT
2.2, and will hide symbols unless all references have default visibility
in the object files. Update the various places in Qt code where the
symbol visibility was set incorrectly for DLL-based platforms (those that
use __declspec(dllimport) and (dllexport).
Note: Other Qt modules and QtScript are fixed in different commits.
Task-number: QTBUG-9903
Reviewed-by: Jason Barron
Janne Koskinen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
( 6ed0b6197addffc7dacbdb3e49db711420a2c47a )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-04-08 Joe Ligman <joseph.ligman@nokia.com>
Reviewed by Simon Hausmann.
[Qt] qtwebkit_webframe_scrollRecursively scrolls when body.style.overflow="hidden"
https://bugs.webkit.org/show_bug.cgi?id=36674
The scrolling check was based on the frameview's scrolloffset, and
maximumScrollPosition, which does not acknowledge the overflow properties.
I am now basing the scrolling off the scrollbar position. The scrollbars are
affected by the overflow properties indicating when not to scroll. The scrollbar
positions also continue to work for CSS ::-webkit-scrollbar styles.
* Api/qwebframe.cpp:
(qtwebkit_webframe_scrollRecursively):
2010-03-24 Viatcheslav Ostapenko <ostapenko.viatcheslav@nokia.com>
Reviewed by Laszlo Gombos.
Auto-uppercase and predictive text need to be disabled for S60 (as for maemo)
https://bugs.webkit.org/show_bug.cgi?id=33176
* WebCoreSupport/EditorClientQt.cpp:
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '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
|
| | | |
| | | |
| | | |
| | | | |
This should fix the createPluginWithPluginsDisabled autotest.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Integrated changes:
|| <https://webkit.org/b/38075> || [Qt] GraphicsLayer: Reverse animations don't work in some use cases ||
|| <https://webkit.org/b/38076> || [Qt] GraphicsLayer: flicker when starting an animation before the previous one ended. ||
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Changes integrated:
|| <https://webkit.org/b/38179> || [Qt] QWebPage::setViewportSize() forces two layout of the render tree ||
|| <https://webkit.org/b/31719> || [Qt] Loading of large page can take up to 10 seconds ||
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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 ||
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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-s60-public:
Fix desktopservices demo missing icon in Symbian
Fix path removal from target in Symbian builds
Fix compilation errors in tst_qfileinfo
Symbian (installation) docs.
Make 'make sis' recursive again.
Fix libinfix usage
Make symbian-resource files aware of libInfix configure feature
Update symbian def files for 4.7
Correction to EGL stub implementation
Fix 'make sis' when media services is disabled and multimedia is not
|
| |/ / |
|
|/ /
| |
| |
| | |
(cherry picked from commit 4a03f74277427e2487a87fff19ca0082c69bcc75)
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (27 commits)
Remove trace code from directshowaudioendpointcontrol.h.
New configure.exe binary
Add support for MSBuild, which is the project format for MSVC 2010
Only add qvideowidget test once.
Multimedia causes build failure when Qt is configured with -embedded
Player demo: load not only local files but playlists and urls passed as
Gstreamer media backend: preserve playback rate after seeks and media
QT7 mediaservice; fix leaking strings.
Fixed Qt build with mediaservices disabled.
Multimedia tests; fix for missing dependency
Disabled QMediaPlayer states debug output.
Fixed typo in QMediaPlayer::play() error reporting
Fixed QVideoWidget test, waiting for video surface painted.
Tests; Fix media tests, make sure they are using mediaservies.
Fix warning about illegal empty declaration.
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.
...
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (27 commits)
Remove trace code from directshowaudioendpointcontrol.h.
New configure.exe binary
Add support for MSBuild, which is the project format for MSVC 2010
Only add qvideowidget test once.
Multimedia causes build failure when Qt is configured with -embedded
Player demo: load not only local files but playlists and urls passed as
Gstreamer media backend: preserve playback rate after seeks and media
QT7 mediaservice; fix leaking strings.
Fixed Qt build with mediaservices disabled.
Multimedia tests; fix for missing dependency
Disabled QMediaPlayer states debug output.
Fixed typo in QMediaPlayer::play() error reporting
Fixed QVideoWidget test, waiting for video surface painted.
Tests; Fix media tests, make sure they are using mediaservies.
Fix warning about illegal empty declaration.
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.
...
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
demos/multimedia/player/player.pro
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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.
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Dmytro Poplavskiy
|
| | | | |\ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | | |
into 4.7
|
| | | | | | | | |
|
|\ \ \ \ \ \ \ \
| |/ / / / / / / |
|
| |\ \ \ \ \ \ \
| | |_|_|_|_|/ /
| |/| | | | | |
| | | | | | | |
| | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
QtWebkit WINS DEF file freeze
|