summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-30107-1671/+4497
| |\ | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 2c346f58ae70470d88dcd856bfe59b04a144b65a Updated WebKit to 1a40220a82197023c1b1ac6eff027be6dd3168d3 Updated WebKit to 2992802f35fd47e32bb94a4b1f48cce7ec7fda9d Updated WebKit to 862268aeb7150d3795d05bfc05f661bb5c598a27
| | * 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 ||
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-28107-1578/+4242
| | |\ | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 862268aeb7150d3795d05bfc05f661bb5c598a27
| | | * 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/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-0283-1976/+3467
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits) bye bye QMakeProjectEnv short-cut evaluation inside if() tests eliminate special splitting of INCLUDEPATH and DEPENDPATH do not env-expand cache file path s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/ s/INCPATH/INCLUDEPATH/ s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/ teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH) warn about usage of deprecated variables warn about using non-lowercased replace $$function()s add -Wdeprecated option (on by default) make QMakeProject::isEmpty() consider legacy mappings document some functions' scope fix $$size() not using function-scoped variables doc: Fixed some qdoc errors. qdoc: Added breadcrumbs for namespaces. Autotest: check that we receive key events on toplevel widgets Cocoa: key events stopped working Update Polish translations qdoc: Added "All namespaces" to the API Lookup box. ...
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-3083-1976/+3467
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits) bye bye QMakeProjectEnv short-cut evaluation inside if() tests eliminate special splitting of INCLUDEPATH and DEPENDPATH do not env-expand cache file path s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/ s/INCPATH/INCLUDEPATH/ s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/ teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH) warn about usage of deprecated variables warn about using non-lowercased replace $$function()s add -Wdeprecated option (on by default) make QMakeProject::isEmpty() consider legacy mappings document some functions' scope fix $$size() not using function-scoped variables doc: Fixed some qdoc errors. qdoc: Added breadcrumbs for namespaces. Autotest: check that we receive key events on toplevel widgets Cocoa: key events stopped working Update Polish translations qdoc: Added "All namespaces" to the API Lookup box. ...
| | * | | bye bye QMakeProjectEnvOswald Buddenhagen2010-04-302-51/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake variables would have been exported to the command run by $$system() and - optionally - to the command run by system(). however, this was a unix-only feature and made the kernel barf at the huge environment on older linuxes. as we don't like platform-specific hacks which are unreliable, in particular when a workaround exists (the commands execute shell code after all, so one can inject arbitrary env variables), just blow it away - it was undocumented, after all. Reviewed-by: joerg
| | * | | short-cut evaluation inside if() testsOswald Buddenhagen2010-04-301-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is consistent with the top-level scope evaluation. if() is undocumented and the old behavior would be pretty unexpected for anyone, so i feel free to break compatibility. Reviewed-by: joerg
| | * | | eliminate special splitting of INCLUDEPATH and DEPENDPATHOswald Buddenhagen2010-04-301-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it wouldn't work as expected anyway, as the splitting rule (using the semicolon in addition to whitespace) applied only to the string literal from the pro file, but not any expanded [environment] variables, etc. (i.e., where it might make any sense). so just drop it, as it would considerably complicate later optimizations. it wasn't documented anyway ... Reviewed-by: joerg
| | * | | do not env-expand cache file pathOswald Buddenhagen2010-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it makes totally no sense - if one wanted to expand env variables, one would let the shell do it. Reviewed-by: joerg
| | * | | s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/Oswald Buddenhagen2010-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: joerg
| | * | | s/INCPATH/INCLUDEPATH/Oswald Buddenhagen2010-04-301-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: joerg
| | * | | s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/Oswald Buddenhagen2010-04-3050-50/+50
| | | | | | | | | | | | | | | | | | | | Reviewed-by: joerg
| | * | | teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH)Oswald Buddenhagen2010-04-301-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is what prevented using QMAKE_LFLAGS_RPATH instead of the obsolete QMAKE_RPATH in our own qmake.conf files. Reviewed-by: Tobias Hunger
| | * | | warn about usage of deprecated variablesOswald Buddenhagen2010-04-301-0/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-by: joerg
| | * | | warn about using non-lowercased replace $$function()sOswald Buddenhagen2010-04-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | planning to kill off that (mis-)feature at some point. Reviewed-by: joerg
| | * | | add -Wdeprecated option (on by default)Oswald Buddenhagen2010-04-302-3/+8
| | | | | | | | | | | | | | | | | | | | Reviewed-by: joerg
| | * | | make QMakeProject::isEmpty() consider legacy mappingsOswald Buddenhagen2010-04-302-3/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-by: joerg
| | * | | document some functions' scopeOswald Buddenhagen2010-04-301-5/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-by: joerg
| | * | | fix $$size() not using function-scoped variablesOswald Buddenhagen2010-04-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Janne Anttila Reviewed-by: joerg
| | * | | doc: Fixed some qdoc errors.Martin Smith2010-04-303-14/+2
| | | | |
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-304-122/+220
| | |\ \ \
| | | * | | Autotest: check that we receive key events on toplevel widgetsRichard Moe Gustavsen2010-04-302-8/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autotest add to test db322e8aec1cae Reviewed-by: denis
| | | * | | Cocoa: key events stopped workingRichard Moe Gustavsen2010-04-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you have an empty toplevel widget, that widget will not receive key events anymore. Seems that we need to revert some parts of 90dfb5e5d8fc8cb841b0762cd88aa4b996c38312 Rev-By: denis
| | | * | | Update Polish translationsJarek Kobus2010-04-301-114/+156
| | | | | |
| | * | | | qdoc: Added breadcrumbs for namespaces.Martin Smith2010-04-302-3/+7
| | |/ / /
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-3011-1692/+3062
| | |\ \ \
| | | * | | French translation strings, originally made by external translators.Pierre Rossi2010-04-291-1674/+2976
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plus some fixes and additional translations. Reviewed-by: TrustMe Reviewed-by: Benjamin Poulain Reviewed-by: Gabriel
| | | * | | Set the enabled state on the page when changing the QTabWidgetKevin Ottens2010-04-292-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabling/disabling a tab of QTabWidget should also change the state of the widget. Otherwhise it is possible to have a page enabled for a disabled widget. Merge-request: 2354 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | * | | add QString::setRawData() and revive QByteArray::setRawData()Oswald Buddenhagen2010-04-294-10/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is solely for optimization purposes - saves a free()/malloc() pair each time an existing object is re-used.
| | | * | | Backport a fix to Designer filterwidgetJens Bache-Wiig2010-04-292-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using static here is obviously incorrect as the animations are done per widget. Reviewed-by: danimo
| | | * | | Added wildcards to allow custom mkspecs namesConstantin Makshin2010-04-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2374 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | | qdoc: Added "All namespaces" to the API Lookup box.Martin Smith2010-04-301-0/+1
| | |/ / /
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-292-0/+18
| | |\ \ \
| | | * | | add some QNetworkCookieJar testsPeter Hartmann2010-04-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | ... regarding the previous merge request.
| | | * | | Secure Cookies should only be sent over secure connections.Robert Hogan2010-04-282-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://bugreports.qt.nokia.com/browse/QTBUG-9618 QtWebKit currently fails the following test: LayoutTests/http/tests/xmlhttprequest/cookies.html This is because QNetworkCookieJar::cookiesForUrl returns secure cookies even when the connection is not secure. A 'secure' cookie is set by response headers from a http server as follows: 'Set-Cookie: cookie-name=value; secure' Correct QNetworkCookieJar::cookiesForUrl to ignore secure cookies when the url in the request is not 'https:'. Task-number: QTBUG-9618 Merge-request: 2372 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| | * | | | qdoc: Added breadcrumbs to examples. Coolio.Martin Smith2010-04-293-0/+37
| | |/ / / | | | | | | | | | | | | | | | Doesn't work in a few cases because of non-standard naming of things.
| | * | | qdoc: Sprinkled more breadcrumbs.Martin Smith2010-04-282-9/+20
| | | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-0216-26/+360
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-3016-26/+360
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 desktopservices demo missing icon in SymbianMiikka Heikkinen2010-04-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian abld toolchain cannot handle very long paths for mifconv source images, so do not absolutize the path. This should not be a problem, as the absolute icon path is only needed for shadow builds, which are not supported in symbian-abld anyway. Task-number: QTBUG-10135 Reviewed-by: Thomas Zander
| | * | | | Fix path removal from target in Symbian buildsMiikka Heikkinen2010-04-301-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt generic slash separator must be supported also in platforms that do not have that as platform specific separator. Reviewed-by: Thomas Zander
| | * | | | Fix compilation errors in tst_qfileinfoShane Kearns2010-04-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Gareth Stockwell
| | * | | | Symbian (installation) docs.Thomas Zander2010-04-292-2/+287
| | | | | | | | | | | | | | | | | | | | | | | | Done with: Axis
| | * | | | Make 'make sis' recursive again.Thomas Zander2010-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After default_deployment was added as default option our test for project type was not reached anymore. Fix that.