summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Nils Christian Roscher-Nielsen2009-11-255-3/+41
|\ | | | | | | staging-4.6
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2009-11-255-3/+41
| | | | | | | | ( 27984c8c8d021a6bff604da57520959d420a642c )
* | Checks for len = 0 in QIconvCodec::convertFromUnicodeNils Christian Roscher-Nielsen2009-11-251-2/+2
|/ | | | | | | | | iconv hangs when len is initially 0 on some Solaris platforms. This can be seen in the standarddialogs example when calling QFileDialog::getOpenFileName() for instance. Reviewed-by: ddenis Task-number: QTBUG-4976
* Fixed key handling in the documentation index widgetDenis Dzyubenko2009-11-251-3/+7
| | | | | | | | On Mac up/down arrow keys move the cursor to the beginning/end of the lineedit, however if the lineedit is used to control the indexwidget in assistant, we need to prevent it to get those events and move the text cursor. Reviewed-by: kh
* Use a pixmap instead of an image in the tablet exampleBenjamin Poulain2009-11-253-32/+32
| | | | | | | | The transformations QImage->QPixmap are killing the performance of the tablet example. This is noticeable because of the number of events sent by the tablet (painting MUST be fast in tabletEvent()). Reviewed-by: David Boddie
* Fix crash of QtWebKit on any page with Flash when compiled witn MinGW.Jocelyn Turcotte2009-11-251-2/+2
| | | | | | | Early push of this fix which should be overwritten by the fix upstreamed in WebKit trunk later. Reviewed-by: Simon Hausmann
* Optimize QFSFileEnginePrivate::canonicalized() by using realpath()Markus Goetz2009-11-251-0/+12
| | | | | | | | In our benchmark, this makes QFileInfo.canonical*Path() up to 50% faster. This should also improve application startup time. Let's see if it works on all Unices and Symbian. Reviewed-by: mariusSO
* Introduce QFileInfo benchmarkMarkus Goetz2009-11-253-0/+94
| | | | | | Right now only a benchmark for the canonicalized path. Reviewed-by: TrustMe
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2009-11-2525-294/+445
|\
| * Mac: deleting a menu item might clear items in other menusRichard Moe Gustavsen2009-11-251-6/+4
| | | | | | | | | | | | | | | | The reson is that some menu items are reused across all menu bars. So we need to check that a menu actually still owns the item before clearing or hiding its data. Reviewed-by: Prasanth
| * Cocoa: 'Quit' in menu bar does not workRichard Moe Gustavsen2009-11-252-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | If you have two window, each with its own menu bar that has a 'Quit' action, we reuse the quit menu item when switching between the windows. Now, it we deleteLater one of the menu bars, the new menubar will update the 'Quit' item just before deleteLater will come along and remote the update again. This patch will fix this. Task-number: QTBUG-4684 Reviewed-by: Prasanth
| * Compile for 64-bit WindowsBradley T. Hughes2009-11-251-1/+6
| | | | | | | | | | | | | | | | The integral type should be a 64-bit integer, not long (which is only 32-bit even when building 64-bit). Reviewed-by: Prasanth Ullattil Task-number: QTBUG-6079
| * Fix Broadcast receiver example.Jedrzej Nowacki2009-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | The broadcast receiver should share the port number. In most cases users won't run the example on a network, but only on one machine. In the case it simply should work too. According to our documentation the fix is platform specific, it will work only on Linux. Reviewed-by: Peter Hartmann
| * Fix the tablet device recognition on WindowsBenjamin Poulain2009-11-251-84/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unique ID was not taking into account the bits 4, 5, 6, 7 of CSR_TYPE. Those bytes identify similar devices with different flavor/color. The cursor data were also not updated correctly. The information were only updated if the pointer type changes (e.g.: pen to eraser) but not if the physical device change (e.g. stylus to brush). The information are now updated every time a proximity event has a new unique ID. Reviewed-by: Denis Dzyubenko Task-number: QTBUG-1930
| * On Windows Flash is played only while moving mouse inside the plugin.Prasanth Ullattil2009-11-251-1/+1
| | | | | | | | | | | | | | Qt is using the same window message as Flash plugin. We need to check the window handle before we treat this as Qt internal message. Reviewed-by: Bradley T. Hughes
| * QXmlStream: regenerate header after grammar changePeter Hartmann2009-11-251-161/+162
| | | | | | | | | | | | | | | | the grammar file src/corelib/xml/qxmlstream.g has been changed in the previous commit, this commit regenerates the file src/corelib/xml/qxmlstream_p.h . Reviewed-by: TrustMe
| * QXmlStream: Fix parsing of DTDs that contain empty markup declarationsJakub Wieczorek2009-11-253-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | like e.g. <!DOCTYPE doc []> According to the specification, it is possible for a doctype to contain no markup declarations: http://www.w3.org/TR/xml/#sec-prolog-dtd "intSubset ::= (markupdecl | DeclSep)*" However, currently QXmlStreamReader would raise an error when encountering such a declaration. Merge-request: 1926 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
| * Network auto tests: Some timeout increasesMarkus Goetz2009-11-255-8/+8
| | | | | | | | Reviewed-by: TrustMe
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-258-28/+93
| |\
| | * Merge commit '0d20ec8604b318ceafd6c35dfe1d73519bf024d3' of oslo-staging-1 ↵Simon Hausmann2009-11-2520-53/+156
| | |\ | | | | | | | | | | | | into 4.6
| | * | Fixes implicit grabbing in Qt/CocoaDenis Dzyubenko2009-11-252-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 (cherry picked from commit aae81f370f6afede95064bc75eb7ee6ac13b1c30)
| | * | Fix QFile::map in Linux 64bitOlivier Goffart2009-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On 64bit, qint64(size_t(-1)) = -1 Reviewed-by: Joao Reviewed-by: Thiago (cherry picked from commit 829d9e10ad3d26fb2fddef01c8e36352018c3fec)
| | * | Fix links to docs in INSTALL and READMEJason McDonald2009-11-252-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The names of the doc directories on the doc site don't include the patch version number. Task-number: QTBUG-6043 Reviewed-by: Trust Me
| * | | Small performance improvement: don't match the bus path.Thiago Macieira2009-11-241-3/+2
| | | | | | | | | | | | | | | | | | | | We trust the bus, so no need to match per path. The sender and the interface should be enough for us.
| * | | Doc: Update the documentation for the serviceOwnerChanged signal.Thiago Macieira2009-11-241-0/+6
| | | | | | | | | | | | | | | | | | | | Add the note that this signal will cause many activations and that QDBusServiceWatcher is better.
| * | | Fix the detection of when this process gets names on the bus.Thiago Macieira2009-11-243-12/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we were relying on NameOwnerChanged to notify us of our own names. This worked because we got all NameOwnerChanged that happened on the bus. Now, we only get those we're interested in. Instead of watching for newOwner==baseService, let's just use the NameAcquired and NameLost signals, that the D-Bus server sends to us anyway. Task-number: QTBUG-5979
| * | | Revert "Disable the deprecation warning for this signal since we're using it ↵Thiago Macieira2009-11-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | now" This reverts commit f01c631f84f9373b06d0572bfed7a4e8213a46a7.
| * | | Revert "Revert "Stop using the NameOwnerChanged signal without arg0 in ↵Thiago Macieira2009-11-241-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtDBus itself"" This reverts commit db1cff73726ff12d50139769dc8071f9e9173261. Task-number: QTBUG-5979
| * | | The functionEntryAndExit_builtin autotest was enriched by a new dataset.Jedrzej Nowacki2009-11-241-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new dataset was created. In the function we shouldn't test only one data type. In the same time a new Jira's task were created (QTBUG-6187) as a result of the XFail investigation. Reviewed-by: TrustMe
* | | | Doc: Added the required legal notices.David Boddie2009-11-252-1/+534
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | 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
generated by cgit v0.12 at 2024-11-12 09:22:24 (GMT)