summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixes: Fix spinbox with NoButton style in QGtkStyleJens Bache-Wiig2010-01-081-44/+53
| | | | | | | | Task: QTBUG-6952 RevBy: ogoffart Details: We simply need to handle this case explicitly to draw like a GtkEntry.
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-0861-397/+913
|\
| * Cocoa: Fix painting errors on QGLWidget resizing.Morten Johan Sørvig2010-01-081-0/+7
| | | | | | | | | | | | | | Revby: Trond We need to update the GL context syncronously during the resize to prevent flicker. Use the existing MacGLWindowChange machinery to do that.
| * Fix broken QGLWidget::renderPixmap on Mac/CarbonMorten Johan Sørvig2010-01-081-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: ed2a03b3bc85be056eca87928d18a746faa07bca Reviewed-by: Trond Commit ed2a03b3bc85be056eca87928d18a746faa07bca removed all QuickDraw code and made QPixmap::macQDHandle() return 0 in all cases. Unfortunately QGLWidget::renderPixmap() depended on macQDHandle returning a valid handle, causing it to break. Fix this by inserting the macQDHandle implementation were we would call macQDHandle before. This is the only place in Qt where macQDHandle is used.
| * Fixes: Setting any style sheet breaks checkbox positioningJens Bache-Wiig2010-01-082-7/+19
| | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-7198 RevBy: ogoffart Details: It was impossible to override the checkbox positioning in a custom style if any style sheet was set on the application of widget. This was because the style sheet never passed control to the base style. We now fix it by checking if the style sheet has the appropriate style rules.
| * Fixes: MenuItem size fixes and missing separator with Gtk+Jens Bache-Wiig2010-01-083-28/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-6522 RevBy: thorbjorn Details: This fixes missing separator line in the Dust theme. The patch also significantly improves the accuracy of menu item size metrics by making use of gtk_widget_size_request to query things like default heights. - More accurate offset and size of separators - Fixed item height of menu items using size_request - Fixed vertical offset of label and check boxes - Fixed clipping issue on last menu item
| * Autotest: add a test for QNAM's HTTP cache handling codeThiago Macieira2010-01-081-1/+202
| |
| * QNAM HTTP: just use the expirationDate in the code that validates the cacheThiago Macieira2010-01-081-2/+6
| | | | | | | | | | | | The max-age handling is already done in the cache-saving code. Reviewed-by: Peter Hartmann
| * QNAM HTTP: change the caching semantics to match documentationThiago Macieira2010-01-081-7/+10
| | | | | | | | | | | | | | PreferCache should not use the network even if must-revalidate is set. But if it is not fresh enough, then it should use the network. Reviewed-by: Peter Hartmann
| * QNAM HTTP: fix the caching algorithm from RFC 2616Thiago Macieira2010-01-081-4/+10
| | | | | | | | Reviewed-by: Peter Hartmann
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-0833-202/+290
| |\ | | | | | | | | | | | | Conflicts: src/multimedia/audio/qaudioformat.cpp
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-01-0825-124/+186
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: QAudioInput loses data on Maemo5/other linux platforms. Fix warning in qfilesystemmodel_p.h Frequency to SampleRate and channels to channelCount. Added setChannelCount() to QAudioFormat.
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Kurt Korbatits2010-01-07434-5810/+18922
| | | |\
| | | | * Merge branch '4.6' of ../../4.6 into 4.6Justin McPherson2010-01-07433-5802/+18914
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/multimedia/audiodevices/audiodevices.cpp
| | | | * | Fix warning in qfilesystemmodel_p.hJustin McPherson2010-01-071-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Rhys Weatherley
| | | * | | QAudioInput loses data on Maemo5/other linux platforms.Kurt Korbatits2010-01-071-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The alsa backend was calculating sample timer on resume using buffer_time instead of period_time. Task-number:QTBUG-7044 Reviewed-by:Justin McPherson
| | | * | Frequency to SampleRate and channels to channelCount.Kurt Korbatits2010-01-0624-90/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Added channelCount(), changed everything to use this instead of channels() in QAudioFormat class. -Added setSampleRate() and sampleRate(), changed everthing to use these instead of setFrequency() and frequency() in QAudioFormat class. -Added supportedSampleRates() and supportedChannelCounts(), changed everything to use these instead of supportedFrequencies() and supportedChannels() in QAudioDeviceInfo class. Reviewed-by:Justin McPherson
| | | * | Added setChannelCount() to QAudioFormat.Kurt Korbatits2010-01-0616-22/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added setChannelCount() and updated docs/examples/tests to use it instead of setChannels(). Reviewed-by:Justin McPherson
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-078-78/+104
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Reset the GL stencil mask, op and function in resetGLState(). Fix performance regression in _q_polishItems. Fixed indentation and typo. Fixed bug in boxes demo occuring with certain OpenGL drivers. Remove unnecessary call to QWidget::setAttribute(). Avoid a deep copy of QImage::bits() in the png writer
| | | * | Reset the GL stencil mask, op and function in resetGLState().Trond Kjernåsen2010-01-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7203 Reviewed-by: Samuel
| | | * | Fix performance regression in _q_polishItems.Alexis Menard2010-01-073-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSet is a hash internally, using Iterator::begin while erasing elements inside the set might create holes and then the complexity increase. We now use the return value of erase (the next element) so the complexity is linear. For those who create/delete item in the polish event (BAD), _q_polishItem might be slower than the normal call. Task-number:QTBUG-6958 Reviewed-by:olivier
| | | * | Fixed indentation and typo.Trond Kjernåsen2010-01-071-67/+67
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * | Fixed bug in boxes demo occuring with certain OpenGL drivers.Samuel Rødal2010-01-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently glLoadMatrixf doesn't load the supplied data synchronously in certain drivers, so we make the arrays static to work around this issue. Really a GL driver bug but it's quite simple to work around it in this case. Reviewed-by: Kim
| | | * | Remove unnecessary call to QWidget::setAttribute().Trond Kjernåsen2010-01-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is already done in the QGLWidget constructor. Reviewed-by: Kim
| | | * | Avoid a deep copy of QImage::bits() in the png writerRhys Weatherley2010-01-061-1/+1
| | |/ / | | | | | | | | | | | | | | | | Task-number: QTBUG-7161 Reviewed-by: Daniel Pope
| * | | Avoid repeatedly calling LookupAccountSid in QFSFileEngine::ownerRitt Konstantin2010-01-071-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to retrieve user/group name in a single call to LookupAccountSid, by using pre-allocated buffers. Only call a second time if the buffer size is insufficient. 64 bytes should be enough in common case. Previously, we would always call LookupAccountSid twice, even if ERROR_NONE_MAPPED occured first time. Merge-request: 815 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | improve readability a bit moreRitt Konstantin2010-01-071-8/+8
| | | | | | | | | | | | | | | | | | | | Merge-request: 815 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | fix styling; improve readabilityRitt Konstantin2010-01-071-36/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tabs -> spaces; * if( -> if ( * some strings rearranged. no code changes! Merge-request: 815 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | make it possible to retrieve name of the user who owns the fileRitt Konstantin2010-01-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QFSFileEngine::owner(OwnerUser) now works as expected Merge-request: 815 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-0711-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):
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-074-11/+18
| |\ \ \
| | * | | Autotest: rename test with typo in the nameThiago Macieira2010-01-071-2/+2
| | | | |
| | * | | Fix bugs evidenced by change to keep flush errors on QFile::closeJoão Abecasis2010-01-073-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When closing a file, the contents of the write buffer should be emptied even in the case where flush fails, so it doesn't leak to subsequent files opened through the same instance. This is inline with what would happen with native close on a buffered device. Also changed the resource file engine to succeed on flush. Since all writes fail there, logically it's write buffer is empty and flush should succeed. This keeps auto-tests happy :-) tst_QFile::fullDisk auto-test extended to ensure re-opening QFile does not keep the write buffer alive. Reviewed-by: Thiago Macieira
| | * | | Don't drop errors from flush on QFile::closeJoão Abecasis2010-01-071-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we don't defer to the file engine for the write buffer it is doubly more important to retain errors from flush. The logic employed reproduces what we already had in QFSFileEngine::close, earliest error stays. Reviewed-by: Thiago Macieira
| | * | | Avoid double-buffering in QFileJoão Abecasis2010-01-071-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Qt 4.3 QIODevice has been providing read buffering for buffered devices; QFile provides a write buffer. Thus, requesting a buffered file from the engine results in unnecessary double-buffering where this is supported natively. By preferring QFile/QIODevice's buffering over the file engine we reduce the number of system calls. On the other hand, buffering inside QIODevice can't easily be disabled without changing the return value of QIODevice::openMode() (function is non-virtual). Reviewed-by: Thiago Macieira
| * | | | Doc: Added the QAudio namespace to the multimedia module documentation.David Boddie2010-01-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added it to the multimedia group. Reviewed-by: Trust Me
| * | | | Doc: Added license information for the Symbian version of qtmain.David Boddie2010-01-071-5/+47
| |/ / / | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Discussed-with: Legal and axis
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-078878-9935/+13594
| |\ \ \
| * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-06191-1759/+8509
| |\ \ \ \
| * | | | | Doc: Made coding style changes to the Audio Input and Output examples.David Boddie2010-01-063-66/+70
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | Doc: Improved the advice about deployment of plugins.David Boddie2010-01-061-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recommended deploying all plugins, excluding only those that are not required. Included accessibility plugins in the list of example plugins that users may need. Reviewed-by: Jan-Arve Sæther
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-12-18202-3193/+6107
| |\ \ \ \ \
| * | | | | | Doc: Fixed comments in a code snippet.David Boddie2009-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | Doc: Made corrections to documentation style and clarified some points.David Boddie2009-12-181-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | | doc: Explained parameter value defaults where appropriate.Martin Smith2010-01-082-28/+47
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | Task-number: QTBUG-6607
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-071-0/+2
|\ \ \ \ \ \
| * | | | | | Prospective Qt/Mac build fixSimon Hausmann2010-01-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac/32 QXmlStreamWriter is actually QCoreXmlStreamWriter, so the friend declaration in QTextEncoder to access the private state needs to cover that class, too. Reviewed-by: Prasanth
* | | | | | | doc: Removed incorrect \inmodule command.Martin Smith2010-01-071-2/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6606
* | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-077-1/+64
|\ \ \ \ \ \
| * | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-077-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):
generated by cgit v0.12 at 2024-12-27 15:54:24 (GMT)