summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Autotest: Fixed a race condition in the network self test.Thiago Macieira2009-06-071-6/+0
| | | | | | | | | | | Some of the tests (including the httpsServer one) requested that the server close the connection (Connection: close). It could happen that, well, the server did close the connection and we noticed it while doing the waitForBytesWritten in the doSocketFlush function. Then we'd create an error in the next step because the socket wasn't connected. Reviewed-by: TrustMe (cherry picked from commit 95ceabf52d79b922a87f7c023c9606e633ab1ea2)
* Doc - cleaned up a sentence to improve clarityKavindra Devi Palaraja2009-06-071-1/+1
| | | | | Reviewed-By: TrustMe (cherry picked from commit 6fff92a31c4acd270d0ecb4cda336ba098801ffb)
* My changelog for 4.5.2Alexis Menard2009-06-071-0/+11
| | | | (cherry picked from commit cdb0222129a139dfe1b7e4fb4b401556989901b4)
* Make sure to retain alpha information in copyAnders Bakken2009-06-071-3/+4
| | | | | | | We need to set alpha to the right value when copying pixmaps. Reviewed-by: Donald <qt-info@nokia.com> (cherry picked from commit f7338759ef86deba18b27ee72b3afcf40f3a5aaf)
* my public task ...Oswald Buddenhagen2009-06-071-0/+3
| | | | (cherry picked from commit 398c022e8adefc6e71a6048da40c19f6169be831)
* Add my changelog for 4.5.2Thiago Macieira2009-06-071-0/+9
| | | | (cherry picked from commit 5ad68ce1cb5e80fa14e549f087e957030ef4baf0)
* Document the proper signals that the ::open() convenience connects to.Norwegian Rock Cat2009-06-074-6/+15
| | | | | | | We were saying that it connected to accepted it all these cases, but it actually is doing some nice magic that makes sense assuming you document it. (cherry picked from commit df5c557e7777c8844ac866d730346178ad33a0a6)
* Document that textVisible is optional when it comes to styles.Norwegian Rock Cat2009-06-071-0/+2
| | | | | | | | | No progress bars on the mac show text and it would be bad if we allowed it. There's nothing stopping people from connecting the valueChanged() signal to a slot and have a real label layed out correctly that actually updates with the amount of time it takes to complete, etc. This is more what they do on Mac OS X if they decide to show a label. (cherry picked from commit c755c1d3c6fe60a9018308e1ce13bae6821bc214)
* BT: Fixes Crash when deleting a QProgressBar which has been styled with ↵Olivier Goffart2009-06-073-3/+25
| | | | | | | | | | | | QMotifStyle Same fix as in e9a7e43031d7c1ee712e43be682c4e2c183759c4 but with motif Reported by https://bugs.kde.org/show_bug.cgi?id=193911 Task-number: 255138 Reviewed-by: jbache (cherry picked from commit cbe3119db5380c41d44d4e936c7da4889c02f147)
* Silence compile warning in the testAndy2009-06-071-2/+2
| | | | | Reviewed-by: TrustMe (cherry picked from commit 289c098c15a359c4e5d142a997230db5df554f8d)
* More changes for 4.5.2João Abecasis2009-06-041-0/+1
| | | | (cherry picked from commit 8021218dd5ab2d7ad9314b1c2a54168de4694065)
* My changes for 4.5.2João Abecasis2009-06-041-0/+17
| | | | (cherry picked from commit ff8dd08c1ec66905a271c528b18c1e6738d2da77)
* BT: Fix a crash in the SDI example in CocoaNorwegian Rock Cat2009-06-041-15/+37
| | | | | | | | | | | | | | | | | | | | | | | This was quite a bug and it showed to some issues that I hadn't taken into account when doing the initial port to Cocoa. The issue was that we weren't "merging" items into the application menu if an item had already been associated with it. Which seems OK for applications that create one window with one menubar, but breaks down horrible when you have multiple windows with each having their own menubar. The result is that items in the application menu potentially go to the wrong window (and the potential crash). Since there can only ever be one "Quit", "About", or "Preferences" menu item in Cocoa, we need to make sure that we keep these items in sync whenever we switch the menubar or remove actions that are being deleted. That's what we do here. FWIW, QActions with "ApplicationSpecificRole" for their menu role have potential to cause memory leaks or other bugs if abused. If you are a happy open source hacker who wants a thankless job, solving them would get you lots of goodwill in my book. Task-number: 255038 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 826b2ec2067e725561db2892dd432c01f1d36bc7)
* Fixed raster bug causing fully clipped images to be partially blended.Samuel Rødal2009-06-042-2/+28
| | | | | | | | | | | | The blend functions assume the width / height of the images being blended to be greater than 0. A width of 0 caused the first iteration of a duff's device memcpy (QT_MEMCPY_USHORT) to be executed, thus blending 8 pixels instead of none. BT: yes Task-number: 255014 Reviewed-by: Trond (cherry picked from commit 91f5c7314afdfd43c867266fc1bc418e0f70bac7)
* Doc - some sentence clean upsKavindra Devi Palaraja2009-06-041-7/+7
| | | | | Reviewed-by: TrustMe (cherry picked from commit d16b52d5346a3b652ad7507b24373c51fc0d530c)
* BT: qt demo takes 100% of the cpu on X11Olivier Goffart2009-06-042-12/+3
| | | | | | | | | | | | | | | The tick timer is always active, even if the moving gree Qt logo is not visible. But the code that is supposed to pause it when the app loose the focus doesn't works if the moving Qt logo is not visible. Also the call to syncX makes Xorg takes lot of cpu. It doesn't fix the fact that the timer is still running while the green logo is not visible, but at least doesn't take the cpu anymore if qtdemo loose the focus. Task-number: 255020 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 259b65c2f5d736dd7f6d81b6390f54464dd5f183)
* Doc - minor fixes to beautify the sentenceKavindra Devi Palaraja2009-06-041-2/+2
| | | | | Reviewed-By: TrustMe (cherry picked from commit ae5b1555676cef4058157431c3af2e7ff9ead8ce)
* Add a note about what happens when passing 0 to qobject_cast in the docAndy Shaw2009-06-041-1/+2
| | | | | Reviewed-by: Kavindra Palaraja (cherry picked from commit 716e2105dce4487baa32a4e11b69f1d394515a86)
* Doc - fixed a typoKavindra Devi Palaraja2009-06-041-1/+1
| | | | | Reviewed-By: TrustMe (cherry picked from commit 10b1e68d07746fde5ec6d6d2fc3f46fb803a2462)
* _networktest compile fixJoerg Bornemann2009-06-041-1/+1
| | | | | Reviewed-by: mauricek (cherry picked from commit b469fd9aac5c0e4a87ea1a9be254b566c0353702)
* Avoid a crash when setting a focus in a widget hierarchy containingDenis Dzyubenko2009-06-031-2/+3
| | | | | | | | | | | | | both visible and invisible widgets. This is a quick hack to avoid a crash in Qt when setting a focus on a visible widget that has invisible parent. Proper fix was committed into master 1a7da7096bbda17197738061902f4489af234bc0, see it's description for more details. Task-number: 254563 Reviewed-by: Thierry Bastian (cherry picked from commit a5b11b9031f9a2a97b65e9a6134244249845491a)
* Fixed build issues with MSVCThierry Bastian2009-06-032-8/+22
| | | | | | | | | | | in atomic operations, we declare Interlock... functions in the namespace That can confuse the compiler because they are also declared in another header outside the namespace. Same problem in clucene where we include windows.h from within the NS. Task-number: 254214 Reviewed-by: ogoffart (cherry picked from commit 7bc17b5b9ff9f2e3e04f36fec8ccbb546d9b7a31)
* Update my changelog for 4.5.2Olivier Goffart2009-06-031-0/+39
| | | | (cherry picked from commit e8c6c0cf4d341572e4740940590b0301d208d239)
* my changes for 4.5.2Joerg Bornemann2009-06-031-0/+1
| | | | (cherry picked from commit d69f28f00fe7efda12f9bb236ecd6a0de39232e4)
* missing deployment rule added to examples/richtext/textobjectJoerg Bornemann2009-06-031-0/+4
| | | | | | | | The example SVG must be deployed on Windows CE devices to be used. Reviewed-by: mauricek BT: yes (cherry picked from commit 0068bd9279b5f7a12f00ffea66cb264930f88138)
* BT: Remove duplicate code and fix font parsing.Norwegian Rock Cat2009-06-032-9/+2
| | | | | | | | | | | | QFont has a feature that you can pass a comma-separated list and it will walk through the list and match the font that it hits first. There's a nice static function that X11 and Windows uses, but the Mac was using an older copied version of it. This old version didn't handle quoting which is what happens in the style sheet. So, using the same code makes everything work well. As a bonus, Creator looks correct again. Reviewed-by: Simon Hausmann (cherry picked from commit ad46e77420449ede2cb6c1ea2a810a2614520db9)
* My Changelog for 4.5.2Peter Hartmann2009-06-031-0/+10
| | | | (cherry picked from commit 4ae7a683217eb2a7e9fc2fe2ed173e7da277038b)
* Changelog for 4.5.2Denis Dzyubenko2009-06-031-0/+5
| | | | (cherry picked from commit 9dc7a011e798c24b4dd8b19a74b42c61f52a1328)
* Doc - changing the "main layout" term to "top level widget's layout" toKavindra Devi Palaraja2009-06-032-7/+12
| | | | | | | | preserve some consistency. Also added a screenshot of the Object Insepector displaying a form where its widget has no top level layout. Reviewed-By: TrustMe (cherry picked from commit 9b53bb583ca7e74c737683d85593e4a97107a777)
* BT: Fixed crash on Mac caused by erroneous handling of native focus events.jasplin2009-06-031-1/+4
| | | | | | | | | | | | | | | | On Mac, a widget with a NoFocus policy could still get focus (if only temporarily) as the result of a native focus event. In particular, a line edit with a completer should not lose focus (if only for a brief moment) as a result of the completer popup being shown. This will for example cause an item delegate to think that the user has navigated away from the cell and delete the line edit as a result. This will in turn cause the completer to access a null pointer. Reviewed-by: Richard Moe Gustavsen Task-number: 254456 and 254460 (cherry picked from commit 7314c07a3e443b1d5349b419a03db8d41ca43f7e)
* My 4.5.2 changes for the changelog.Samuel Rødal2009-06-031-1/+25
| | | | (cherry picked from commit 8f16a4f1638fd661e74c6aa60822cd9ef17e5003)
* My changes for Qt 4.5.2.Norwegian Rock Cat2009-06-031-0/+18
| | | | | Better late than never. (cherry picked from commit 5dca661dc78d8eb0489e7debf342a0869ae75a43)
* Don't support porter duff |= source overAnders Bakken2009-05-311-96/+24
| | | | | | | | | DirectFB and Qt treats these things rather differently so the mapping just doesn't work very well. Only use DirectFB for SourceOver stuff (which is the default mode anyway) Reviewed-by: Donald <qt-info@nokia.com> (cherry picked from commit 5f1ec2a20d13b9ca9bae1b7b40692925dcd99051)
* Remove all force raster on RGB32 stuffAnders Bakken2009-05-314-75/+32
| | | | | | | | | | Previously we allowed RGB32 but forced fallbacks for all drawing operations. It turns out blitting operations doesn't work right either so we'll rather just disallow this format altogether. See also 36ae58e7a6a888d3ae7bd162d59daada550bbfb1 Reviewed-by: Donald <qt-info@nokia.com> (cherry picked from commit 36bc35c451b6123b0e237430343a80db8a600b24)
* Remove unused variable.Alexis Menard2009-05-311-1/+0
| | | | (cherry picked from commit 28305c37a1874be6919c316be03fff2aaf3d94cb)
* Fixed a crash in the GL 2 paintengine when drawing text.Trond Kjernåsen2009-05-291-0/+3
| | | | | | | | | The new glyph cache may return null images for e.g. space characters. Task-number: 253468 Reviewed-by: Samuel BT: yes (cherry picked from commit 13815a0768236982a025833497d3e2a2f3b6acf6)
* New configure.exe binaryMarius Storm-Olsen2009-05-291-0/+0
| | | | | | | Task-number: 254451 Reviewed-by: trustme BT: yes (cherry picked from commit 87acb1722d9db66aa01d238b6e4ac90dfe095ff0)
* Only display the choice of license if we can find the filesMarius Storm-Olsen2009-05-291-20/+23
| | | | | | | Task-number: 254451 Reviewed-by: eskil BT: yes (cherry picked from commit e08f3e7bf3dbae6036ab89248793b98330971269)
* Doc - marked QFileDialog::setOption() with the since 4.5 tag.Kavindra Devi Palaraja2009-05-291-2/+3
| | | | | | Task-number: 254549 Reviewed-by: TrustMe (cherry picked from commit f67bc13bc8e2d2c76d7d9f12abb1dbda85abe337)
* Changes for DirectFBAnders Bakken2009-05-291-0/+20
| | | | | Reviewed-by: TrustMe (cherry picked from commit 2a986b86f841b798cc754fe5c5390c6fee95ce71)
* Fix a ASSERT/Crash when adding two times the same QAction to a QGW.Alexis Menard2009-05-292-2/+20
| | | | | | | | | | We were adding two times in the QActionPrivate list the entry for the current QGraphicsWidget if the action was existing before. Task-number:KDE Reviewed-by:bnilsen BT:yes (cherry picked from commit 4a82680736ace8abb46e6fb5e085e8622f154b2d)
* Fix wrong sorting when using the QFileSystemModel with QTreeViewAlexis Menard2009-05-294-4/+80
| | | | | | | | | | | | | | | | An optimization was made to the sorting of QFileDialog to sort only the current root (meaning what the user see). This avoided slowness when the model was big with lots of leafs. The problem here is for the treeview, the root is always the same, we expands only nodes. In that case, a recursive sorting is needed to ensure that all expanded nodes are correctly sorted (and filtered). This will be slower that's why i use an hidden flag in the d pointer to deactivate the recursive sort for the QFileDialog. Task-number:254701 Reviewed-by:olivier BT:yes (cherry picked from commit 8e4300e2866fd28881853509df6ff054e13f841b)
* Minor cleanup.Trond Kjernåsen2009-05-291-4/+4
| | | | | Reviewed-by: Kim (cherry picked from commit 8e2d3cc2e84b6d8109c30a853ea40ff9cfa29bcc)
* BT: Support saving forms with resources more than once in Qt JambiEskil Abrahamsen Blomfeldt2009-05-291-12/+22
| | | | | | | | | | | | | | | | | | When a form is loaded, Designer will set the path to the resource as an absolute path rather than the path actually stored in the file. There is code to work around this to make file paths relative when saving the file later on, but no work around for Qt Jambi. So when saving Qt Jambi forms, you would get an absolute path to the resource which contains the location of the resource file (.jar or on disk) This of course breaks the concept of resources, as the .jui file was no longer portable. The fix is to special case Qt Jambi resources and set the relative path when loading them. The patch has no effect on regular Designer. Task-number: 254621 Reviewed-by: Kai Koehne (cherry picked from commit 8ed5931925b4e8ed8f098b5c36e1378f95d7d25a)
* support for -ltcg configure switch for Windows CE buildsJoerg Bornemann2009-05-292-2/+6
| | | | | | | | | | Additionally we turn -ltcg on by default on Windows CE. See commit 56191830 for details. Reviewed-by: mauricek BT: yes (cherry picked from commit b2a1e5938e1abf45d70cbfa7ec1ab0c21c01911d)
* BT: aboutQt dialog is too big.Denis Dzyubenko2009-05-291-1/+1
| | | | | | | | | | | Make use of setInformativeText in qmessagebox for aboutQt dialog for now. Proper fix might be to add scrollable widget to the dialog, or split the about info into several pieces, though it cannot be done in a patch release. Task-number: 254464 Reviewed-by: Trenton Schulz (cherry picked from commit abed949f0de16c94a146a965a13b38493cde6671)
* Doc - final screenshot and changesKavindra Devi Palaraja2009-05-292-11/+8
| | | | (cherry picked from commit 695e49acfb34ffb5b61fddbd6afff9f1281e8299)
* Fixed: Setting a border using stylesheet for QComboBox adds an unwated frame.Olivier Goffart2009-05-282-6/+11
| | | | | | | | | | | | | | | | | | | | This was already fix. But there was still a frame if there was a stylesheet on the applicaiton. The reason is that the frame's constructor call the style for some hints. And later the combobox will query the style again for the frame hint, before the view get polished. The problem is that the StyleSheetStyle will fill the css cache with wrong information on the first call. This is not visible if there is no stylesheet as in the constructor, the widget style is still the default application stylesheet if there is no global applicaiton stylesheet. Task-number: 254589 Reviewed-by: jbache BT: (cherry picked from commit d0bc0a26f8ac4c2f02819c262b8aa7c3dd1cad3b)
* Fixed aliasing pointer corruption in QDataStream.Trond Kjernaasen2009-05-271-15/+77
| | | | | | | | | | | | Use a union instead of an unsafe cast when swapping the bytes in the QDataStream streaming operators. The old seems to cause problems with Link Time Code Generation optimizations with the MSVC compilers. Task-number: 247708 Reviewed-by: Samuel Reviewed-by: Thiago BT: yes (cherry picked from commit 2c1b11f2192fd48da01a1093a7cb4a848de43c8a)
* QFileDialog selection bug when calling it multiple times.Alexis Menard2009-05-272-5/+39
| | | | | | | | | The problem was that we don't clear the selection model if the previous selection was valid. Task-number:251341 Reviewed-by:jasplin (cherry picked from commit 8bf5a6986db852525582713cc2f2a760df4fdc60)