summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'd9fa92' into origin-4.6Olivier Goffart2009-11-2017-77/+201
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-2011-13/+122
| |\ | | | | | | | | | 4.6-staging2
| | * QAbstractSlider: keypad navigation is slow.Frans Englich2009-11-192-4/+74
| | | | | | | | | | | | | | | | | | | | | Add logic to make keypad navigation faster when auto repeating. Task-number: QTBUG-5988 Reviewed-by: Gareth Stockwell
| | * Symbian: QKeyEvent:isAutoRepeat() doesn't workFrans Englich2009-11-191-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-6011 Reviewed-by: Gareth Stockwell
| | * Fix crash when using splash screen, or QPixmap::copy()Shane Kearns2009-11-192-0/+7
| | | | | | | | | | | | | | | | | | | | | Missing virtual function now implemented Task-number: QTBUG-5977 Reviewed-by: axis
| | * Freeze def files against 4.6.0Shane Kearns2009-11-196-8/+40
| | | | | | | | | | | | Reviewed-By: Trust Me
| * | Do not recreate the VGImage if the size is unchangedRhys Weatherley2009-11-202-33/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | When a pixmap's contents change in QVGPixmapData, only recreate the VGImage in the GPU if the size is different than before. This should help reduce GPU memory fragmentation. Task-number: QT-2504 Reviewed-by: Sarah Smith
| * | Remove unmatched else in non-EGL mode for OpenVG pixmap dataRhys Weatherley2009-11-201-1/+0
| | | | | | | | | | | | Reviewed-by: Gunnar Sletta
| * | Prevent a deep copy of QImage::bits() in the OpenVG pixmap implementationRhys Weatherley2009-11-201-2/+10
| | | | | | | | | | | | | | | Task-number: QTBUG-5869 Reviewed-by: Sarah Smith
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Olivier Goffart2009-11-194-24/+51
| |\ \
| | * | Item views: make sure the model is connected/disconnected correctlyThierry Bastian2009-11-192-8/+30
| | | | | | | | | | | | | | | | Reviewed-by: ogoffart
| | * | Item views: make sure the hovered item is updated when scrollingThierry Bastian2009-11-192-16/+21
| | | | | | | | | | | | | | | | Reviewed-by: leo
| * | | Fixes regression in QListView: Selection would not expend to the full viewportOlivier Goffart2009-11-191-2/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Commit ecc202c introduced the regression while fixing another regression (QTBUG-5854) The selection would not expend to the whole viewport. Reviewed-by: Robert Griebl
| * | On main window, the sizegrip visibility was not correctly updatedThierry Bastian2009-11-191-8/+21
| | | | | | | | | | | | | | | Task-number: QTBUG-4334 Reviewed-by: ogoffart
| * | Fixes: QCommandLinkButton crop large icons.Olivier Goffart2009-11-191-1/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-1976 Reviewed-by: Gabi
| * | Merge upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-11-1939-271/+382
| |\ \
| * | | Complete QVariantAnimation doc to mention qRegisterAnimationInterpolatorThierry Bastian2009-11-191-1/+18
| | | | | | | | | | | | | | | | Task-number: QTBUG-5970
| * | | Mark QGraphicsItemAnimation as deprecatedThierry Bastian2009-11-191-0/+1
| | |/ | |/| | | | | | | Task-number: QTBUG-5968
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-192-1/+5
| |\ \ | | | | | | | | | | | | 4.6-staging2
| | * | Disable linker warning 6780 in RVCT builds for Symbian OSIain2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The linker warning that indicates symbol visibility changes is not useful as it is an expected change to symbol visibility and produces lots of clutter in the build logs. (It is not desirable to follow the ELF spec when it comes to symbol visibility in this case, which is why the linker warns and we ignore it) This is likely to be a Raptor-only issue - I believe abld suppresses the warning by default (at least in ABIv1 mode) Also update gui.pro to use LFLAGS rather than MMP_RULES to alter the arguments to ARMCC toolchain. qmake ought to detect this (incorrect) usage of MMP_RULES and abort MMP file generation - raised QTBU-5961 to look at this. Reviewed-by: Shane Kearns
| | * | Complement Phonon for Symbian documentation.Frans Englich2009-11-181-0/+4
| | | | | | | | | | | | | | | | Reviewed-by: Gareth Stockwell
* | | | Merge commit 'b345b96dc14cc0da3a9ff44216d447e6f2c8ad97' from oslo-staging-1 ↵Simon Hausmann2009-11-2011-17/+95
|\ \ \ \ | | | | | | | | | | | | | | | into 4.6
| * | | | QNativeSocketEngine: Compile fixMarkus Goetz2009-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| * | | | QNAM HTTP Code: Use KeepAlive socket optionMarkus Goetz2009-11-191-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | Revert "Revert "Fix detection of linux-g++""Simon Hausmann2009-11-194-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit baab5f7e77c1216ede839766c97abef1a708b365. Reviewed-by: Paul
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-1970-275/+365
| |\ \ \ \
| * | | | | Remember to match the actual arguments too.Thiago Macieira2009-11-192-0/+20
| | | | | |
| * | | | | Disable the deprecation warning for this signal since we're using it nowThiago Macieira2009-11-191-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5972
| * | | | | Revert "Stop using the NameOwnerChanged signal without arg0 in QtDBus itself"Thiago Macieira2009-11-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This partially reverts commit 1176ecf0b533279e5a1c97f183e5c5f1c57fb188. Task-number: QTBUG-5972
| * | | | | QTcpSocket: Fix waitForConnected on WindowsMarkus Goetz2009-11-192-7/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The select() system call was used in the wrong way. We need to select for exceptions too. Task-number: QTBUG-5799 Reviewed-by: Aleksandar Sasha Babic <aleksandar.babic@nokia.com> Reviewed-by: Peter Hartmann
* | | | | | Fix for compile error in Phonon MMF backendGareth Stockwell2009-11-197-62/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was introduced by d0b0b525de. The use of QT_NO_DEBUG macros causes release-armv5 builds to fail when the -release option is passed to configure. This change causes the debugging code (ObjectDump and related classes) to be included in release builds, although these functions are not executed. This is a temporary fix; task QTBUG-6012 has been created for re-removing this code from release builds. Reviewed-by: Frans Englich
* | | | | | Freeze def files against 4.6.0Shane Kearns2009-11-196-8/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Trust Me (cherry picked from commit 1f6aa19209a7d22bb15bf0a0afb2d62200c0d3fa)
* | | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-1998-580/+743
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch '4.6' of oslo-staging-1 into 4.6Simon Hausmann2009-11-1922-139/+205
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix the evaluation nag in binary installs with commercial licenses.Thiago Macieira2009-11-181-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It wasn't generating any message, but it did think it was an evaluation install. So all Qt console applications produced an extra newline and the GUI ones showed the Qt logo briefly. I noticed because of the extra newline when building Qt itself. Reviewed-by: Trust Me
| | * | | | Fix JavaScriptCore on 32-bit Sparc: these machines are big-endianThiago Macieira2009-11-181-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Jocelyn Turcotte
| | * | | | Fix compilation of Embedded with GLib.Thiago Macieira2009-11-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You have to link to Glib if you're using it... Reviewed-by: Peter Hartmann
| | * | | | Merge branch '4.6' into 4.6-stagingThiago Macieira2009-11-184-44/+66
| | |\ \ \ \
| | * | | | | Fixes in the multitouch handling.Denis Dzyubenko2009-11-184-30/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When filling in touch point data for delivering to widget don't use the setter methods to avoid unnecessary detaches. Making it not detach also allows not to re-calculate widget-relative start position and last position on each delivery step. Also use the QWeakPointer to store a pointer to a widget that expects to receive a touch event, so that if the widget is destroyed we'll get notified. Reviewed-by: Bradley T. Hughes
| | * | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-11-187-6/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 7bdf90f753d25fb1b5628b0980827df11110ad5a ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-18 Paul Olav Tvete <paul.tvete@nokia.com> Reviewed by Simon Hausmann. [Qt] Make the QWebElement::render() test pass when pixmaps aren't 32 bit. * tests/qwebelement/tst_qwebelement.cpp: (tst_QWebElement::render): 2009-11-18 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Tor Arne Vestbø. Clarify and simplify the legal section in the overview documentation, after review with our legal team. * docs/qtwebkit.qdoc: 2009-11-18 Simon Hausmann <simon.hausmann@nokia.com> Reviewed and suggested by Tor Arne Vestbø. Fix the autotest after commit ecbb2c0dd21bfc197e1f7b53150ec9b1a1d8cb8f to compare the Qt::ImFont property's family against an explicitly previously configured family. * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::inputMethods):
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-1886-787/+842
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe
| | * | | | | | Application object must be constructed before QScriptEngineKent Hansen2009-11-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required due to the switch to the JavaScriptCore-based back-end. Instead of segfaulting somewhere inside JSC::initializeThreading(), call qFatal() when this constraint has been violated. Reviewed-by: Simon Hausmann
| | * | | | | | Compile with mixed carbon/cocoa universal builds.Morten Johan Sørvig2009-11-183-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moc got confused when Q3FileDialog was there in the carbon build but not in the cocoa build. (QT_MAC_USE_COCOA is defined by macros which moc does not evaluate) Fix this by porting Q3FileDialog to cocoa by using the compat functions in QFileDialog. revby:Prasanth Ullattil
| | * | | | | | upgraded harfbuzz to lastest versionLars Knoll2009-11-182-10/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade harfbuzz to b0d396aa88b3cdf8cea896bfeeba197656e1cdb1. This fixes a text rendering problem in Malayalam. Task-number: QTBUG-1887 Reviewed-by: Simon Hausmann
| | * | | | | | Fix regression introduced in 98a05681851db9d88b1364af52be543715fbe306João Abecasis2009-11-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some network tests were set up to ignore a qWarning that was removed. Fixed those tests. Made warning from QIODevice::getChar have the right function name. Reviewed-by: Thiago Macieira
| | * | | | | | remove unneeded JavaScriptCore.proKent Hansen2009-11-181-69/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file was erroneously imported from WebKit trunk. It is not used when building QtScript, and the only practical effect it has is to cause configure to spit out a warning. Reviewed-by: Simon Hausmann
| * | | | | | | Fix QCombobox painting regression on WindowsOlivier Goffart2009-11-191-2/+0
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some style relies on this broken behaviour that was fixed in commit e1a81c96790bee72ee4fbd2b0c4a7b48078c4ec1 The text on the combobox uses the wrong palette role. Reviewed-by: jbache
| * | | | | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1962-266/+334
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Ran the script utils/normalizeOlivier Goffart2009-11-1847-191/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Over src/ tools/ examples/ and demos/
| | * | | | | MAke a readonly QLineEdit not show "write" actions in its context menuThierry Bastian2009-11-181-18/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2494 Reviewed-by: Gabriel
generated by cgit v0.12 at 2024-11-11 21:21:18 (GMT)