summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rename qIsFuzzyNull to qFuzzyIsNullBjoern Erik Nilsen2009-04-0823-112/+112
| | | | | | | | | | The function was added in fde7f3d03782c801901f511131458d6fcb1021a5 and we believe qFuzzyIsNull is a better naming and more in line with qFuzzyCompare. Reviewed-by: Lars Knoll Reviewed-by: nrc Reviewed-by: Samuel
* Use qIsFuzzyNull rather than the more expensive qFuzzyCompareBjoern Erik Nilsen2009-04-0818-93/+92
| | | | | | | See also fde7f3d03782c801901f511131458d6fcb1021a5 Reviewed-by: Olivier Reviewed-by: Samuel
* Merge branch 'no-math3d-fixed'Rhys Weatherley2009-04-0828-2953/+391
|\
| * Remove fixed-point support from math3dRhys Weatherley2009-04-0828-2953/+391
| | | | | | | | | | | | | | | | | | The main use case for fixed-point support is to build large arrays of vertices. This can be handled using qvertextype or something similar at higher levels. So it isn't worth risking numerical instability in the core classes. Reviewed-by: trustme
* | The QT_NO_SHAREDMEMORY define was checked a bit too lateRobert Griebl2009-04-071-4/+3
| | | | | | | | Reviewed-By: Harald Fernengel
* | Disable mouse tracking in QGraphicsView if possible.Bjoern Erik Nilsen2009-04-076-3/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need mouse tracking unless there are items in the scene that either accept hover events or have a cursor set. This cut-off is extremely efficient in the common case since all items ignore hover events and use the standard cursor by default. We no longer dig for items and do lots of intersection and calculating just for fun :-) We even get rid of the overhead of 2 x QCoreApplication::sendEvent! The next step is to optimize the items(*) functions to simply check for hasCursor()/acceptsHoverEvents() before we do complex checks like intersects/collidesWithPath() etc. Auto test included. Reviewed-by: Andreas
* | Use qIsFuzzyNull rather than qFuzzyCompareBjoern Erik Nilsen2009-04-073-7/+7
| | | | | | | | | | qIsFuzzyNull is much cheaper than qFuzzyCompare, and in this case qIsFuzzyNull will do the trick.
* | Optimise QMatrix and QTransformLars Knoll2009-04-074-89/+220
| | | | | | | | | | | | Add some private inline constructors and do inlining other places. All test still pass.
* | Add an internal qIsFuzzyNull(double) methodLars Knoll2009-04-071-0/+16
| | | | | | | | | | | | The method can help to avoid many calls to the rather expensive qFuzzyCompare in the cases where we compare a number against 0 or 1.
* | Optimize QGraphicsItem::map(To|From)Parent(const QPainterPath)Bjoern Erik Nilsen2009-04-071-4/+6
| | | | | | | | | | | | | | | | Now that we have QPainterPath::translate, we can use that instead of itemTransform()/map(To|From)Scene, which lowers the number of QTransform operations involved. Reviewd-by: Andreas
* | Add -qconfig support for non QWS builds.Robert Griebl2009-04-071-7/+8
| | | | | | | | | | | | | | There are customers using X11 on embedded systems, so make it possible to use -qconfig for those builds too. Reviewed-by: Paul Olav Tvete
* | Added copyright headers for the new QWS keymap handling filesRobert Griebl2009-04-077-584/+149
| | | | | | | | | | | | | | Also removed the old obsolete qkbpc101_qws files. Somehow this removal got lost in the rebase before the keyboard handler refactoring commit. Reviewed-by: TrustMe
* | compile fix with namespaceshjk2009-04-071-3/+3
| |
* | Wrong merge after 6e13559503040963c28dd8f5b6881e3a2b9d5596.Bjoern Erik Nilsen2009-04-071-8/+8
| | | | | | | | | | | | | | | | | | Do not update the cache's exposed list if the entire cache is already exposed. Makes tst_QGraphicsItem::cacheMode pass again. Reviewed-by: Andreas
* | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-0781-3555/+3856
|\ \ | |/ |/| | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/painting/qtransform.cpp
| * qmake: additional compiler options were written twice into vcproj filesJoerg Bornemann2009-04-071-2/+0
| | | | | | | | | | | | | | | | In the function initCompilerTool we handled QMAKE_CXXFLAGS twice for every configuration (debug / release). The call of parseOptions before the if clause is enough. Reviewed-by: mariusSO
| * make shadow builds with default moc/ui dirs work againOswald Buddenhagen2009-04-073-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | append the source dir to the include path, but only after the dirs with the generated files. this seems to have worked before only accidentally: the unqualified default dirs were expanded to the source dir instead of the build dir, but the build dir is added implicitly by default, so things magically worked. now that we qualify the moc/ui dirs, projects relying on the strange side effect suddenly break. we should probably add the source dir to the include path by default, but this coupling to uic/moc is closer to the historical behavior and thus should be safer. Reviewed-by: mariusSO
| * fix QMAKE_VAR_FIRST_ expansion in compiler flagsOswald Buddenhagen2009-04-071-1/+1
| | | | | | | | | | doesn't seem to be a terribly popular feature, given that nobody noticed this yet ...
| * BT: Compile without QT3SUPPORTJens Bache-Wiig2009-04-071-1/+1
| | | | | | | | Reviewed-by: ogoffart
| * QLocalSocket will disconnect 30 seconds after a successful delayed connectBradley T. Hughes2009-04-072-13/+16
| | | | | | | | | | | | | | | | | | | | When the connection is established, the socket notifier is deleted, but not the connection timer, so the opened connection will be closed after 30 seconds. Task-number: none Reviewed-by: Andreas Reviewed-by: Thiago
| * Compile.Norwegian Rock Cat2009-04-071-1/+1
| | | | | | | | | | | | Looks like a typo. Reviewed-by: Bradley T. Hughes
| * 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
| * Adds a few \warnings to the docs on do-not-use-for-performance-reasonsGunnar Sletta2009-04-074-5/+43
| | | | | | | | Reviewed-by: Trond
| * 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
| * Fixes: Calling repaint() during a top-level resizeGunnar Sletta2009-04-071-10/+14
| | | | | | | | | | | | | | | | | | RevBy: bnilsen Task: 249394 Details: When going through the backingstore a repaint in a toplevel resize should just discard the repaint() as it will repaint shortly after anyway. This is in line with the implementation of update().
| * Fixes: Make drawPixmap as fast as drawImage on rasterRGunnar Sletta2009-04-072-34/+68
| | | | | | | | | | | | RevBy: Samuel Details: The IMAGE_FROM_PIXMAP has to be doing a local copy or something, because it is sure not fast...
| * Fixes: Make drawPixmap slightly more optimal for QPaintEngineExGunnar Sletta2009-04-071-3/+6
| | | | | | | | RevBy: Samuel
| * Kill some warningsAnders Bakken2009-04-071-0/+6
| | | | | | | | Reviewed-by: TrustMe
| * Approriate warning with incompatible optionsAnders Bakken2009-04-071-0/+4
| | | | | | | | | | | | QT_NO_DIRECTFB_LAYER doesn't work unless QT_NO_DIRECTFB_WM also is defined. Reviewed-by: TrustMe
| * Code cleanup.Anders Bakken2009-04-072-9/+9
| | | | | | | | | | | | QDirectFBPaintDevice's know their screen. No need to use instance() in these cases. Reviewed-by: TrustMe
| * Call ReleaseSource where appropriateAnders Bakken2009-04-073-2/+5
| | | | | | | | | | | | | | | | DirectFB caches the last source surface in the target surface after a Blit. This can cause a surface to be kept around longer than desired since the caching increases the ref-count. Unless it's likely that the blit will happen again soon we Release the source. Reviewed-by: TrustMe
| * Better QDirectFBPixmapData::toImage()Anders Bakken2009-04-071-0/+11
| | | | | | | | | | | | | | | | | | This is essentially a return to the earlier version of toImage(). Use a preallocated surface that operates on the returned image to do the conversion. If this causes drawing bugs it is likely a bug in the directfb driver and can be worked around by compiling with QT_NO_DIRECTFB_PREALLOCATED. Reviewed-by: TrustMe
| * Optimize bytesPerLine furtherAnders Bakken2009-04-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | If we're asking for the stride it's very likely the next thing we'll do is ask for the bits() so there's no good reason to unlock it again. In the raster buffer case memory() will be called just before bytesPerLine() so the code won't be hit but it's still the right thing to do. Reviewed-by: TrustMe
| * Optimize fillRects/fillRegionAnders Bakken2009-04-071-23/+5
| | | | | | | | | | | | | | This is not X11. There's no need to create another structure to hold the DFB rectangles. Verified by DirectFB expert. Reviewed-by: TrustMe
| * Cleanup. This function is no longer used.Anders Bakken2009-04-071-10/+0
| | | | | | | | Reviewed-by: TrustMe
| * Make sure to set blitting flagsAnders Bakken2009-04-073-25/+43
| | | | | | | | | | | | | | | | | | Need to set blitting flags before blitting from a surface with alpha channel. Otherwise alpha areas become white. For some reason setting the porterduff to DSPD_SRC does not fix this. Reviewed-by: TrustMe
| * Improve QDirectFBPixmapData::copyAnders Bakken2009-04-071-2/+8
| | | | | | | | | | | | Make sure we retain the alpha channel of the original surface. Reviewed-by: TrustMe
| * Improve QDirectFBPixmapData::transformedAnders Bakken2009-04-071-5/+14
| | | | | | | | | | | | Make sure we keep retain alpha if there is one in the source. Reviewed-by: TrustMe
| * Clean up surface creation codeAnders Bakken2009-04-071-9/+5
| | | | | | | | | | | | Use the intended functions for surface creation. Reviewed-by: TrustMe
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Ian Walters2009-04-077-32/+57
| |\
| | * Make OpenGL/ES 1.1 CommonLite and OpenGL/ES 1.0 builds workRhys Weatherley2009-04-075-25/+37
| | | | | | | | | | | | Reviewed-by: trustme
| | * Make sure to dirty clip in setStateAnders Bakken2009-04-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | For an example of something that breaks without this fix show a spinbox in plastique style. The clip is never removed. Reviewed-by: TrustMe
| | * Make windows the right formats and videoonlyAnders Bakken2009-04-071-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | CreateWindow gives you more control over how windows are created. Make sure to specify that they're in the same format as the primary surface and that they're in video memory if this is supported. Reviewed-by: TrustMe
| | * Make sure RGB32 workaround works for windowsAnders Bakken2009-04-071-0/+3
| | | | | | | | | | | | | | | Need to set forceRaster to true if the window surface is RGB32. Reviewed-by: TrustMe
| | * Pens can have brushesAnders Bakken2009-04-071-1/+3
| | | | | | | | | | | | | | | DirectFB can only handle cases where the pen's brush is Qt::SolidPattern Reviewed-by: TrustMe
| * | Remove inline keywords, fix compile bugIan Walters2009-04-071-3/+3
| |/ | | | | | | | | | | | | | | | | | | The compile under OS-X was failing due to unfound symbols. Given that the implementation of these functions is not in the header file, they should not have inline keywords. Removing the inline keywords allowed compilation to succeed. Reviewed-by: Rhys Weatherley
| * Fix up some QT_...NO_PALETTE codepathsAnders Bakken2009-04-071-4/+6
| | | | | | | | | | | | | | Make sure we create the surface from the converted image and not the original one. Reviewed-by: TrustMe
| * Move QT_BEGIN_NAMESPACE to after the usual Qt header includesRhys Weatherley2009-04-073-8/+8
| | | | | | | | | | | | | | QT_BEGIN_NAMESPACE is not defined until qglobal.h is included, but some of the QtNetwork headers were listing it before. Reviewed-by: Ian Walters
| * Don't use uninitialized capsAnders Bakken2009-04-061-2/+6
| | | | | | | | | | | | | | If flags does not contain DSDESC_CAPS caps might very well be uninitialized. Make sure to properly deal with this situation. Reviewed-by: Donald <qt-info@nokia.com>
| * Make compile when Qt3Support is turned offBill King2009-04-061-0/+2
| |