summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-03-2623-6/+1021
|\
| * Squashed commit of the following:David Boddie2009-03-261-0/+2
| | | | | | | | | | | | | | | | | | | | commit b1220858d9c15b661b7825e733be448ea9962895 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 18:37:47 2009 +0100 Doc: Added information about the default value of QGraphicsTextItem::tabChangesFocus(). Reviewed-by: TrustMe
| * Squashed commit of the following:David Boddie2009-03-262-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 20864878d046b2ce6bf5fc54868be8df346ce0c8 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 18:30:32 2009 +0100 Doc: Fixed qdoc warning by adding more descriptive text. Reviewed-by: TrustMe commit 3b620a0a4d1b02105c9761384a5abc4ecf11e9d2 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 18:29:56 2009 +0100 Doc: Added macros for future use. Reviewed-by: TrustMe
| * Squashed commit of the following:David Boddie2009-03-262-2/+3
| | | | | | | | | | | | | | | | | | | | commit d30c39ccaa52ae61d798ca38af065c0a2ad96941 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 18:01:59 2009 +0100 Doc: Fixed a link to a function and added another reference to the Phonon overview. Reviewed-by: TrustMe
| * Squashed commit of the following:David Boddie2009-03-261-0/+5
| | | | | | | | | | | | | | | | | | | | commit e67776ff836b1e761dd1db1945daddc6394b6a54 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 17:47:42 2009 +0100 Doc: Added missing file. Reviewed-by: TrustMe
| * Squashed commit of the following:David Boddie2009-03-264-2/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 23e30464792f7e403e0815775eb7acbaad975238 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 17:41:20 2009 +0100 Doc: Added some basic documentation for the QSvgGenerator class. Task-number: 244944 Reviewed-by: TrustMe commit f84c1806d2ba40a61499584562d754f65d43f854 Merge: 8a42be7... 213d922... Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:59:14 2009 +0100 Merge branch '4.5' of ../qt-45 into qt/4.5 commit 8a42be789077de45f8fd9f13afd177798df7495e Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:58:33 2009 +0100 Doc: Added missing pieces for the SVG Generator example. Reviewed-by: David Boddie <dboddie@trolltech.com>
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-03-263-1/+121
| |\
| | * Fix a bug where lineedits in a second page of a stack widget would not get ↵Norwegian Rock Cat2009-03-263-1/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key events. We need to be more explicit in setting the first responder, and a bit more agressing about rejecting it when called with no responder. It seems that Cocoa has a tendency to reset the first responder when lots of widgets get hidden or shown. During this it will call "makeFirstResponder" on the window with a nil responder. Doing this will reset our what Cocoa thinks is the focus widget, but Qt will still show a focus widget. The way to solve it is to reject the make first responder if the responder is nil. I'm not sure if there will be far reaching implications for this, but it seems to be doing the right thing at the moment. We also need to share this code between QCocoaWindow and QCocoaPanel. Thanks to the dynamic nature of objective-C we have to have a copy of the code in both places. It's unfortunate. Finally, it's also important to have the QWidget let Cocoa know it has focus after it has been created. So, make sure that is in sync. Task-number: 249296 Reviewed-by: Prasanth Ullattil
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-03-2678-1316/+1648
| |\ \ | | |/
| * | Squashed commit of the following:David Boddie2009-03-2610-0/+716
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 8af45bfd7efe647963bcedf1736b62ee8568590d Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:39:31 2009 +0100 Doc: Committed a stray change. Reviewed-by: David Boddie commit 2aa564839e6a4821e9419230a1dd13ef691c679d Merge: f9e590a... db3c3ca... Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:38:53 2009 +0100 Merge branch '4.5' of ../qt-45 into qt/4.5 commit f9e590a4ef3e134cf2a1606a6fe3307df6935e96 Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 16:37:02 2009 +0100 Doc: Simplified the SVG Generator example and updated the list of examples. Committing before merging into the 4.5 branch. Reviewed-by: David Boddie <dboddie@trolltech.com> commit ba35080c7d728b9e47ac68e74fe62877285c400f Author: David Boddie <dboddie@trolltech.com> Date: Thu Mar 26 14:29:13 2009 +0100 Doc: Added a SVG generator example. This example shows how to paint on an QSvgGenerator device. Reviewed-by: David Boddie <dboddie@trolltech.com>
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-2622-162/+279
|\ \ \ | | |/ | |/|
| * | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-03-266-3/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b6fc217c2b853827926313c09bb3c32f66ffe43 ) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-02-06 Dirk Schulze <krit@webkit.org> Reviewed by Simon Hausmann. Fix bug in clearRect(). Use fillRect() instead of eraseRect() to get the context transparent. [QT] clearRect fill's a given rect with white https://bugs.webkit.org/show_bug.cgi?id=23728 * platform/graphics/qt/GraphicsContextQt.cpp: (WebCore::GraphicsContext::clearRect): ++ b/WebKit/qt/ChangeLog 2009-03-26 Simon Hausmann <simon.hausmann@nokia.com> Rubber-stamped by Tor Arne Vestbø. Fix the documentation of the QLocale usage in userAgentForUrl. * Api/qwebpage.cpp: 2009-03-20 Erik L. Bunce <elbunce@xendom.com> Reviewed by Simon Hausmann. Fix for InsertParagraphSeparator and InsertLineSeparator so that QWebPage::action() creates QActions for them. Also make sure they get updated appropriately. * Api/qwebpage.cpp: (QWebPagePrivate::updateEditorActions): (QWebPage::action): * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::textEditing):
| * | Fixes missing quotation markkh2009-03-261-1/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Fixes missing quotation markkh2009-03-261-1/+1
| | | | | | | | | | | | | | | Task-number: none Reviewed-by: TrustMe
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Kavindra Devi Palaraja2009-03-264-136/+162
| |\ \
| | * | Fix regression in qscriptvalue_cast (primitive-->complex type cast)Kent Hansen2009-03-262-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qscriptvalue_cast implementation was changed from 4.4 to 4.5 because of the introduction of QScriptValue constructors that don't take an engine pointer. However, when the old constructors are used, the behavior of qscriptvalue_cast should be as before, which this patch ensures. In short: If we have an engine pointer, use it. Task-number: 248802 Reviewed-by: Ariya Hidayat
| | * | Fix broken shortcutskh2009-03-262-135/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We where using hardcoded shortcuts, replaced now by QKeySequence, some further code clenup etc... Task-number: 248304, 247392 Reviewed-by: hjk
| * | | Doc - added QHostInfo to QHostAddress' See Also line, as requested byKavindra Devi Palaraja2009-03-261-1/+1
| |/ / | | | | | | | | | | | | | | | | | | the task. Task-number: 249423 Reviewed-by: TrustMe
| * | Fix crash when accessing newly constructed QTextObjects.Benjamin Poulain2009-03-268-10/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | The pieceTable member was only initialized by QTextDocumentPrivate _after_ the call to createObject. This patch initializes it at construction time. Task-number: 246138 Reviewed-by: Simon Hausmann
| * | Reduce the number of calls to QThread::idealThreadCount() in QtConcurrent.Morten Sørvig2009-03-261-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | This results in a syscall and is very slow. Make the call once and cache the value. Task-number: 244718 Reviewed-by: TrustMe
| * | Make the traffic info example not hit the server every minute.Thiago Macieira2009-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The most frequent service in Oslo is every 5 minutes, so this should be a reasonable update interval. Let's hope that Trafikanten will stop blocking us in their firewall now. Reviewed-by: Trust Me
| * | Fix regression where QMacStyle would only draw tabs w/QStyleOptionTabV3.Norwegian Rock Cat2009-03-261-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is a good example of how to not use QStyleOption when added new features. It's important to start with the most compatible and then cast to the more specific versions to get the new fields. Task-number: 248769 Reviewed-by: Jens Bache-Wiig
* | | Merge branch '4.5'Rohan McGovern2009-03-2640-43/+121
|\ \ \ | |/ / | | | | | | | | | Conflicts: tests/auto/selftests/tst_selftests.cpp
| * | Change testlib selftest targets to help autotest tools.Rohan McGovern2009-03-2633-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The testlib subtests are conceptually not standalone unit tests, rather they are helper programs for the real unit test, tst_selftests. So, as is done for other similar tests (e.g. qprocess), don't name them with `tst_'. This makes it easier for automated tools to figure out that they shouldn't directly run these tests. Reviewed-by: Shane Bradley
| * | Remove outdated script which can't have worked since we stopped usingRohan McGovern2009-03-251-34/+0
| | | | | | | | | | | | perforce.
| * | Not part of the repositoryAlessandro Portale2009-03-251-0/+0
| | |
| * | alphaMask needs to be const, because first bytesPerLine() is called and then ↵Alessandro Portale2009-03-251-1/+1
| | | | | | | | | | | | bits(). The non-const bits() may detach and realign the data, so that the previous result of bytesPerLine() ist invalid. On S60, we actually had a 'skew' effect because of that.
| * | QGtkStyle: Support styled QFrameJens Bache-Wiig2009-03-251-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes QGtkStyle style QFrame. In order to avoid negatively affecting the performance we cheat by using a border image without the center part filled. GtkScrolledWindow style is used as QFrame is generally mapped to item views. 249363 ogoffart
| * | Fix flipping.Anders Bakken2009-03-251-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | Fixes two bugs with regards to Flip(). We blit'ed the boundingRect of the updated region rather than each rect which is wasteful. More importantly we ignored the offset which would lead to painting errors. Reviewed-by: Tom Cooksey
* | | Small documentation enhancement for QSslSocketMarkus Goetz2009-03-251-2/+5
| | | | | | | | | | | | RevBy: TrustMe
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-2519-1112/+1253
|\ \ \ | |/ /
| * | Clean up locking/unlockingAnders Bakken2009-03-251-21/+11
| | | | | | | | | | | | | | | | | | | | | | | | Store the QDirectFBPaintDevice we're painting and use this when unlocking/locking instead of working on QPaintEngine::device() which isn't necessarily the same. Reviewed-by: Tom Cooksey
| * | Minor code cleanupAnders Bakken2009-03-251-3/+4
| | | | | | | | | | | | | | | | | | Improve readability of code. Reviewed-by: Tom Cooksey
| * | Make QDirectFBPaintDevice() protected.Anders Bakken2009-03-251-5/+7
| | | | | | | | | | | | | | | | | | | | | This class should never be instantiated without being subclassed so a protected constructor is the clean thing to do. Reviewed-by: Tom Cooksey
| * | Get rid of the setImageColorTable stuff.Anders Bakken2009-03-252-45/+0
| | | | | | | | | | | | | | | | | | | | | It's never necessary. Any surface we ever intend to lock and write to should never have a color table. Reviewed-by: Tom Cooksey
| * | Optimize bytesPerLine.Anders Bakken2009-03-252-6/+12
| | | | | | | | | | | | | | | | | | No sense in locking every time we want the bpl. The bpl won't change Reviewed-by: Tom Cooksey
| * | Optimize fillRects.Anders Bakken2009-03-251-6/+9
| | | | | | | | | | | | | | | | | | | | | No need to go through the FillRectangles case which would allocate a bunch of T on the stack. Reviewed-by: Tom Cooksey
| * | Fix layout problem in QMainWindowThierry Bastian2009-03-251-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | QDockWidget's minimum title width was not computed correctly and was thus provoking some strange layout issues. We need to ask for the widget's sizeHint for the close and float buttons. Task-number: 241577 Reviewed-by: ogoffart
| * | Doc - removed a trailing whitespaceKavindra Devi Palaraja2009-03-251-1/+1
| | | | | | | | | | | | | | | Task-number: None Reviewed-by: TrustMe
| * | Doc - removed mention of an internal function. Also gave theKavindra Devi Palaraja2009-03-251-973/+918
| | | | | | | | | | | | | | | | | | | | | | | | QApplication class and the QSessionManager class a documentation overhaul. Task-number: 249220 Reviewed-by: TrustMe
| * | Fix assertion failure in QCompleter::setCompletionPrefix().jasplin2009-03-252-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling setCompletionPrefix() on a QCompleter from a slot connected to the editingFinished() signal of the corresponding QLineEdit could in some cases alter the internal state of the completer in such a way that an assertion would fail. The fix prevents the asserting code from being called in this particular state. Reviewed-by: janarve Task-number: 246056
| * | Fixed the gap that was not appearing on a QMainWindowThierry Bastian2009-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The default size of a docka area invalid and thus the gap had an invalid size. Task-number: 248069 Reviewed-by: ogoffart
| * | Fix a possible crash in QMainWindow when dragging a dock widget.Thierry Bastian2009-03-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Even when not animated, we need to set the plugging widget when plugging. This avoids a hover to be triggered in the middle of the operation. Task-number: 248069 Reviewed-by: ogoffart
| * | Fix QComboBox test with vertical panelsOlivier Goffart2009-03-251-1/+1
| | | | | | | | | | | | Reviewed-by: Thierry
| * | Changelog for fix e34a24dThiago Macieira2009-03-251-0/+2
| | |
| * | Add the placeholder file for Qt 4.5.1's changelogThiago Macieira2009-03-251-0/+123
| | |
| * | Fix crash while styling the title bar of a QMdiArea with stylesheetOlivier Goffart2009-03-251-1/+2
| | | | | | | | | | | | | | | | | | This stylesheet used to crash: *::title { border 1px solid black } Reviewed-by: bnilsen
| * | Fix a small mistake in recalculating the timeout in case we getThiago Macieira2009-03-251-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interrupted twice by a signal. If we're interrupted only once, there's no problem. If we're interrupted twice, we subtract the elapsed time since the beginning from the remaining time, so this won't work. The correct thing is to recalculate from the original timeout value. This is extremely difficult to test, since it requires that the select(2) call be interrupted twice by signals. The only way to do this is by sending two signals to a program from another program (or threads, with pthread_kill(3)) with less than half of the time left, then send data to cause the loop to exit with success. Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| * | Fix QSharedPointer crashing when it is used as a global static in an ↵Thiago Macieira2009-03-251-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | application. If it's used as a static, then the order of destruction is ill-defined. The QSharedPointer object may be destroyed after our Q_GLOBAL_STATIC knownPointers has been deleted, thus causing a null-pointer dereference. Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Task-number: 246843
| * | Fix scrollbar appearing on QComboBoxOlivier Goffart2009-03-252-6/+72
| | | | | | | | | | | | | | | | | | | | | aefadefae655972287b196e6c0f0563c4fb4666c was not good enough Task-number: 248094 Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>