summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Work in progress example placeholders.David Boddie2009-11-2514-0/+388
| | | | Reviewed-by: Trust Me
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-245-18/+83
|\
| * Fix softkeys for QDialogButtonBoxes created without a parent.Jason Barron2009-11-242-16/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | Inthe case where a QDialogButtonBox was created without a parent, for example in the FTP example, the softkeys that are automatically created inside the button box were not being added to the right widget when the button box was given a parent (or added to a layout) later. This patch resolves that issue by handling the ParentChange event and then adding the softkeys at this point. Task-number: QTBUG-6086 Reviewed-by: axis
| * Added some missing build instructions for abld.axis2009-11-242-0/+11
| | | | | | | | | | | | WebKit will not build unless the mentioned variable is set. RevBy: Aleksandar Sasha Babic
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Dean Dettman2009-11-2412-11/+121
| |\
| * | Docs : Add details to QMdiArea::removeSubWindow()Dean Dettman2009-11-241-2/+4
| | | | | | | | | | | | | | | | | | | | | Clarifying that the behaviour is different depending on what is passed in. Reviewed-by: Morten Engvoldsen
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-11-24150-658/+1510
|\ \ \
| * | | tst_qtcpserver: Increased timeoutMarkus Goetz2009-11-241-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | tst_qftp: Increased some more timeoutsMarkus Goetz2009-11-241-4/+5
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | tst_qhttp: Increase timeoutMarkus Goetz2009-11-241-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | We don't need to initialize multitouch in non-gui applications.Denis Dzyubenko2009-11-241-1/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme Patch-by: raipriha
| * | | Incorrect background while composing Japanese text(e.g 'shi' + <space>).Prasanth Ullattil2009-11-241-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens only when there is a single japanese character entered & the suggested text is same as the one already displayed. In this case, black background was not drawn correctly. Reviewed-by: Simon Hausmann Reviewed-by: axis
| * | | tst_qftp: Increase timeout in the abort() test.Markus Goetz2009-11-241-1/+4
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | Softkeys: Text disappears from textbox when predictive text is active.Samuel Nevala2009-11-242-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If two QInputMethodEvent("preedittext", attributes) or more are send in a row, textedit is drawn empty. Event creates lines based on isGettingInput flag and clears line every time there is preedit text. On 2nd event lines are cleared but not created since e->preeditString() != cursor.block().layout()->preeditAreaText() set isGettingInput to zero. When draw begins line count is checked. If no lines return. Moved layout->setPreeditArea() under if (isGettingInput) so pre-edit text is set only when text really changes. http://bugreports.qt.nokia.com/browse/QTBUG-4696 Task-number:QTBUG-4696 Reviewed-by:Markku Luukkainen Merge-request: 2132 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| * | | Few of the QEXPECT_FAIL messages were enriched by the Jira's task numberJedrzej Nowacki2009-11-241-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | All the QEXPECT_FAIL messages should contain Jira's task number. Reviewed-by: TrustMe
| * | | Fixes implicit grabbing in Qt/CocoaDenis Dzyubenko2009-11-242-30/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When delivering mouse events in Qt/Cocoa set the implicit mouse grabber and deliver the event to it and do not try to propagate the event to the parent view. Reviewed-by: Prasanth
| * | | QLineEdit fix for macDenis Dzyubenko2009-11-241-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the Mac Up/Down arrow keys move the cursor to the beginning/end of the lineedit. The fix is to make sure the corresponding keyevent will be accepted by the QLineEdit and not propagated to parent widgets (resulting in a beep). Reviewed-by: Prasanth
| * | | tst_qftp: Test upload with 1MB instead of not-at-all on SymbianMarkus Goetz2009-11-241-2/+3
| | | | | | | | | | | | | | | | Reviewed-by: Aleksandar Sasha Babic <aleksandar.babic@nokia.com>
| * | | tst_qnetworkreply: Stabilize test by increasing timeoutMarkus Goetz2009-11-241-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | Maximizing a window makes it a bit smaller that the minimum size:CocoaPrasanth Ullattil2009-11-241-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When returning preferred sizes for the frame, we should consider the size for non client area elements like frame, tittlebar etc. Task-number: 6090 Reviewed-by: Denis
| * | | QNetworkCookieJar: don't do path checking when receiving cookiesPeter Hartmann2009-11-242-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually, the RFC 2109 says cookies should not be stored if the path attribute is not a prefix of the request URI the cookie comes from. However, all browsers allow it anyway; with the demo browser e.g. logging in to wordpress.com was not possible. We still do path checking when sending cookies, i.e. in QNetworkCookieJar::cookiesForUrl(). Reviewed-by: Markus Goetz Task-number: QTBUG-5815
| * | | Fix accept call in q3processMarkus Goetz2009-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use QT_SOCKLEN_T like we do on all other places where accept() is called. Task-number: QTBUG-6141 Reviewed-by: mstormo
| * | | Fix QWindowsSystemProxy::initMarkus Goetz2009-11-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like WinHttpGetIEProxyConfigForCurrentUser can return more than one proxy even if this is not documented. Task-number: QTBUG-5981 Reviewed-by: Peter Hartmann
| * | | Namespace build fails for webkit exampleRichard Moe Gustavsen2009-11-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Forward declarations outside namespace scope will fail in this case. Reviewed-by: brad
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-2422-20/+211
| |\ \ \ | | | |/ | | |/|
| | * | Merge commit '4ea54f03174778a4efdcb802f9179b6e1d17fd88' of oslo-staging-1 ↵Simon Hausmann2009-11-243-1/+12
| | |\ \ | | | | | | | | | | | | | | | into 4.6
| | * | | Compile fix for win32-icc.Jan-Arve Sæther2009-11-241-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Intel Compiler inlined the destructor of QObjectPrivate too agressively, causing it to generate a call to ~QObjectData for QtGui. ~QObjectData is not exported from QtCore, so it failed linking. Task-number: QTBUG-5145 Reviewed-by: Alexis Menard (cherry picked from commit db5e4496229a776768464d1d3d2e1f8e81bd6ba0)
| | * | | Don't crash in eval() function when QtScript debugger is attachedKent Hansen2009-11-242-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The built-in eval() function bypasses the script registration performed by QScriptEngine::evaluate(), so if we get an atStatement() callback from JSC from that script, the scriptID-to-sourceProvider lookup will fail. In this case, just return from atStatement() without delivering the positionChange() callback to the QScriptEngineAgent, since the agent will not have received the scriptLoad() callback for that script anyway. This is a change in behavior from 4.5, but we consider it the minimum-impact fix at this point to keep 4.6.0 from crashing. The only downside is that debugging will effectively be "disabled" for the script passed to eval(), but that's a lot better than crashing. Task-number: QTBUG-6108 Reviewed-by: Jedrzej Nowacki (cherry picked from commit 23002374d11598b26b6585e78dc073071a13f0ec)
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-11-2349-235/+748
| | |\ \ \
| | | * | | Fix background rendering for read-only comboboxes on Maemo5Robert Griebl2009-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: jbache
| | | * | | updates french phrasebookPierre Rossi2009-11-231-0/+36
| | | | | |
| | | * | | A few tweaks to the frozen column examplePierre Rossi2009-11-233-2/+11
| | | | |/ | | | |/| | | | | | | | | | | Reviewed-By: Thierry
| | | * | Merge remote branch 'origin/4.6' into 4.6-ceninerider2009-11-2342-230/+693
| | | |\ \
| | | | * \ Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-2314-12/+135
| | | | |\ \
| | | | | * | Support semi-transparent surfaces in the OpenVG graphics systemRhys Weatherley2009-11-223-3/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2026 Reviewed-by: Jason Barron
| | | | | * | Fixes painting issues when scaling a QGraphicsView.Yoann Lopes2009-11-202-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that the 'exposed rectangle' passed to the Item's paint() function was rounded to Int values, whereas the one passed to drawBackground and drawForeground was not. Autotest included. Task-number: QTBUG-5859 Reviewed-by: bnilsen
| | | | | * | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-2071-430/+630
| | | | | |\ \
| | | | | * | | Revert "Do not extend the last toolbar in a line when moving it"Thierry Bastian2009-11-202-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make a real fix for the problem is defaulting to sizehint when there is no preferred size set (ie the toolbar hasn't been moved) This reverts commit a2c247ed521d88f99a21b4207cdff8ea03e949be.
| | | | | * | | Do not extend the last toolbar in a line when moving itThierry Bastian2009-11-202-5/+7
| | | | | | | |
| | | | | * | | Q_ASSERT failure when resizing a span to (1,1) in 1st cellGabriel de Dietrich2009-11-202-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Task-number: QTBUG-6004
| | | | | * | | Fixed antialiasing in the GL based QGraphicsView demos under X11.Trond Kjernåsen2009-11-201-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the examples/demos that used a QGraphicsView with a QGLWidget as a viewport, that had multisampling enabled, was broken after 7b61fbf03e170a7da37d5f57ed4053aae719ec7f. This is because the reparented QGLWidget will be forced to use the parent widget's visual, which in this case does not contain any multisample buffers. The QX11Info structure for QGLWidget is put together based on the QGLFormat that is passed into the QGLWidget constructor and will in most cases always be different from the parent widget visual. Task-number: QTBUG-5998 and QTBUG-6003 Reviewed-by: Eskil
| | | | | * | | avoid possible crash when showing a modal dialog from a widget destructorThierry Bastian2009-11-202-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5804 Reviewed-by: denis
| | | | | * | | Fix for tabwidget usesScrollButton being overriden by stylesheetOlivier Goffart2009-11-203-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting a stylesheet or reparenting a widget into a widget using style sheet would cause the usesScrollButtons to be reset. Instead we now keep the flag whenever it has been explicitly set by the user rather than querying from the style again. Task-number: QTBUG-3370 Reviewed-by: jbache
| | | * | | | | WinCE: only use native menu bars for windows mobileninerider2009-11-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows CE the native menubar must not be used. The corresponding flag was never set for Windows CE. Task-number: QT-2530 Reviewed-by: Maurice
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6Bill King2009-11-231-5/+13
| | |\ \ \ \ \ \
| | | * | | | | | Handle errors and data truncation in QMYSQLResult::fetchNext()Derick Hawcroft2009-11-231-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add additional error handling Task-number:QTBUG-5758 Reviewed-by: trustme
| | | * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Derick Hawcroft2009-11-23350-2679/+2987
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-11-2249-159/+472
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-11-20314-2528/+2523
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Bill King2009-11-18494-6231/+20216
| | |\ \ \ \ \ \ \ \
generated by cgit v0.12 at 2024-12-12 06:44:03 (GMT)