summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't crash when comparing JSCore value without engine to non-JSCore valueKent Hansen2010-01-272-4/+23
| | | | | Task-number: None, discovering while doing test refactoring Reviewed-by: Jedrzej Nowacki
* doc: Included a note showing the actual value of UserType.Martin Smith2010-01-271-0/+2
| | | | Task-number: QTBUG-7606
* doc: Corrected misspelled word.Martin Smith2010-01-271-1/+1
| | | | Task-number: QTBUG-7626
* doc: Specified default values for constructors.Martin Smith2010-01-271-0/+5
| | | | Task-number: QTBUG-7628
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-2788-559/+1712
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Pulse Build System2010-01-2733-169/+309
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) When checking to see if a signal is connected, compare the match-arguments too Do the refcounting of services watched properly. Autotest: make the test valid for multiple Qt versions Cocoa: qfiledialog test spits out memory warnings Drawing fake buttons using QMacStyle+QStyleOptionViewItemV4 lead to crash. Don't use QDebug references. Instead, pass by value. QNativeSocketEngine: Set OS error strings on failed read() QNativeSocketEngine: Also handle unknown errors from socket engine Qt/Cocoa Event Dispatcher Problem in modal dialogs Cocoa: Usage of QMacCocoaAutoReleasePool makes CPU peak Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a54fd11a3abcd6d9c858e8162e85fd1f3aa21db1 ) Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 0bc66e2d86149e0fb6a33428e4f23ebfe83bfde4 ) 'test -e' is a bashism. It's not available in traditional sh. QFileNetworkReply: Use a QFileEngine Crash when deleting QMainWindow with native toolbar on Cocoa. QNativeSocketEngine_win: Don't mess with linger settings Cosmetic: move the "Alsa support..." line to a more appropriate place Doc: Fixed broken link. Doc: Added a warning about the Accelerated Graphics Driver example. Doc: Fixed installation information for Qt for Embedded Linux. ...
| | * When checking to see if a signal is connected, compare the match-arguments tooThiago Macieira2010-01-261-2/+4
| | |
| | * Do the refcounting of services watched properly.Thiago Macieira2010-01-261-20/+15
| | | | | | | | | | | | Issue found while debugging KDE applications.
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Pulse Build System2010-01-2632-147/+290
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits) Autotest: make the test valid for multiple Qt versions Cocoa: qfiledialog test spits out memory warnings Drawing fake buttons using QMacStyle+QStyleOptionViewItemV4 lead to crash. Don't use QDebug references. Instead, pass by value. QNativeSocketEngine: Set OS error strings on failed read() QNativeSocketEngine: Also handle unknown errors from socket engine Qt/Cocoa Event Dispatcher Problem in modal dialogs Cocoa: Usage of QMacCocoaAutoReleasePool makes CPU peak Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a54fd11a3abcd6d9c858e8162e85fd1f3aa21db1 ) Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 0bc66e2d86149e0fb6a33428e4f23ebfe83bfde4 ) 'test -e' is a bashism. It's not available in traditional sh. QFileNetworkReply: Use a QFileEngine Crash when deleting QMainWindow with native toolbar on Cocoa. QNativeSocketEngine_win: Don't mess with linger settings Cosmetic: move the "Alsa support..." line to a more appropriate place Doc: Fixed broken link. Doc: Added a warning about the Accelerated Graphics Driver example. Doc: Fixed installation information for Qt for Embedded Linux. fix copy-paste error minor optimization ...
| | | * Autotest: make the test valid for multiple Qt versionsThiago Macieira2010-01-262-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * Cocoa: qfiledialog test spits out memory warningsRichard Moe Gustavsen2010-01-261-0/+3
| | | | | | | | | | | | | | | | | | | | We need an auto release pool! (cherry picked from commit 7ad08868de4b3e481a51a3431504fcf42a4bbf6d)
| | | * Drawing fake buttons using QMacStyle+QStyleOptionViewItemV4 lead to crash.Carlos Manuel Duclos Vergara2010-01-261-72/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem here is the fact that we "trusted" the user when the widget type was specified. The fix consists in checking the result of the conversions, if the conversion was successful (i.e. the widget was of the type specified by the user) then we proceed as usual. If the conversion was not successful (i.e. wrong widget type) then we ask the style for a sensible size. I modified this for QPushButton, QSlider and QToolButton. Task-number: qtbug-7522 Reviewed-by: jbache
| | | * Don't use QDebug references. Instead, pass by value.Thiago Macieira2010-01-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you use refs, then you can't use this operator as the first argument, since qDebug() returns QDebug by-value (an rvalue temporary). That cannot be bound to a non-const ref. Task-number: QTBUG-7593
| | | * QNativeSocketEngine: Set OS error strings on failed read()Markus Goetz2010-01-253-4/+7
| | | | | | | | | | | | | | | | Reviewed-by: thiago
| | | * QNativeSocketEngine: Also handle unknown errors from socket engineMarkus Goetz2010-01-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7316 Task-number: QTBUG-7317 Reviewed-by: thiago
| | | * Qt/Cocoa Event Dispatcher Problem in modal dialogsRichard Moe Gustavsen2010-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that we didn't check if the event dispatcher was interrupted before starting to wait for more events. This patch will do the interrupt test after processing modal session events, and just before starting to wait. This will fix applications that expects e.g an event loop to exit immidiatly upon a signal from a timer (without the need for the user to generate e.g. a mouse event to stop the wait). Task-number: QTBUG-7503 Reviewed-by: cduclos
| | | * Cocoa: Usage of QMacCocoaAutoReleasePool makes CPU peakRichard Moe Gustavsen2010-01-252-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason was that QMacCocoaAutoReleasePool included a a call to NSApplicationLoad(). This call should only be made for carbon based application anyway, so we just ifdef it out (event how clumsy the placing of the call is). The CPU problem came because after the call, [NSApp isRunning] would return true, an as such, confuse the event dispatcher later on. Reviewed-by: MortenS
| | | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-252-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( a54fd11a3abcd6d9c858e8162e85fd1f3aa21db1 ) Changes in WebKit/qt since the last update: Fix from Girish
| | | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-256-13/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( 0bc66e2d86149e0fb6a33428e4f23ebfe83bfde4 ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2010-01-25 Janne Koskinen <janne.p.koskinen@digia.com> Reviewed by Simon Hausmann. [Qt] Phone backup support for QtWebkit for Symbian devices. https://bugs.webkit.org/show_bug.cgi?id=34077 * symbian/backup_registration.xml: Added.
| | | * 'test -e' is a bashism. It's not available in traditional sh.Thiago Macieira2010-01-251-2/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7549 Reviewed-By: Markus Goetz
| | | * QFileNetworkReply: Use a QFileEngineMarkus Goetz2010-01-252-19/+38
| | | | | | | | | | | | | | | | | | | | | | | | Slight performance increase. Reviewed-by: Peter Hartmann
| | | * Crash when deleting QMainWindow with native toolbar on Cocoa.Prasanth Ullattil2010-01-251-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash happens while processing a paint message received by the NSToolbar after the corresponding QToolbar has been destroyed. So while cleaning up the toolbar, the view needs to be detached from the custom toolbar item. Task-number: QTBUG-7305 Reviewed-by: Carlos Manuel Duclos Vergara
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-2513-15/+56
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNativeSocketEngine_win: Don't mess with linger settings Cosmetic: move the "Alsa support..." line to a more appropriate place Doc: Fixed broken link. Doc: Added a warning about the Accelerated Graphics Driver example. Doc: Fixed installation information for Qt for Embedded Linux. fix copy-paste error minor optimization Autotest: add a test for allowing hostnames ending in dot Fix QUrl::toAce for domains with dot at end Fix NSCFNumber autorelease warning on Mac. Add a reference to adjustSize() from the size property Fix the parallel build of QtWebKit
| | | | * QNativeSocketEngine_win: Don't mess with linger settingsMarkus Goetz2010-01-251-2/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: thiago
| | | | * Cosmetic: move the "Alsa support..." line to a more appropriate placeThiago Macieira2010-01-251-2/+2
| | | | |
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-2411-11/+50
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Fixed broken link. Doc: Added a warning about the Accelerated Graphics Driver example. Doc: Fixed installation information for Qt for Embedded Linux. fix copy-paste error minor optimization Autotest: add a test for allowing hostnames ending in dot Fix QUrl::toAce for domains with dot at end Fix NSCFNumber autorelease warning on Mac. Add a reference to adjustSize() from the size property Fix the parallel build of QtWebKit
| | | | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-2262-198/+686
| | | | | |\
| | | | | | * fix copy-paste errorRitt Konstantin2010-01-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 442 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | | | | | * minor optimizationRitt Konstantin2010-01-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avoid needless atomic operations Merge-request: 442 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | | | | | * Autotest: add a test for allowing hostnames ending in dotThiago Macieira2010-01-222-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, since domain is never empty, the idx > 0 test is unnecessary.
| | | | | | * Fix QUrl::toAce for domains with dot at endThorvald Natvig2010-01-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 436 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | | | | | * Fix NSCFNumber autorelease warning on Mac.Morten Johan Sørvig2010-01-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-7385 Revby: Lorn Potter
| | | | | | * Add a reference to adjustSize() from the size propertyAndy Shaw2010-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7401 Reviewed-by: TrustMe
| | | | | | * Fix the parallel build of QtWebKitSimon Hausmann2010-01-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the missing dependency to xmlpatterns, to ensure it's built before QtWebKit if available. Reviewed-by: Tom
| | | | | * | Doc: Fixed broken link.David Boddie2010-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | | * | Doc: Added a warning about the Accelerated Graphics Driver example.David Boddie2010-01-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7403 Reviewed-by: Trust Me
| | | | | * | Doc: Fixed installation information for Qt for Embedded Linux.David Boddie2010-01-222-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Pulse Build System2010-01-277-20/+163
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public: Remove unneeded resources from QtGui Remove warnings Fix broken build of simulated QS60Style Updates to new Symbian DEF file system
| | * | | | | Remove unneeded resources from QtGuiAlessandro Portale2010-01-263-4/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtGui contains loads of resources. 337,160 bytes just for qstyle. And since this is nearly exclusively full of PNG files, it won't really be compressed in the qt.sis package. And it will eat unneccessary Ram. This patch removes about 260,000 bytes of resources. We only want the 32-pixel big icons. No 16- and 129- pixel versions. Task-number: QTBUG-7277 Reviewed-by: Sami Merila modified: src/gui/kernel/qapplication.cpp new file: src/gui/styles/qstyle_s60.qrc modified: src/gui/styles/styles.pri
| | * | | | | Remove warningsAlessandro Portale2010-01-261-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC revealed some issues that are worth a warning. Reviewed-by: Sami Merila modified: src/gui/styles/qs60style.cpp
| | * | | | | Fix broken build of simulated QS60StyleAlessandro Portale2010-01-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QProgressBar animating code is not meant for the simulated style. ifdef it out. Reviewed-by: Sami Merila modified: src/gui/styles/qs60style.cpp
| | * | | | | Updates to new Symbian DEF file systemIain2010-01-263-8/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug in qbase.pri, where it tested QT_CONFIG instead of CONFIG to see if DEF files were enabled, when setting the DEF file path Fix bug in configure.exe implementation, where SYMBIAN_DEFFILES was defined when testing for its value, due to incorrect use of QMap::operator[] Tidy up configure.exe help for new def files option Task-number: QTBUG-6556 Reviewed-by: Jason Barron Reviewed-by: Janne Koskinen
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-2611-152/+298
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add a convenience batch file to run the patch capabilities perl script QFileDialog layout issue on Symbian (part2) QFileDialog layout issue on Symbian QListWidget itemActivated does not follow S60 conventions Remove unnecessary scope definitions from QS60Style QS60Style: Combobox button is not drawn pressed Made characters in a password field briefly visible while typing. RadioButtons/Checkboxes should have theme highlight QListView::setAlternatingRowColors is not working Added Symbian backup & restore support for Qt.sis and fluidlauncher.sis.
| | * | | | | Add a convenience batch file to run the patch capabilities perl scriptMarius Storm-Olsen2010-01-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon Hausmann <simon.hausmann@nokia.com>
| | * | | | | QFileDialog layout issue on Symbian (part2)Sami Merila2010-01-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing #include. Task-number: QTBUG-6371 Reviewed-by: Alessandro Portale
| | * | | | | QFileDialog layout issue on SymbianSami Merila2010-01-261-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If long path (or any other long string) is added to a combobox, it grows outside of screen area. QS60Style needs to check that widget will not grow wider than screen area. Task-number: QTBUG-6371 Reviewed-by: Alessandro Portale
| | * | | | | QListWidget itemActivated does not follow S60 conventionsSami Merila2010-01-254-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set StyleHint SH_ItemView_ActivateItemOnSingleClick inactive for 3.x and 5th edition S60. Task-number: QTBUG-6182 Reviewed-by: Alessandro Portale
| | * | | | | Remove unnecessary scope definitions from QS60StyleSami Merila2010-01-251-70/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Alessandro Portale
| | * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-01-252-2/+55
| | |\ \ \ \ \
| | | * | | | | Made characters in a password field briefly visible while typing.axis2010-01-252-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done by intercepting key events with text in them, and temporarily submit them as preedit text instead of real input text. Currently it does not work in WebKit, but that is because WebKit hides preedit text as well, which is a bug of its own. RevBy: Simon Hausmann Autotest: Manual testing went fine