summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * Merge branch '4.6.1' of git@scm.dev.nokia.troll.no:qt/qt-releases into 4.6.1Jesper Thomschutz2010-01-131-5/+47
| |\
| * | Fixes a crash when destroying and creating QApplication.Denis Dzyubenko2010-01-135-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the gestureManager pointer to a QApplicationPrivate to make sure if QApplication object is destroyed, QGestureManager pointer is set to zero. Task-number: QTBUG-7029 Reviewed-by: Thiago (cherry picked from commit 828b1299e1ecb2da23799a2e49370e00dcf9c126)
| * | doc: Fixed typos.Martin Smith2010-01-131-8/+7
| | | | | | | | | | | | | | | Task-number: QTBUG-6607 (cherry picked from commit 8894467656973bd311bcc5822a38bdd0e171da51)
| * | doc: Explained parameter value defaults where appropriate.Martin Smith2010-01-132-28/+47
| | | | | | | | | | | | | | | Task-number: QTBUG-6607 (cherry picked from commit 3aa77d64608f944592939c5d673f1b7dabec730f)
| * | doc: Removed incorrect \inmodule command.Martin Smith2010-01-131-2/+0
| | | | | | | | | | | | | | | Task-number: QTBUG-6606 (cherry picked from commit 86bb9a9f8b2a455d4f3f8f58bb1a0f751d68df35)
| * | doc: Clarified activeSubControls and subControls.Martin Smith2010-01-131-4/+6
| | | | | | | | | | | | | | | Task-number: QTBUG-6405 (cherry picked from commit e2734782e72fccbc3bf528f201bac50703718b54)
| * | doc: Clarified that .lnk files are System files on Windows.Martin Smith2010-01-131-2/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-6615 (cherry picked from commit 73b7ff354f9eaf5819847dac0c147351c80d8a9b)
| * | doc: Updated the descriptions of the connection types.Martin Smith2010-01-133-47/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced the ambiguous "delivered" with the explanation that the blocking queued connection type blocks the emitter's thread until the slot finishes executing in the receiver's thread. Task-number: QTBUG-6392 (cherry picked from commit 4da15757269feb872432c43a3516a1349d6dcf39)
| * | Use the lowercase/shortname.h headers for Phonon includesThiago Macieira2010-01-134-24/+24
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-4685 Reviewed-by: TrustMe (cherry picked from commit bd01114b3fcf2cc702fdd9e303a15bcc900cfe95)
| * | Remove special Phonon processing from syncqt.Thiago Macieira2010-01-133-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore original Qt 4.4 behaviour. The capital P headers are not correct because of frameworks on Mac. More info, see thread: http://lists.kde.org/?l=kde-multimedia&m=126045273702498&w=2 Task-number: QTBUG-4685 Reviewed-by: Trust Me (cherry picked from commit 72adb8f5710fea385e94f9726546397cfbb1e4ad)
| * | Added absolute path to sqlite3.sis in s60installs.proMiikka Heikkinen2010-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relative path was only working when package was created from s60installs directory. Binary installer creation requires package creation to work also from Qt root, so added absolute path to sqlite3.sis. Task-number: QTBUG-7275 Reviewed-by: Janne Anttila (cherry picked from commit 008bae01b016926209dddacc6e31c79b9d99d4f7)
| * | doc: Corrected explanation of when append() does nothing.Martin Smith2010-01-131-2/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-7246 (cherry picked from commit 8e2c575f6383a69e9c1d4f069e3c8e3b219197b5)
| * | doc: Corrected parameter value in snippet.Martin Smith2010-01-131-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-7158 (cherry picked from commit 52ecb299691defc3be6d202c7fab71bf865c710a)
| * | doc: Added enum values to table for Qt 4.5 and 4.6.Martin Smith2010-01-131-6/+8
| | | | | | | | | | | | | | | Task-number: QTBUG-7156 (cherry picked from commit 45af493eeeb408f756cc7d76088cbc3e35f5f54b)
| * | Prevent a crash when creating an inputContext from the QApplication dtor.Simon Hausmann2010-01-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Complete the fix in f72165460d27860cabd51691f4d935fd74b50f80 by applying the same fix to Symbian and QWS. Task-number: QTBUG-7105 Reviewed-by: Alexis Reviewed-by: Jason McDonald (cherry picked from commit 8b56ffee8bb4ec0c56c2c05ccc1e088f6d9ae8a8)
| * | Prevent a crash when creating an inputContext from the QApplication dtor.Denis Dzyubenko2010-01-132-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When accessing the global input context from the QWidget destructor access it directly instead of calling a helper function. Don't even bother to create an input context if QApplication is being destroyed (just in case if the user is calling the QApplication::inputContext manually from the destructor). Task-number: QTBUG-7105 Reviewed-by: Simon Hausmann (cherry picked from commit f72165460d27860cabd51691f4d935fd74b50f80)
* | | Improve QUrl constructing performance by making empty URLs have d==0.Thiago Macieira2010-01-131-15/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One major cost is that QUrl::d is never 0 (even for default constructor). While this simplifies the code, it has a real performance impact, since QUrlPrivate is quite expensive to create (14 QString/QByteArray members, plus others). In a simple test of the QML flickr demo, 1 in 3 QUrlPrivate objects that were created were never used before being deleted. According to callgrind, this reduces cost of QUrl+QUrlPrivate by 25% in the case tested. Patch-by: Warwick Allison Reviewed-by: Thiago Macieira (cherry picked from commit 51f92c1a4f66f658b3c3b7f034bb8dd661a0d57d)
* | | doc: Added clarification about allocating space for the 0 terminator.Martin Smith2010-01-132-3/+32
| | | | | | | | | | | | | | | Task-number: QTBUG-5121 (cherry picked from commit 51078f1ef008c8395ddb76ac2f444daa511a4507)
* | | Fix for QTBUG-6408 QFontEngineS60::QFontEngineS60 called hundreds ofJani Hautakangas2010-01-132-32/+7
| |/ |/| | | | | | | | | | | | | | | | | | | times, taking up to 1ms each call. Use S60->ScreenDevice() to get/release fonts instead of create a new screen device each time. Task-number: QTBUG-6408 Reviewed-by: Jason Barron (cherry picked from commit d8ad9ac86dac9489b553e6416329308ae7d823d0)
* | Doc: Added license information for the Symbian version of qtmain.David Boddie2010-01-131-5/+47
|/ | | | | | Reviewed-by: Trust Me Discussed-with: Legal and axis (cherry picked from commit 0d97775f7a1077862281e3858da6b2c899ea8790)
* Document the QGraphicsView::IndirectPainting flagOlivier Goffart2010-01-122-1/+11
| | | | | | | And that the QGraphics{View,Scene}::drawItems function are now obsolete. Reviewed-by: Alexis (cherry picked from commit 3062035b9b38457196869b93650929f95cbd709f)
* Fixed build breakage on S60 3.1 due to audio effects changesGareth Stockwell2010-01-116-31/+10
| | | | | | | | | Removed calls to the video overload of the audio effect constructors, e.g. CAudioEqualizer::NewL(VideoPlayerUtility&) Task-number: QTBUG-7223 Reviewed-by: trustme (cherry picked from commit a3e6a04448979aaa6ada7aa434de3137f6cf0563)
* Implemented node disconnection in Phonon MMF backendGareth Stockwell2010-01-1120-194/+348
| | | | | | Task-number: QTBUG-4663 Reviewed-by: Frans Englich (cherry picked from commit 3f648dc075689e2ffedda2769cc76b4a56fb1073)
* Removed dead code from Phonon MMF backendGareth Stockwell2010-01-111-12/+2
| | | | | | | | | | The following source types are handled in MediaObject::createPlayer Invalid, Disc, Stream, Empty The code removed in this patch is therefore never executed. Reviewed-by: Frans Englich (cherry picked from commit 8e21fc62fe40c8e393007516958c216ad8dbd629)
* Re-emit prefinishMarkReached and aboutToFinish if rewound back past mark.Gareth Stockwell2010-01-112-2/+25
| | | | | | Task-number: QTBUG-6214 Reviewed-by: Frans Englich (cherry picked from commit fe5b275bfab1605da3ee95b6eb1d976aecb0a8a8)
* Implemented support for playlist handling in Phonon MMF backendGareth Stockwell2010-01-1112-170/+129
| | | | | | | | | | | The main changes are: 1. MediaObject emits prefinishMark at the appropriate instant 2. MediaObject emits aboutToFinish at the appropriate instant 3. MediaObject switches to next source when playback completes Task-number: QTBUG-6214 Reviewed-by: Frans Englich (cherry picked from commit 89e1e7fcbcbe93d8096afe0f7c240fe706cc9069)
* Changed call sequence of seeking in Phonon MMF backend, for streamingGareth Stockwell2010-01-112-19/+11
| | | | | | | | | | | | | Modified the sequence of calls made to the MMF APIs when seeking during ongoing playback. This fixes a bug found during early testing of streaming playback, whereby playback would not resume following the seeking operation. This was due to an interaction between the pause / seek / play operations, and the buffering callbacks received from the MMF, which caused the backend to enter an incorrect state. Task-number: QTBUG-4660 Reviewed-by: Frans Englich (cherry picked from commit 66b765734585971dd9d248059701fdecebbccd78)
* Implemented buffer status notifications in Phonon MMF backendGareth Stockwell2010-01-119-62/+162
| | | | | | | | | | | | | When clips are buffering (either at the start of playback, or during playback, when buffer levels drop due to e.g. CPU, file system or network load), the backend receives notification from the MMF. While buffering is ongoing, the backend periodically queries the filling status and emits a signal. Task-number: QTBUG-4660 Reviewed-by: Frans Englich (cherry picked from commit bed33ac62d87073120d56ff75a3d2356c99c64ea)
* Added support for streaming playback to Phonon MMF backendGareth Stockwell2010-01-118-6/+30
| | | | | | | | | | | | | | | | | Because the MIME type of the stream cannot always be deduced from the URL, we assume that it is a video stream. This is based on the assumption that the video controllers will be capable of parsing the container formats for audio-only, as well as video clips. Note that this assumption may not hold on all devices. Note that most implementations of the MMF client APIs do not support HTTP streaming (a.k.a. progressive download). The backend has therefore only been tested with RTSP streams - see the JIRA entry for further details. Task-number: QTBUG-4660 Reviewed-by: Frans Englich (cherry picked from commit 3117e3a6a9c1bf95fc30ebee4d8d11b646cb7125)
* Phonon MMF: leaves during object construction throw exceptionsGareth Stockwell2010-01-112-9/+7
| | | | | Reviewed-by: Frans Englich (cherry picked from commit bbab8eabb91b95dcd946c94b5f0ac59413e7a929)
* Removed stale TODO comments from Phonon MMF backendGareth Stockwell2010-01-113-4/+1
| | | | | Reviewed-by: Frans Englich (cherry picked from commit 99b10b64fd5f68c63e0c406558b507e429eea248)
* Correctly determine QScriptValue::isQObject() for QObjects using theMichael Brasser2010-01-113-4/+14
| | | | | | | | | QScriptDeclarativeClass. Task-number: QTBUG-6178 Reviewed-by: Kent Hansen Reviewed-by: Aaron Kennedy (cherry picked from commit 31cc1b382fbcd77def12cd0ad4fe9fc0fabdf60b)
* (Sqlite2) Fix for QTBUG-6421Bill King2010-01-111-4/+12
| | | | | | | | | Forgot to port the fix over to sqlite2 which seems to also be affected by the setForwardOnly caching bug as well. Task-number: QTBUG-6421 Reviewed-by: Justin McPherson (cherry picked from commit 8d76de98d93421395306941e59d136f1e7395d15)
* Added UIDs and icons to some webkit examplesMiikka Heikkinen2010-01-114-2/+18
| | | | | Reviewed-by: TrustMe (cherry picked from commit 60d27f4b9fd2dbed204260334b817ce41788cb3e)
* Separated "make run" and "make runonphone" targetsMiikka Heikkinen2010-01-112-12/+23
| | | | | Reviewed-by: axis (cherry picked from commit e2f2765b52508515874edea7015c01eb95ff89be)
* Fixed "run" makefile target documentation for SymbianMiikka Heikkinen2010-01-112-1/+15
| | | | | | | | "run" target no longer is just for running emulator targets. Also added TRK for optional requirements. Reviewed-by: axis (cherry picked from commit 1ae7c8d8f549cadda4780835d85235085cc5583c)
* Deal with test cases that crash or hangShane Kearns2010-01-116-33/+183
| | | | | | | | | | | | | | | Added an optional timeout to runonphone - the application will be killed after this time. Used when autotesting unattended, as some tests can hang. Handled the just in time debug halting the application when it is about to crash, by terminating the application. In future, we could capture a call stack or something here. Also added quiet/verbose options to control the amount of output from runonphone. Reviewed-by: Janne Koskinen (cherry picked from commit 0e94349de0b602f1b6af747b66ef03b22133cc3a)
generated by cgit v0.12 at 2025-08-12 14:29:56 (GMT)