summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-01-2022-52/+273
|\
| * Avoid calling WSAGetLastError() so often in nativeWriteMarkus Goetz2010-01-201-3/+3
| | | | | | | | Reviewed-by: joao
| * Cocoa: Fix painting errors on QGLWidget resizing.Morten Johan Sørvig2010-01-201-1/+1
| | | | | | | | | | Enable the patch in my previous commit. (remove "if 0")
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-209-24/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( e15bd5454732bab9ffff4e1e5a755f41fd4e2eff ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-19 Jocelyn Turcotte <jocelyn.turcotte@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Fix QWebInspector destruction problem. https://bugs.webkit.org/show_bug.cgi?id=31664 * Api/qwebpage.cpp: (QWebPage::~QWebPage):
| * Disabled some auto tests depending on private API.Mika Rautanen2010-01-201-0/+18
| | | | | | | | | | | | | | These auto tests are working only if developer build is defined, so exclude those otherwise. Reviewed-by: Rohan McGovern
| * QMetaObject::disconnectOne()Aaron Kennedy2010-01-204-7/+102
| | | | | | | | | | | | | | | | Adds a disconnectOne() method that allows a single signal/slot connection to be disconnected, as required by QTBUG-6781. Reviewed-by: Warwick Allison Reviewed-by: Olivier Goffart
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-1932-192/+322
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Memory leak in native Toolbar cleanup in Cocoa Fix copyright year. Bump version to 4.6.2. Add skeleton changes file for 4.6.2. Add released version of 4.6.1 changes file for posterity. Designer crashes when previewing QMainWindow with native Toolbar on Mac
| | * Memory leak in native Toolbar cleanup in CocoaNils Jeisecke2010-01-191-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | The QCocoaToolBarDelegate is not released when destroying the QMainWindowLayout. Task-number: QTBUG-7307 Reviewed-by: Prasanth Ullattil
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-191-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Return some fake data if we can't handle the network request.
| | * | Return some fake data if we can't handle the network request.kh12010-01-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we are the only handler for network request and cannot forward the request to our parent (e.g. unwanted net access), we work arround the case we can't handle it. We do create a reply with dummy data which will prevent some blocking and allows further processing of requested data. Task-number: QTBUG-7427 Reviewed-by: kh
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-194-16/+66
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make the qWarnings in the animation API more useful. Fixed y-inverted pixmaps on N900. Fix X11/EGL builds using OpenGL ES 1.1 Fix Typo
| | * | | Make the qWarnings in the animation API more useful.Alexis Menard2010-01-191-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number:QTBUG-6895 Reviewed-by:Thierry
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-192-7/+46
| | |\ \ \
| | | * | | Fix X11/EGL builds using OpenGL ES 1.1Tom Cooksey2010-01-191-6/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7399 Reviewed-By: TrustMe
| | | * | | Fix TypoThomas Zander2010-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Alan Alpert
| | * | | | Fixed y-inverted pixmaps on N900.Gunnar Sletta2010-01-191-4/+8
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGLPixmapData used default bind options, which means that the pixmap is always flipped up-side-down and rendered with flipping. The opaque pixmaps were uploaded unflipped which caused the bug. Ideally we do not want pixmap flipping so change the default in gl pixmaps and tag it accordingly. Reviewed-by: Samuel
* | | | | Merge commit 'upstream/4.6.1' into 4.6Jason McDonald2010-01-200-0/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | fix qm generation under windowsv4.6.1Oswald Buddenhagen2010-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Daniel Molkentin (cherry picked from commit e4953b7262d8122747569efee194b6eb46d40749)
| * | | | More changelog additions for QtWebKitJason McDonald2010-01-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust me (cherry picked from commit 59ee1b9d387468a5a80b5c450aa202d1b33e6bd1) Conflicts: dist/changes-4.6.1
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-144-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 8f6992f4e8f027818429d428393b08068eca9ffa ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-01-14 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Update Symbian .def symbol export files after private API additions. * symbian/bwins/QtWebKitu.def: * symbian/eabi/QtWebKitu.def: (cherry picked from commit f894fb8228e35a43b2baf80666ca5bca6e987064)
| * | | | fixes MMF plugin for Phonon when buidling with WINSCWEspen Riskedal2010-01-147-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | syncqt was changed, so include paths got messed up because of the relative path bug when building for WINSCW. We simply now make sure to include as <Phonon/foobar.h> instead of <phonon/FooBar> to fix it. Reviewed-by: Aleksandar Sasha Babic
| * | | | Update my changelog for 4.6.1Thiago Macieira2010-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 8c7e85c7b9933949c7a7c05489f5f6bfd1ce4312)
| * | | | My changes for 4.6.1Jason McDonald2010-01-141-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 42fc59ed04e1675ecae7fa87303a148c4b0c1ed1) Conflicts: dist/changes-4.6.1
| * | | | doc: Corrected parameter value in snippet.Martin Smith2010-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7158 (cherry picked from commit 52ecb299691defc3be6d202c7fab71bf865c710a)
| * | | | doc: This bug wasn't really a bug; it just required clarification.Martin Smith2010-01-142-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reported bug was actually not a bug. It is ok to pass the enum value as a string here, because the enumeration type has been registered with the meta-object system with the Q_ENUMS() macro. However, I have added a bit of text to clarify things a bit. Task-number: QTBUG-7158 (cherry picked from commit cd0772335cc9bcedd582cacc834bf4609ca650b0)
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-143-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 8b9165d3bc84d1c8cc7df49a191cc3857b5530d4 ) Changes in WebKit/qt since the last update: * Cherry-pick of http://trac.webkit.org/changeset/53181 ( http://bugreports.qt.nokia.com/browse/QTBUG-7290 ) (cherry picked from commit dd62687182830aa353ef573f653fe913fd42a8d0)
| * | | | Polish the changes file.Jason McDonald2010-01-131-169/+95
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Copy changes file from 4.6 branch.Jason McDonald2010-01-131-6/+90
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Merge branch '4.6.1' of git@scm.dev.nokia.troll.no:qt/qt-releases into 4.6.1Jason McDonald2010-01-137-45/+178
| |\ \ \ \
| | * | | | fix sametext and number heuristicsOswald Buddenhagen2010-01-137-45/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92e9a48 ("eliminate Translator::replace()") eliminated the correctness as well. whoops. this code should be more efficient as well ... (cherry picked from commit 2bd2e35078e0cdf9f1458892adcd0939504b59bb)
| * | | | | Changed log updatedPrasanth Ullattil2010-01-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit c90c5b6124bb952500c1d3ca0114163729414771)
| * | | | | Update change log with Yoann Lopes work.Yoann Lopes2010-01-131-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 81e1d9a9e9ff6649727bd26ea0c3be971813866d)
| * | | | | Update changelog with some of my stuffMarkus Goetz2010-01-131-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d1f73b7be62b0f6e9294b5d78ccd0680cb9fe118)
| * | | | | my 4.6.1 changelog contributionsBradley T. Hughes2010-01-131-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit eef74a19b867f307d7a0c0c47f3ee0ce2c4d283e)
| * | | | | Added changelog entries.axis2010-01-131-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit bb689ca42deee2034a3475fa0c5f9337ec1aebbb)
| * | | | | Update changes file with Rhys Weatherley's work.Rhys Weatherley2010-01-131-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 7abb2cfdea14fa71aabcd79635aa8f407ed96186)
| * | | | | Update changes fileAlan Alpert2010-01-131-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6580 (cherry picked from commit bdef1a949ea32c5fe0bd2926171b813cff0cee2a)
| * | | | Fixes warning in the QMacStyleOlivier Goffart2010-01-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warning such as QFont::setPointSizeF: Point size <= 0 (-1.000000), must be greater than 0 because the font size might be specified in pixel, and pointSizeF returns -1 if the font size is in pixel (as documented) Reviewed-by: jbache Task-number: QTBUG-7263 (cherry picked from commit a34d372b45d75a32dcc300dbb7f8151e15df4294)
| * | | | fix release mode crash in qfont.cpp initFontSubst() on Windows mobileJoerg Bornemann2010-01-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we've disabled LTCG for Windows CE by default, the code in initFontSubst() crashes on Windows mobile. Adding the extra const solves this problem. Task-number: QTBUG-6641 Reviewed-by: ossi (cherry picked from commit 8798b36880d1387d2d27f7fb35ccbf02af6232a0)
| * | | | Avoid coordinate limitations in the raster engine.Gunnar Sletta2010-01-132-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lines that are longer than 2^15 will overflow in qgrayraster.c so we need to clip them. Also, we need to clip the bounding rectangle to avoid an endless clip-loop Task: http://bugreports.qt.nokia.com/browse/QTBUG-6198 Reviewed-by: Samuel (cherry picked from commit d4e81805ff47a266890f9638cf29647889d5c730)
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-1310-1/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( bd6591b4acaf2172ab05702153ef539c0ac89cbb ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-12-18 Joe Ligman <joseph.ligman@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Add new API to QWebFrame to scrollRecursively starting with any css overflow then checking current frame and then ancestors https://bugs.webkit.org/show_bug.cgi?id=32668 * Api/qwebframe.cpp: (QWebFramePrivate::scrollOverflow): (QWebFrame::scrollRecursively): * Api/qwebframe.h: * Api/qwebframe_p.h: * tests/qwebframe/qwebframe.qrc: * tests/qwebframe/testiframe.html: Added. * tests/qwebframe/testiframe2.html: Added. * tests/qwebframe/tst_qwebframe.cpp: (cherry picked from commit 04bdf9f6a77e9ebf96431f89b8240a037b3d2b09)
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-1311-16/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-01-07 Yael Aharon <yael.aharon@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Allow the application to override online/offline network status https://bugs.webkit.org/show_bug.cgi?id=32684 Add a setting so that applications can overide the network status. Applications that use this setting still need to block network access through QNAM. * Api/qwebsettings.cpp: (qt_networkAccessAllowed): (cherry picked from commit a010d26629e8aa5aaa14a7e57ace06708fc903d6)
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-137-1/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( b217cdfedc7b5e7581325bda718192247f03dd5d ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-01-07 Yongjun Zhang <yongjun.zhang@nokia.com>, Laszlo Gombos <laszlo.1.gombos@nokia.com> Reviewed by Simon Hausmann. [Qt] need an API to suspend and resume active Javascript DOM objects. https://bugs.webkit.org/show_bug.cgi?id=31673 Add suspend and resume DOM objects private API to QWebFrame. * Api/qwebframe.cpp: (qt_suspendActiveDOMObjects): (qt_resumeActiveDOMObjects): (cherry picked from commit 0abf84be1a715db1d6adc5bf21e150e949e0e9e9)
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-134-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 865abd2871c801c1d3d0f4eebd985b2daab89ebe ) Changes in WebKit/qt since the last update: (cherry picked from commit 53817ebe67158d642fd5d85dfdcf4d96e91b093b)
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-133-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 5d691a1c283938dfbdf891883d8cff8a6ef040bf ) Changes in WebKit/qt since the last update: * Prospective build fix for IA64 Task: QTBUG-6948 (cherry picked from commit dc50ba5885d27aff99d62ced52081eda851552e7)
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-136-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 70b5989bdeea2f73bd950099fc0f0e954550ef54 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-12-30 Janne Koskinen <janne.p.koskinen@digia.com> Reviewed by Simon Hausmann. Upstream Symbian def files from Qt 4.6. These files define the ABI of QtWebKit on Symbian. * symbian/bwins/QtWebKitu.def: Added. * symbian/eabi/QtWebKitu.def: Added. (cherry picked from commit 775339c85e5c28d7cef419c40969c69b133bd65c)
| * | | | Symbian build fixSimon Hausmann2010-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable bearer management support in WebKit for builds inside Qt. We can't depend on an external module that depends on what we're building right now :) This is just a stop-gap fix. Reviewed-by: Trust me (cherry picked from commit 5ac2736a7733197bde86ea4fb873ba9b1038d444)
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-134-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( c07df5686b431aa5d11643d00308d8f8f59d88b1 ) Changes in WebKit/qt since the last update: * Disable HTML5 Datagrid * Fix RVCT build (cherry picked from commit a8454801a1fc195d2ef6e1a05042ccf0833d8edd)
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-1312-15/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-12-14 Holger Hans Peter Freyther <zecke@selfish.org> Reviewed by Kenneth Rohde Christiansen. [Qt] Fix JavaScript prompt behavior for empty/null strings. https://bugs.webkit.org/show_bug.cgi?id=30914 The patch is based on the work done by Gupta Manish. In the default implementation of the JavaScript prompt we are using a QInputDialog to get the text and this has one quirk with regard to not entering any text. In other WebKit ports and in Firefox an empty string is returned but in the Qt case it is a null string. Change the API documentation in QWebPage to mention we want to have a non null string but do the fixup in the ChromeClientQt to support existing code. * Api/qwebpage.cpp: (QWebPage::javaScriptPrompt): Change API documentation * WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::runJavaScriptPrompt): Fixup null QString (cherry picked from commit 3185723b69133530016528c8cef57da247589d30)
| * | | | Merge branch '4.6.1' of git@scm.dev.nokia.troll.no:qt/qt-releases into 4.6.1Jason McDonald2010-01-1326-153/+200
| |\ \ \ \
generated by cgit v0.12 at 2024-11-16 08:36:39 (GMT)