summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-05-1226-82/+73
|\ | | | | | | | | | | | | softkeys Conflicts: src/gui/widgets/qmenu_symbian.cpp
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicIain2009-05-1125-77/+105
| |\
| | * Fix for disappearing options menu button when starting some ofMarkku Luukkainen2009-05-111-1/+1
| | | | | | | | | | | | the example applications
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicMarkku Luukkainen2009-05-1125-57/+68
| | |\
| | | * Make QLineEdit care about autoSipEnabled.axis2009-05-111-2/+2
| | | | | | | | | | | | | | | | If the property is disabled, it will not ask for an input panel.
| | | * Make autoSipOnMouseFocus non-static.axis2009-05-111-3/+2
| | | | | | | | | | | | | | | | This way we are consistent with autoSipEnabled.
| | | * Small doc update.axis2009-05-111-0/+2
| | | |
| | | * Make autoSipEnabled available on all platforms.axis2009-05-113-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | This is relevant on S60 too, so it's time to make it cross platform. RevBy: mauricek
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-05-111-21/+38
| | | |\
| | | * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-05-111000-19513/+46778
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/widgets/qmenu_symbian.cpp
| | | * | | Fixed namespace issues, now works on Symbian under namespaceJanne Koskinen2009-05-1122-44/+53
| | | | | |
| | * | | | Changed implementation to use QMultiHash instead of QHash.Markku Luukkainen2009-05-111-2/+2
| | | |_|/ | | |/| | | | | | | | | | | | Fixes a bug when setting a new menubar to QMainWindow
| | * | | Refactored implementation so that it works with multiple QMainWindowsMarkku Luukkainen2009-05-111-21/+38
| | | |/ | | |/|
| * | | A better way of getting the screen's colour depthIain2009-05-111-21/+2
| |/ /
* | | Refactored implementation so that it works with multiple QMainWindowsMarkku Luukkainen2009-05-111-21/+38
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Markku Luukkainen2009-05-11169-1041/+2230
|\ \ \ | |/ / | | | | | | softkeys
| * | S60Style: Facelift for panels. It now uses settings page frame graphics sans ↵Sami Merilä2009-05-113-48/+59
| | | | | | | | | | | | center piece instead of multicolored lines (aka windows95 look). The new frame is drawn slightly smaller than generic frames to ensure that the background shines through between frame border and widgets.
| * | Enable symbol visibility when compiling with RVCT.axis2009-05-112-3/+3
| | | | | | | | | | | | | | | This takes advantage of new functionality in RVCT 2.2, and requires build 671 beta or later.
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-11149-737/+1540
| |\ \ | | | | | | | | | | | | | | | | Conflicts: tests/auto/qtemporaryfile/qtemporaryfile.pro
| | * | Fixes qt3support unit tests generating compile failures when Qt is notRohan McGovern2009-05-1153-9/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configured with qt3support. The build system knows when qt3support was turned off, so let's just skip these tests in that case. That makes more sense than individually configuring each autotest machine to skip these tests when the configuration is known to turn off qt3support, which is what's done previously. Reviewed-by: Lincoln Ramsay
| | * | Prevented asynchronous access to non-thread safe libfontconfig API.Samuel Rødal2009-05-081-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to protect calls to FcCharSetHasChar with the font database mutex. Task-number: 241361 Reviewed-by: Simon Hausmann
| | * | Fixing hellogl_es2 for Windows CEThomas Hartmann2009-05-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | We hardcode the lib names for 4.5 Reviewed-by: Maurice
| | * | macx-g++42 spec linker was gcc instead of gcc-4.2João Abecasis2009-05-083-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better alternative to 9ffcf3737901c49acb1a1bc6b65572d195d78a5d Task-number: 253052 Reviewed-by: Norwegian Rock Cat Reviewed-by: MortenS
| | * | QDataStream: Small doc errorMarkus Goetz2009-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: 253179 Reviewed-by: TrustMe
| | * | Fixes a crash in QPrinterDialog with relative filenamesJoão Abecasis2009-05-083-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's better to set the sourceModel in the constructor for QFSCompletor, as requiring that it be set separately is error prone. Surprisingly, the printer dialog crash only appears to happen when using relative filenames. Task-number: 253135 Reviewed-by: alexis
| | * | Fix QCompleter with UnfilteredPopupCompletionJoão Abecasis2009-05-082-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes regression introduced in a794ded85f74516239a08cf848e6b4f8b6dcac6a. When using UnfilteredPopupCompletion the matchCount is always zero and completion was being skipped. By adding the check for showAll we still avoid the assert but retain correct behavior. Task-number: 253125 Reviewed-by: jasplin
| | * | Fix leak of file descriptors in QTemporaryFileJoão Abecasis2009-05-083-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using setFileName in QFile::copy (introduced recently) has a nasty side-effect of leaking file descriptors in QTemporaryFile. This happens because the code assumes the file has been closed. In QTemporaryFile, we need to explicitly call native file engine close. Test case by Thiago. Bug report from Arora developers. Reviewed-by: thiago
| | * | compile?Harald Fernengel2009-05-081-1/+1
| | | |
| | * | Added further explanation on the note about stdin and QTextsStream::atEnd()Morten Engvoldsen2009-05-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Explained why you cannot use stdin and atEnd() together. Task-number:251171 Rev-by: Andreas Aardal Hanssen
| | * | Fix reentrency of the QCSS engine.Olivier Goffart2009-05-081-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextDocument which is suposed to be reentrant may use the CSS Parser in different threads. The way the indexOfId was computed is not thread safe. Insert the pre-computed value instead Reviewed-by: Thierry
| | * | Fix reentrancy of QVector and QStringOlivier Goffart2009-05-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The d->capacity could be modified even if ref was more than 1 Reviewed-by: Marius Storm-Olsen
| | * | Fixes QDir not reentrantOlivier Goffart2009-05-081-29/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt_cmp_si_sort_flags could be read and written from different threads. Use qStableSort with functor instead of libc's quicksort. Found with helgrind on kdevelop Reviewed-by: Marius Storm-Olsen
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-084-8/+9
| | |\ \
| | | * | Correcting typoMorten Engvoldsen2009-05-081-2/+0
| | | | | | | | | | | | | | | | | | | | Removing linebreaks in the document
| | | * | Revert "Added comment to QTextStream - clarification of the documentation"Morten Engvoldsen2009-05-081-2/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit da1416cef6b1d24156739ded101df895ee4e80d9.
| | | * | Fixed a problem with QPrinter::NativeFormat printers not being valid.Trond Kjernåsen2009-05-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's obvious that not only PDF and PS printers are valid.. Task-number: related to 252873 Reviewed-by: Samuel
| | | * | Make the g++-42 mkspec use gcc-4.2 for linking as well.Morten Sørvig2009-05-081-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgot to override the linker, causing it to use gcc 4.0. Reviewed-by: Richard Moe Gustavsen
| | * | | qdoc: Moved platform-specific qdoc comments to common .cpp file.Martin Smith2009-05-082-13/+14
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building docs for the mac, qdoc comments for functions defined in the .h file were not found in any of the .cpp files in the mac package because they were in the x11 or windows .cpp file. So I moved them to a .cpp file that is in all the packages. Task-number: 252496 252492
| | * | Fixes QIBASE driver crashes on multiple execution of a prepared queryBill King2009-05-072-7/+18
| | | | | | | | | | | | | | | | Task-number: 246808
| | * | Fixed a problem that caused QPrintDialog to invalidate QPrinter.Trond Kjernåsen2009-05-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When passing a printer that is set up to print to a PDF file into QPrintDialog, the print dialog could invalidate the printer and not update the validity of it in a proper manner. Task-number: 252873 Reviewed-by: Samuel
| | * | Whitespace fixAnders Bakken2009-05-071-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | Compiler warnings (Mac/Carbon)Bjoern Erik Nilsen2009-05-079-15/+10
| | | | | | | | | | | | | | | | Reviewed-by: nrc
| | * | Added types to the list.Morten Engvoldsen2009-05-071-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Added two missing types to the list. Task-number: 252274
| | * | handle the back soft key on Windows mobile SmartPhonesJoerg Bornemann2009-05-072-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must tell the system that we want to intercept the back key on Windows mobile. Each toplevel widget that needs correct back key behaviour needs to have a menu bar. Why? Ask Microsoft... Task-number: 248846 Reviewed-by: thartman
| | * | Make the error dialogs less annoying. Show only one instead of many.kh2009-05-071-11/+37
| | | |
| | * | Fixed some inconsistencies for image drawing on non-integer coords.Samuel Rødal2009-05-073-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix for 1x1 source rect image drawing in change ffbb3c1a2aee4134dce80cd144a26bf32865b698 was incorrect for transforms with type >= TxScale. The aliased coordinate delta needs to be applied in device coordinates, not in logical coordinates. Also specialize the non-antialiased TxScale case by simply calling fillRect_normalized directly, avoiding having to scan convert the rectangle manually. Task-number: 251561 Reviewed-by: Trond
| | * | fix parsing cookies in multiple linesPeter Hartmann2009-05-072-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | original patch by Benjamin Meyer. Handle multiple cookies split by new lines in a cleaner way. Parsing the combined string was error prone. Splitting them and sending each line through our header parser is more robust, and has more obvious code paths. Tested by logging into wordpress.com, facebook.com etc. Reviewed-by: Thiago Task-number: 251959
| | * | Win: QLineEdit not updating correctly when embedded in Graphics ViewBjoern Erik Nilsen2009-05-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates triggered by the line edit itself, i.e. cursor blinking, are not processed after the top-level is resized. This is yet another problem caused by the event dispatcher on Windows (Qt posted events are not sent during top-level resize, task 146849). We added a work-around for that particular case by posting an event via Windows, but the widget is not visible on the screen (hidden from Windows' POV) so it'll never be posted. And of course then we'll never receive it and the backing store is not synced. This work-around is therefore useless for widgets that are not visible on the screen. However, not receiving update requests while resizing the top-level (in this case QGraphicsView), is not a problem for embedded widgets because all items and hence the proxied widgets are repainted by graphics view anyways. Task-number: 252400 Reviewed-by: Olivier
| | * | qdoc: Moved platform-specific qdoc comments to common .cpp file.Martin Smith2009-05-078-343/+379
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building docs for the mac, qdoc comments for functions defined in the .h file were not found in any of the .cpp files in the mac package because they were in the x11 or windows .cpp file. So I moved them to a .cpp file that is in all the packages. Task-number: 252496 252492
| | * | Ensure that small and mini spin boxes are drawn correctly.Norwegian Rock Cat2009-05-071-39/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we fixed the stuff for normal spin boxes, we neglected to tweak the small and mini variants. We now adjust pixels for them as well. Task-number: 252301 Reviewed-by: Jens Bache-Wiig