summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Updated WebKit to 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2Simon Hausmann2010-05-034-3/+14
| | | | * Integrated http://trac.webkit.org/changeset/58673 -- Fix qtlibraryinfix not to contain space
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-039-168/+304
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11
| * Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11Simon Hausmann2010-05-039-168/+304
| | | | | | | | | | | | | | | | 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 ||
* | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-05-021-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-05-021-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-011-1/+1
| | |\
| | | * Fixed incorrect runtime platform version check in Phonon MMF backendGareth Stockwell2010-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 5107946e97cbc480a9329565c29b7384c8ba0860 by IainIain2010-04-262-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-04-267-5/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 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:
| | | * Fix accidental change in QtWebKitMarkus Goetz2010-04-201-3/+1
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * QNAM HTTP: Pipelining improvementMarkus Goetz2010-04-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fail earlier. Use constant that was introduced in one of the previous commits. Reviewed-by: Peter Hartmann
| | | * Fix the include header <qstring.h> -> <QtCore/qstring.h>Thiago Macieira2010-04-191-1/+1
| | | |
| | | * Re-apply change f14ae11e6731bd7416f45c3ef7ce464587862223 by IainIain2010-04-172-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * Re-apply change 81837e43e3f966c1755e90eb65df6e3bad506ed7 by IainIain2010-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-04-177-35/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 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:
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-02110-1671/+4581
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * '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
| * | | Updated WebKit to 540ae4ccd25609e1bfe1673195ce126255e36774Simon Hausmann2010-04-307-3/+87
| | | | | | | | | | | | | | | | This should fix the createPluginWithPluginsDisabled autotest.
| * | | Updated WebKit to 2c346f58ae70470d88dcd856bfe59b04a144b65aSimon Hausmann2010-04-304-32/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ||
| * | | Updated WebKit to 1a40220a82197023c1b1ac6eff027be6dd3168d3Simon Hausmann2010-04-296-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ||
| * | | Updated WebKit to 2992802f35fd47e32bb94a4b1f48cce7ec7fda9dSimon Hausmann2010-04-299-74/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ||
| * | | Updated WebKit to 862268aeb7150d3795d05bfc05f661bb5c598a27Simon Hausmann2010-04-28107-1578/+4242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-021-2/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fix libinfix usageThomas Zander2010-04-291-2/+1
| |/ /
* | | Fix the include header <qstring.h> -> <QtCore/qstring.h>Thiago Macieira2010-05-011-1/+1
|/ / | | | | | | (cherry picked from commit 4a03f74277427e2487a87fff19ca0082c69bcc75)
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-242-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-232-5/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| | * \ Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-2218-35/+103
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: demos/multimedia/player/player.pro
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-182-5/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-182-5/+5
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | * | | WebKit; build with change to mediaservices.Justin McPherson2010-04-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Justin McPherson2010-04-151-1/+1
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into 4.7
| | | | * | | | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-151-2/+2
| | | | | | | |
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7Janne Koskinen2010-04-234-11/+60
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-221-1/+27
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: QtWebkit WINS DEF file freeze
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-214-11/+60
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits) Cocoa: fix namespace build breakage Trivial doc fix qdoc: Updated the extra images variable for each manual.qdocconf. Cocoa: cocoa sometimes show a hidden window Default (Parentless) QMenuBar actions do not work (without autotest) Reorganised double stream out operator in QDataStream to avoid causing unnecessary floating point exceptions. Revert "Report the error as being AlreadyExists if this is why it fails" Revert "Default (Parentless) QMenuBar actions do not work" fix memory bug fix nativeFilePath character width issue fix typos Just use the path as the url can have an anchor attached etc... Doc: Cleaning HTML generator and updating index.qdoc Default (Parentless) QMenuBar actions do not work Fix Mac OS Tiger-vs-Leopard crash due to memory tagging by JavaScriptCore qdoc: Avoided putting bad chars in links Improve itemview appearance on Mac Backport a few fixes to the Designer filteredit from Creator Doc: Correcting qdocconf files for assistant ScrollBar width not updated dynamically on Windows. ...
| | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-214-11/+60
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (31 commits) Cocoa: cocoa sometimes show a hidden window Default (Parentless) QMenuBar actions do not work (without autotest) Reorganised double stream out operator in QDataStream to avoid causing unnecessary floating point exceptions. Revert "Report the error as being AlreadyExists if this is why it fails" Revert "Default (Parentless) QMenuBar actions do not work" fix memory bug fix nativeFilePath character width issue fix typos Just use the path as the url can have an anchor attached etc... Doc: Cleaning HTML generator and updating index.qdoc Default (Parentless) QMenuBar actions do not work Fix Mac OS Tiger-vs-Leopard crash due to memory tagging by JavaScriptCore qdoc: Avoided putting bad chars in links Improve itemview appearance on Mac Backport a few fixes to the Designer filteredit from Creator Doc: Correcting qdocconf files for assistant ScrollBar width not updated dynamically on Windows. [tst_qhostinfo] Modify multipleDifferentLookups to repeat hostnames [tst_qhostinfo] Properly clean up the cache and lookup threads. Remove redundant network configuration updates on startup. ...
| | | * | | | | | | fix typosOswald Buddenhagen2010-04-201-1/+1
| | | | | | | | | |
| | | * | | | | | | Fix Mac OS Tiger-vs-Leopard crash due to memory tagging by JavaScriptCoreKent Hansen2010-04-203-10/+59
| | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from WebKit trunk.
* | | | | | | | | DEF file fixJanne Koskinen2010-04-231-25/+24
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Open C unnecessarily exports inlined getloc. entry removed. Reviewed-by: Shane Kearns
* | | | | | | | QtWebkit WINS DEF file freezeJanne Koskinen2010-04-221-1/+27
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Freeze against previous release 4.6.2 to maintain BC. Reviewed-by: Miikka Heikkinen
* | | | | | | Compile fix for Visual Studio 2010 (VC10)Prasanth Ullattil2010-04-213-3/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | Reviewed-by: Jocelyn Turcotte
* | | | | | QtWebKit: Fixes compilation on MSVC 64Jocelyn Turcotte2010-04-193-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch should be overwritten by the next import of QtWebKit trunk Reviewed-by: TrustMe
* | | | | | QtWebKit: Remove translatable strings from tests/hybridPixmap.Jocelyn Turcotte2010-04-191-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | | | Remove overloaded placement new operatorsJanne Koskinen2010-04-192-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WINSCW and Sun OS build fix. placement new is already defined in NonCopyable, no need for overloading. Reviewed-by: Simon Hausmann
* | | | | | WINSCW compiler fix, too eager to solve inlinesJanne Koskinen2010-04-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WINSCW tries immediately solve inlines causing forward declared classes to be used before they are defined. Reviewed-by: Simon Hausmann
* | | | | | WINSCW boolean fix for XPATHJanne Koskinen2010-04-192-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WINSCW cannot determine boolean type unless it is explicitly defined. This fix needs to be re-applied always when files are regenerated. Reviewed-by: Simon Hausmann
* | | | | | WINSCW compile fix for HashMapJanne Koskinen2010-04-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WINSCW with templates function declarations and definitions will have to use same names for variables or you get 'undefined identifier' Reviewed-by: Miikka Heikkinen
* | | | | | WINSCW compile fix for WebCoreJanne Koskinen2010-04-191-2/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WINSCW fails to parse function pointer name if it is not introduced before use. Reviewed-by: Miikka Heikkinen
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-185-0/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fixed compile of JavaScriptCore for Symbian^3. Fix compilation: StringImpl has no public, default constructor JavaScriptCore doesn't need QtGui Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-175-0/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fixed compile of JavaScriptCore for Symbian^3. Fix compilation: StringImpl has no public, default constructor JavaScriptCore doesn't need QtGui Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
generated by cgit v0.12 at 2024-12-29 05:23:12 (GMT)