summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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)
* Doc: Updated the list of tools to include makeqpf and qvfb.David Boddie2009-05-273-8/+9
| | | | | Reviewed-by: Marcel Schuette (cherry picked from commit f61056a556259c12a6de23f12756e45737345111)
* Doc - more images and additional descriptionKavindra Devi Palaraja2009-05-276-11/+13
| | | | (cherry picked from commit 1164e61393349fc3d6bf06d0789fa6ea2cfb5909)
* BT: Fixed GL textdrawing in the Boxes demo.Trond Kjernaasen2009-05-272-5/+9
| | | | | | | | | | | | | Reworked the 85f98acaa3a38079071bea711e43c9a86edec1f6 fix, since it broke glyph positioning in the GL engine under Windows. Instead of changing the glyph cache margin, which impacts where the glyph is positioned, we just make the image the glyph is drawn into 4 pixels bigger in width/heigth. The margin in QImageTextureGlyphCache needs to be reworked.. Task-number: 254450 Reviewed-by: Eskil (cherry picked from commit 871b730da203cef773e159960532888522f16a0b)
* Correcting bugs in classic.cssMorten Engvoldsen2009-05-271-4/+4
| | | | | | | Correcting invalid padding values. none is not a valid padding value. Rev-by: David Boddie (cherry picked from commit 8a2ca9b0d8ed23cec44e40f61c0f4983fbc55282)
* BT: opening datetimepicker in a cell in spreadsheet demo resets the dateOlivier Goffart2009-05-271-3/+3
| | | | | | | That was a bug in the exemple. Reviewed-by: Kavindra Palaraja (cherry picked from commit 2c8348f5ccf62be31479dcd78282395a98eed76f)
* Doc - whitespace cleaningKavindra Devi Palaraja2009-05-271-24/+24
| | | | (cherry picked from commit aec18b0eea741da58a02f7ad95ab5ee9dccfce6c)
* Doc - more screenshots and better descriptionKavindra Devi Palaraja2009-05-274-23/+12
| | | | (cherry picked from commit c37c8370e4897d2e6191df2d1ccde43830ffb8d0)
* Doc - more screenshots and adding better descriptionKavindra Devi Palaraja2009-05-273-13/+15
| | | | | Details: Work in progress (cherry picked from commit 72ecfb3eb9b65ed2617942510fa0c9af5075f209)
* Clearifying QWebFrame docsMorten Engvoldsen2009-05-271-2/+3
| | | | | | | | | | | Adding docs to toHtml() and toPlainText() Task-number: 253088 Rev-by: Ariya Hidayat Rev-by: David Boddie (cherry picked from commit 54f92419b23b425e32ad573db17f608a67936df1)
* Fix a crash in Phonon::EffectWidgetJens Bache-Wiig2009-05-261-1/+2
| | | | | | | | | | | When creating a UI based on double types we only assigned the control pointer in certain cases. This would crash because the tooltip did not check for the pointer, but the real issue was that we didnt assign the control in the first place. Task-number: 249710 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 3037e466ebf21aa4a47a722a1e2ff497690cbef5)
* Doc: Removed irrelevant links from the Qt for Windows CE documentation.David Boddie2009-05-261-2/+0
| | | | | Reviewed-by: Maurice Kalinowski (cherry picked from commit 337ffb38e35ca43e4119ac0634499b226137692e)
* qdoc: Indicate what iterator_categor means for container classes.Martin Smith2009-05-263-8/+13
| | | | | Task-number: 245501 (cherry picked from commit 57df8bc3ddd2bc5aaf5c25cf3e311fe56ad50ffb)
* BT: Google suggest example not launching from the Qt Demo app.Trond Kjernåsen2009-05-261-2/+2
| | | | | | | | The example was installed in the wrong directory. Task-number: 254452 Reviewed-by: Kim (cherry picked from commit 86598234d8c055fe8dbc474d292619d453cc9f56)
* Fixed: QSortFilterProxyModel setDynamicSortFilter doesn't works when setting ↵Olivier Goffart2009-05-265-6/+48
| | | | | | | | | | | | | | | | the model initially This was caused by two different bug: - In the QSortFilterProxyModel, we need to re-sort when setting the source model change the sorting column (happen when setting a model initially) - In the treeview, we need to activate the sorting even if there is no column yet (because the initial model is empty Task-number: 254234 Reviewed-by: Thierry BT: (cherry picked from commit 2a390bb481a2433a239a9198e463c9337a26db59)
* qdoc: Indicate that qAbs(T& v) compares v to a 0 of type T.Martin Smith2009-05-262-12/+38
| | | | | Task-number: 246789 (cherry picked from commit e7a607f0f1f7837a26bf95248504497b0534e357)
* fix double slash prepending causing troubles on WinCEMaurice Kalinowski2009-05-261-6/+12
| | | | | | | | | | Before adding a / to the path one should check if it doesn't end with one already. Otherwise one might get paths like //My Documents on WinCE causing the native call to crash the filesystem service on that system. Reviewed-by: alexis (cherry picked from commit 5839b16a73c36ff7636c13f841d26e6a5e0c5435)
* BT:Fix access of deleted memory with a static QCursor.Michael Goddard2009-05-261-1/+3
| | | | | | | | | | If a QCursor with a predefined shape is declared static, it could be destroyed after the application dtor has already cleaned up QCursor memory. Task-number: 254467 Reviewed-by: Rhys Weatherley (cherry picked from commit 682b854872c26d7408d79131217825fb8ddace6a)
* Doc: Clarified what close(), abort() and disconnectFromHost() really doDavid Boddie2009-05-261-10/+18
| | | | | | | | | | | | to the socket connection. (Reviewed - see below.) Also included corrections to the description of how to send SocketError and SocketState values via signals. (Trust me - as part of an earlier revision of the custom types documentation.) Task-number: 222907 Reviewed-by: Andy Shaw (cherry picked from commit a4ca38bab521e1f0095b9c90c4623ca9d41d219b)
* Doc: Removed the incorrect figures for Thumb builds of libraries.David Boddie2009-05-261-2/+0
| | | | | | | | We need to resolve the issues around the use of Thumb code in Qt and automate the building and comparison of libraries. Reviewed-by: Trust Me (cherry picked from commit bbefe9e67366151e2286a2ff6bee0d1009b2a12c)
* Doc: Fixed custom graphics item snippet.David Boddie2009-05-261-1/+1
| | | | | | | | As reported on qt-interest: http://lists.trolltech.com/pipermail/qt-interest/2009-May/007036.html Reviewed-by: Trust Me (cherry picked from commit 23820c30052ea23ecf2226c300fc4819dd294306)
* Doc: Miscellaneous documentation fixes for Qt 4.5.x and later.David Boddie2009-05-265-14/+12
| | | | | Reviewed-by: Trust Me (cherry picked from commit 8b34bd541c6aa201c4d872210228bce8217a5e03)
View Lorry Controller Status