summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Compile with namespaceJarek Kobus2009-04-151-0/+2
| | | | | Reviewed-by: hjk <qtc-committer@nokia.com> (cherry picked from commit a59488d4799f6ac9ea034c0a88a468e73a64d517)
* Fixes: WDestructiveClose flag and the new WindowCancelButtonHint have the ↵Thomas Hartmann2009-04-151-3/+3
| | | | | | | | | | same value -> crash on SetTitle() Task: 242484 RevBy: mauricek AutoTest: Details: Since we do not respect binary compatibility on Windows CE we just change the enum (cherry picked from commit c1c30037292711f0fb05677e77ed2eb2112eca78)
* Fix typo in documentation.Jason McDonald2009-04-151-1/+1
| | | | | | | Error was introduced in change 52f87de53328c661049acf09d5fedc1850aa9bfa. Reviewed-by: Trust Me (cherry picked from commit e3462ae7868c679bc88dc01de85ca39454651ff7)
* QGraphicsItem: When an item is deleted and eventfilters installedAlexis Menard2009-04-151-0/+19
| | | | | | | | | | | | | The problem here is that we are filling the sceneEventFilters map when we install evenfilter but we never remove the references of an item if it has been removed from the scene or deleted. The deletion can keep stale pointers into the map and a crash can happen. BT:yes Task-number:250272 Reviewed-by: bnilsen Reviewed-by: andreas (cherry picked from commit 0bb526f8fab33a42df56c8a60c272e2cca4cc792)
* Fixes the composition demo for Mac/Cocoa in GL mode.Trond Kjernaasen2009-04-151-6/+0
| | | | | | | | | | | | | QGLPixelBuffer::generateDynamicTexture() will bind the texture to the pbuffer regardless. Why this works on Carbon is a mystery, but if we're to follow our own docs, we should NOT bind the texture to the pbuffer by default. An explicit call to ::bindToDynamicTexture() is required for that. Task-number: 250664 Reviewed-by: Samuel BT: yes (cherry picked from commit e8877160e332d12958cf700a8a607c36e6c426e1)
* Don't remove the cache file if you have successfully added it.Thiago Macieira2009-04-151-1/+2
| | | | | | | | | | | | This regression probably happened because of the fix to task 244485 (see 8d500381), which made QFile follow a rename. This means that QTemporaryFile removes its target when it is deleted. This fixes a number of caching autotests that are failing. Reviewed-by: Markus Goetz BT: yes (cherry picked from commit 99ed68cda10355dba5c7a3e2466ee45b59dbb555)
* fix potential crashMaurice Kalinowski2009-04-151-1/+1
| | | | | | | | Reviewed-by: Thomas Hartmann need to check for valid menuBar, otherwise dereferencing will horribly fail. (cherry picked from commit f0ceef57b178d4ed71e61a6ce2681f3d401d69fe)
* Fix crash in QTreeViewOlivier Goffart2009-04-151-0/+1
| | | | | | | | Discovered in Kopete trunk BT: yes Reviewed-by: Thierry (cherry picked from commit 91aeceb7132f4afae0996443a162a5783d8f17aa)
* Update docs regarding sibling widgets ontop of QGLWidgets when Qt is builtTrond Kjernåsen2009-04-151-0/+4
| | | | | | | | | | | | | | with Cocoa support on Mac. The Cocoa API doesn't have a concept of Z-ordering of widgets, and it's implemented by reordering the widget hierarchy for normal widgets. This does unfortunately not work for GL widgets, and it's not supported by Apple. This apparently work with the Carbon AGL API though. Task-number: 244890 Reviewed-by: Gunnar Sletta BT: yes (cherry picked from commit eb87a7003153b190d8b635563868717b58ce2faf)
* Adding note about setting properties to QPrinterMorten Engvoldsen2009-04-151-0/+4
| | | | | | | | Setting properties on an invalid printer is not supported. Use isValid() to check if it valid. Rev-by: Trond Kjernåsen Rev-by: Geir Vattekar (cherry picked from commit 4db6f873386e7b21e23efb4a5ca31eb09f3dd94e)
* Remove scale applied to cosmetic pens when antialiasing is enabled (X11).Samuel Rødal2009-04-151-1/+4
| | | | | | | | | The pen width should not be scaled for cosmetic pens. Task-number: 247083 Reviewed-by: Trond BT: yes (cherry picked from commit c28cb85841fb5be154c2460efdc82dde012407b9)
* Fix docs of QPainter::initFrom.Gunnar Sletta2009-04-151-2/+2
| | | | (cherry picked from commit 52f87de53328c661049acf09d5fedc1850aa9bfa)
* Remove duplicate defines in the mac accessibility module.Morten Sørvig2009-04-151-122/+0
| | | | | | | This was causing compile warnings. Reviewed-by: nrc (cherry picked from commit 69414e5afeb87df2f7a371962f092c2d277aaf6f)
* BT: Compilefix for Windows CE and namespacesThomas Hartmann2009-04-091-4/+6
| | | | | | | RevBy: Mauricek Details: functions needs to be declared outside of the namespace (cherry picked from commit b273cd322345c54d5cbd6f178791d1ccfcc08e05)
* BT: Fix a painting glitch in gtk combo boxJens Bache-Wiig2009-04-091-0/+4
| | | | | | | | This improves the look of combo box with gtk style which is somewhat a regression from 4.5.0 since we did not style this part before. Reviewed-by: nrc (cherry picked from commit f2edb497ac2c3ff6f8c004046e216b8bdf7c4347)
* BT: Fix up comments in new Cocoa files.Jason McDonald2009-04-089-89/+133
| | | | | | | | | | | | | | | | | | It seems that Vim or Xcode or whatever I was using to paste these in messed up and added an extra space. Now we should be consistent with the .cpp files and I found a file that we missed too. (cherry picked from commit be3b8acbd311b9cbeaa7c87b4f34b2e33b4a7fa3) Conflicts: src/gui/kernel/qcocoaapplication_mac.mm src/gui/kernel/qcocoaapplicationdelegate_mac.mm src/gui/kernel/qcocoamenuloader_mac.mm src/gui/kernel/qcocoawindow_mac.mm src/gui/kernel/qcocoawindowdelegate_mac.mm src/gui/widgets/qcocoamenu_mac.mm src/gui/widgets/qmaccocoaviewcontainer_mac.mm src/gui/widgets/qmacnativewidget_mac.mm
* Javascript: When there is javascript running then it will spin the CPU at 100%Bradley T. Hughes2009-04-081-3/+12
| | | | | | | | | | | | | Zero timers on Windows would continue to fire even after being stopped as long as a new timer was started that reused the pointer address of the zero timer. Fix this by only re-firing zero timers if the zero timer hadn't been stopped (we can check this by looking at the inTimerEvent flag, which is set to false by registerTimer()). Task-number: 247401 Reviewed-by: Denis Dzyubenko Reviewed-by: Prasanth Ullattil (cherry picked from commit 74f092408d1a870e2c1e2a49182c8e09f952055d)
* BT: Fix infinite recursion potential from change acff913a6287ad50b0ac782Norwegian Rock Cat2009-04-081-4/+5
| | | | | | | | | It seems there is a potential for recursion because calling keyDown: can bubble up to the window which will start the process all over again. keyDown: will actually call qt_dispatchKeyEvent(), we may as well short it out here. All the previous cases I tried continue to work and we don't crash Creator if you are really impatient hitting keys. (cherry picked from commit c131208e59f5b2dd517b00c4539458760b8fd8aa)
* Revert "Bt: Fix regression in the Embedded dialogs example"Andreas Aardal Hanssen2009-04-081-13/+11
| | | | | | | | | | | | | | | | | | This reverts commit 35c26d696cbff269d551c012a212c09692dd6f6b. The change to QComboBox introduces a behavior change; whereas before the view container would always get its palette set as a response to QEvent::PaletteChange, it would now miss this event and rely on regular palette propagation to get the right contens. The difference in behavior is that QWidget::setPalette() also resolves the palette mask, and after 35c26d69 this would no longer happen. The bug in the embedded dialogs demo is caused by the embedded dialogs demo. See upcoming commit. Reviewed-by: Alexis Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com> (cherry picked from commit 3f3d09cf1511dde99797671a7bc848cdabc8d7fa)
* Replace license headers with 'release' versionsJason McDonald2009-04-082971-14905/+14905
| | | | | | This change was performed by a script that was written by the previous release manager and reviewed by me. Thus Reviewed-by: Trust Me
* Bt: Fix regression in the Embedded dialogs exampleJens Bache-Wiig2009-04-081-11/+13
| | | | | | | | | | | We had to revert an earlier fix since it obviously did not work correctly. However since we do not really need to propagate the palette on the viewContainer _before_ it is created, we can simply avoid the issue alltogether as it would happen because we implicitly added a child widget during the polish of the combo box. Reviewed-by: nrc (cherry picked from commit 35c26d696cbff269d551c012a212c09692dd6f6b)
* BT: Prevent a crash in Designer when quiting when in the filter edit.Norwegian Rock Cat2009-04-082-3/+6
| | | | | | | | | | | | | | Gah, my original change (f5ef0eb1a6543abdd29e07c23de7fa1128f6d623) had its heart in the right place, but it seems that it can cause crashes on closing where we refuse to give up the first responder and we end up with a dangling pointer. This lets that case happen (when we have no focus widget and are setting a nil first responder, there's no reason to stop that, but it refuses to do that when we do have a focus widget. Hopefully we don't get in a situation where our focus widget gets out of sync. Reviewed-by: Prasanth Ullattil (cherry picked from commit 773c4d326c24f8db12ab58e379bd223ce1126d72)
* fix tap-and-hold checkbox problem for Windows CEJoerg Bornemann2009-04-083-12/+11
| | | | | | | | | | | | | | | Symptom: checkboxes didn't get checked if you press, hold for some seconds and then release the mouse or stylus. In QAbstractButton we reacted on the contextMenuEvent that gets sent if the system recognizes the context menu gesture (tap and hold) and did call setDown(false). This change has been done because buttons in tool bars stayed in the down state when displaying the context menu with this gesture. I've now moved the handling of this to qtoolbar.cpp. Task-number: 246619 Reviewed-by: thartman (cherry picked from commit de007bd2a20a141aefe901408512c806879a2387)
* Drag cursor is not updated when modifier keys are pressed/released inPrasanth Ullattil2009-04-082-2/+6
| | | | | | | | | | the Cocoa Builds. The drag move events were compressed based only on the position of the cursor. It has to be based on both position and the "drag operation" in native event. Reviewed-by: nrc (cherry picked from commit ca2d62f97f991d042a781d9d7bd0dbda910e1d04)
* BT: QFileDialog: A folder with a name containing diacritic is disabled on ↵Richard Moe Gustavsen2009-04-081-1/+1
| | | | | | | | | | | | | Mac OS X - cocoa The filename as NSString that we get from Cocoa does not have the correct file system encoding. This means that certain characters are implemented differently than what e.g. QFile::encoded returns. This fix normalizes the string from cocoa before using it. Task-number: 249928 Reviewed-by: Trenton Schulz (cherry picked from commit 179fafcc370c907a6070c7150695d446255e68d1)
* BT: Send the keyevent after we send the shortcutoverride in menuNorwegian Rock Cat2009-04-081-0/+1
| | | | | | | | | | | | | | | | | | In our Cocoa menu we check if we need to send the key event to the qwidget before the menu has a chance at it, because logically in Qt, the key event should go to the widget and not the menubar first (a bit different than what happens on the mac). The way to determine this is to send a shortcut override event and see if it accepts it. If it does, that means we should just send it the key event. Previously we were sending the shortcut override, but not following through on the key event because we thought (however foolishly). That returning "YES" but not setting an action would somehow forward the event (it doesn't). There still seems to be some problems if you have a Dvorak-QWERTY+CWD layout, but this probably needs to be dealt with at the key mapper level. Reviewed-by: Prasanth Ullattil (cherry picked from commit acff913a6287ad50b0ac782d817d51072ccb479c)
* Adjust commentsNorwegian Rock Cat2009-04-081-33/+34
| | | | | Someone messed up the whitespace on this comment. (cherry picked from commit a6ab4f638a63755a601b61141fa7730d5ac6e793)
* BT: Compile without QT3SUPPORTJens Bache-Wiig2009-04-081-1/+1
| | | | | Reviewed-by: ogoffart (cherry picked from commit b9d6ecc1dbe5791fec6fb06de3be06186b485420)
* BT: Fix regression when tooltips dissappear suddenly in Unified toolbarNorwegian Rock Cat2009-04-073-2/+37
| | | | | | | | | | | | | | | | | | | | QWidget::childAt() makes some assumptions about its children (they are all contained in its geometry). This does not hold up when using the unified toolbar because the toolbar ends up in the "non-client" area. So, when dispatching an enter/leave event in tooltip show, we end up dispatching to the wrong widgets and that results in the tooltip cleverly thinking that it needs to hide itself because we've left the widget that needs the tooltip. I've special cased this by just having a "native" mapFromParent() that is only called for on the mac, though there is nothing that is limiting this from being called on other platfroms. Also QWidget::mapFromParent() probably needs to be looked at at some point. Task-number: 248048 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 640f2c732c6fd76866cd7e601a9140dbe7849e6f)
* Works around a crash in q3richtext.Gunnar Sletta2009-04-071-1/+2
| | | | | | | | Full fix will potentially break other code and is thus avoided Task-number: 248992 Reviewed-by: Trond (cherry picked from commit e0560bcaa3703fafccc21dd709731341a123a0e4)
* BT: Fixed treeview painting regression on VistaJens Bache-Wiig2009-04-071-6/+14
| | | | | | | | | | | | The old code did not split up the frame from the central parts of the itemview selection box correctly. We now draw the edges as border images instead. Previously this would lead to somewhat ugly scaling artifacts for small header sections. Task: 248839 Reviewed-by: ogoffart (cherry picked from commit 041a8ecdb5f11dfc499f8f8f77d85cb63508c093)
* Removed usage of NaN in SVG gradients.Kim Motoyoshi Kalland2009-04-072-3/+5
| | | | | | | | | | The previous change 6c2dd295b2ca2f9125fe072d035a3784ce748718 to remove usage of NaN in SVG gradients was incomplete. This commit should fix that. Task-number: 250146 Reviewed-by: Samuel (cherry picked from commit 003223dcfc1fa884b82085db19d4c4056bf6eaa0)
* Update WebKit from code.staikos.net/srv/git/webkitTor Arne Vestbø2009-04-0712-1657/+744
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using branch origin/qtwebkit-4.5 (f72c14123c593dc9d649d25b7186334bba0026b5) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-04-06 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed by Simon Hausmann. [Qt] Don't show and hide the platformPluginWidget, as it's our QWebView * plugins/mac/PluginViewMac.cpp: (WebCore::PluginView::show): (WebCore::PluginView::hide): (WebCore::PluginView::setParentVisible): 2009-04-06 Mike Belshe <mike@belshe.com> Reviewed by Eric Seidel. HTMLCanvasElement crash when ImageBuffer creation fails. https://bugs.webkit.org/show_bug.cgi?id=23212 Check for NULL before using the ImageBuffer as we might be low on memory and creation may have failed. Test case creation blocked by: https://bugs.webkit.org/show_bug.cgi?id=25055 * html/HTMLCanvasElement.cpp: (WebCore::HTMLCanvasElement::createImageBuffer): 2009-04-05 Erik L. Bunce <elbunce@xendom.com> Reviewed by Simon Hausmann. https://bugs.webkit.org/show_bug.cgi?id=25050 Fix an assert failure when dropping an 'empty' text/uri-list on a QWebView. * platform/qt/DragDataQt.cpp: (WebCore::DragData::asURL): ++ b/WebKitTools/ChangeLog 2009-03-31 Adam Roben <aroben@apple.com> Make resolve-ChangeLogs -f work when the working tree has spaces in its path Reviewed by Mark Rowe and David Kilzer. * Scripts/resolve-ChangeLogs: (sub fixMergedChangeLogs): Quote the path to resolve-ChangeLogs in case it contains spaces. 2009-03-17 David Kilzer <ddkilzer@apple.com> resolve-ChangeLogs should not die on unmerged non-ChangeLog files Reviewed by Adam Roben. Fixes the following bug in resolve-ChangeLogs: Use of uninitialized value in -e at ./WebKitTools/Scripts/resolve-ChangeLogs line 132. Died at ./WebKitTools/Scripts/resolve-ChangeLogs line 164. * Scripts/resolve-ChangeLogs: (findUnmergedChangeLogs): Check the result of findChangeLog() to make sure we don't add undef values to the list of files being returned. 2009-03-11 David Kilzer <ddkilzer@apple.com> Bug 24378: resolve-ChangeLogs should use git status or svn status to find and fix unmerged ChangeLogs <https://bugs.webkit.org/show_bug.cgi?id=24378> Reviewed by Adam Roben. * Scripts/resolve-ChangeLogs: If -f|--fix-merged is not passed and no file or directory names are specified on the command-line then try to find unmerged ChangeLog files based on 'svn stat' or 'git diff'. Added global $isGit and $isSVN variables so that isGit() and isSVN() only have to be called once. (findUnmergedChangeLogs): Added. (cherry picked from commit 1d3706f2b66ba5fbb586e532fc29852f55d81c86)
* BT: Fix combobox background color regressionJens Bache-Wiig2009-04-072-9/+5
| | | | | | | | | | There was a regression in the background color for QComboBox popups. This should resolve it. It essentially tells the system to stay off the system palette while QGtkStyle is used. We will introduce a cleaner style hint for this in 4.6. Reviewed-by: nrc (cherry picked from commit f06c4f2d7378b40a0a184393a8986032d5a700ee)
* Doc - Mentioned what the default filters are forKavindra Devi Palaraja2009-04-071-1/+4
| | | | | | | | QFileSystemModel::filter(). Task-number: 250285 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com> (cherry picked from commit cf65dea821a2ba796bb1f32c80de6b9db224dff5)
* Doc - Clarified that button style on X11 platforms may depend on theKavindra Devi Palaraja2009-04-071-1/+2
| | | | | | | | desktop environment. Task-number: 250338 Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com> (cherry picked from commit 38b5bff2fab59e965aba59b4f121a7c8945e4d75)
* BT: Fix a crash when running a widget window modal when it has no parentNorwegian Rock Cat2009-04-061-7/+5
| | | | | | | | | We changed the logic for determining sheets, but it seems we forgot to take the parentWidget() into account. It's required for WindowModality to make any sense. Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 1e32cdefa382b16eaffc663594ccab1dbe1faebb)
* QThread::start(): priority has no effect on Linux systemsBradley T. Hughes2009-04-061-0/+12
| | | | | | | | | | The default scheduling policy on Linux doesn't allow specifying thread priorities, so the priority passed to start() and setPriority() has no effect. Document this. Task number: 249997 Reviewed-by: Kavindra Devi Palaraja <kavindra.palaraja@nokia.com> (cherry picked from commit 638b61dec0d335b12d48fe561b19a0f0f6ef83a3)
* Fix up color matching on 64-bit Cocoa.Norwegian Rock Cat2009-04-061-7/+38
| | | | | | | | | | | | | | | | | It seems that GetThemeTextColor is not available at all for 64-bit versions of the operating system and there is no good equivalent. We were using a technique where we would create a small pixmap and then use HIThemeSetTextFillColor() with the proper enum. However, this function will silently set a black color if it doesn't know about the enum. So, we get black when we really shouldn't. It also seems to produce colors that are a bit different from the Carbon function. So, in the meantime, just hard code the values in. It might break if you are hacking the resources in Mac OS X, but we'll have to live with that until we get a real function. Task-number: 248918 Reviewed-by: Prasanth Ullattil (cherry picked from commit c350892f55a1d8633be54f09e6e4596f4687bc89)
* Add some timing capabilitiesAnders Bakken2009-04-043-1/+26
| | | | | | | Add some frames-per-second output for debugging when QT_DIRECTFB_TIMING is defined. Reviewed-by: Donald <qt-info@nokia.com>
* QScreen::flush() no longer draws the titlebarAnders Bakken2009-04-041-5/+0
| | | | | | We don't need to chain to the base class anymore. Reviewed-by: Donald <qt-info@nokia.com>
* Silence warning and beautify codeAnders Bakken2009-04-032-24/+13
| | | | | | | Even though these variables couldn't really be used uninitialized GCC 4.3.2 thinks it could. This is nicer, more readable and faster anyway. Reviewed-by: Donald <qt-info@nokia.com>
* QGtkStyle: Fix styling and palette issues related to combo boxJens Bache-Wiig2009-04-035-39/+89
| | | | | | | | | | | | | | | | | | | | | | Well actually this change is a bit bigger than just that. *We no longer override the palette you provide in polish so it should be a bit more frienly toward custom application changes. * Another issue was that we would generate the palette information when we got the style callback from gtkButton but then the line edits might not yet have been polished. Hence we now return from the callback and instead post the update for later. * We had to modify the PE_Frame entry to draw a raised menu when the custom combo box delegate was used. * We now simply ignore custom qtconfig palette entries when using GtkStyle since they only cause trouble with it. Task-number: 250142 Reviewed-by: nrc
* Fixes crash in QTreeView with QSortFilterProxyModelOlivier Goffart2009-04-031-0/+1
| | | | | | | | | If we get an hover event while the model gets invalidated, we might ends up calling itemDecorationAt before the viewitem is refreshed. Can be reproduced in KTorrent (Relates to KDE bug 172198) or Kopete trunk Reviewed-by: Thierry
* Do not loose WindowType flags when setting translucent background in X11Olivier Goffart2009-04-031-1/+1
| | | | | | | | This fixes KRunner on XMonad. The Qt::Dialog flag of the krunner dialog was lost when the Qt::WA_TranslucentBackground was set, leading to incorrect behaviour in some window manager (such as xmonad) Reviewed-by: Samuel
* Fix a crash in QFileDialog with a proxy on it.Alexis Menard2009-04-032-22/+44
| | | | | | | | | | | | The main problem is that enterDirectory received a QModelIndex that can be a proxy index and not a source index if there is a proxy set on the QFileDialog. This fix basically discover some other crashes in the completer. The problem was that we didn't apply the proxy to the completer too. So we basically messed up source and proxy indexes. Both have a proxy set now and convert the model indexes if needed. Task-number:250194 Reviewed-by:jasplin
* BT: Compilation on WinCE.Trond Kjernåsen2009-04-031-1/+1
| | | | Reviewed-by: Kim
* Use the standard 'type name = value' variable declaration for PODThiago Macieira2009-04-031-1/+1
| | | | | | | | | | | | types. C++ is nice, but we don't have to use confusing syntax when plain old C works (and is correct). This apparently fixes a compilation error on MSVC 6, that doesn't like the constructor-like initialisation for POD types. Reviewed-by: Trust Me BT: yes
* Removed usage of NaN in SVG gradients.Kim Motoyoshi Kalland2009-04-033-15/+21
| | | | | | | | | | | | | | Since there is no way to find out if gradient stops have been added to a gradient, a gradient stop at NaN was earlier used in the SVG module to mark the gradient as empty. This could cause floating point exceptions. The usage of NaN has now been replaced by a boolean in QSvgGradientStyle. Duplicate entry "qxmlpatterns" was removed from auto.pro in the auto test directory. Task-number: 250146 Reviewed-by: Samuel
* Fix focus policy propagation bug in QCompleter.jasplin2009-04-031-0/+7
| | | | | | | | | | | | | | | Commit 4a00810cc394b7da99ddb2d13eb045352ede25d3 ensures that setting the focus policy of a widget applies to its proxy (if any) as well. This propagation effect is however unfortunate for a QCompleter in PopupCompletion mode. The client widget (typically a QLineEdit or a QTextEdit) acts as the focus proxy to the popup menu. Internally, the completer sets the focus policy of the popup menu to NoFocus, but this should not affect the focus policy of the editor. Reviewed-by: janarve Task-number: 250064