summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Fixes: QSqlTableModel does not handle updates when one of the fields hasBill King2009-04-062-3/+36
| | | | | | a NULL value Task-number: 189093
* BT: Fixed treeview painting regression on VistaJens Bache-Wiig2009-04-061-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
* BT: Adjust the colliding mice example to work with coalesced updates.Norwegian Rock Cat2009-04-064-25/+30
| | | | | | | | | | | | | | | | | | | It seems that Cocoa is much more strict about coalesced updates than Carbon ever was. The upshot of this is that some examples that "worked" after a fashion in Carbon, do not exhibit good frame rates with Cocoa. The reason why is that apparently Cocoa will decide to flush to the screen every time a timer fires. If you have a lot of timers that are all dependent on doing on update to the screen, you will get undesirable effects. Thankfully, it is possible to adjust the examples to follow best practices and get a good result. So, we now only do the animation once using QGraphicsScene::advance(). We are also able to make the mice less heavy (no QObject subclass). I've updated the docs and someone on the doc team has kindly volunteered to go through them. Reviewed-by: Andreas
* De-inlined 2 functions in QHttpNetworkHeaderMarkus Goetz2009-04-061-2/+2
| | | | RevBy: Thiago
* Splitted qhttpnetworkconnection* files into individual filesMarkus Goetz2009-04-069-1237/+1659
| | | | (cherry picked from commit fd9b788bd6a99630b06cffee4c9fa9f4c06b0ef1)
* Removed usage of NaN in SVG gradients.Kim Motoyoshi Kalland2009-04-062-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
* Update the autotest to pass again due to a previous behaviuour change.Jan-Arve Sæther2009-04-061-9/+12
| | | | | | | | | Font propagation changed slightly in some cases due to change 22d472c17167c4ca8df5678842768ab63b7baadd. However, the change is sane - its just the autotest that is not optimal. Task-number: 246215 Reviewed-by: andreas
* compile for non x11 systemsMaurice Kalinowski2009-04-061-0/+2
| | | | Reviewed-by: joerg
* Update WebKit from code.staikos.net/srv/git/webkitTor Arne Vestbø2009-04-0612-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.
* Merge commit 'ab56759cefbcf2072ac777f0d897e561f5a3c8af' into 4.5Joerg Bornemann2009-04-061-6/+6
|\
| * don't display warning message when calling checksdk -listJoerg Bornemann2009-04-011-6/+6
| | | | | | | | | | | | | | checksdk -list now displays the list of available SDK without yielding the warning message "No SDK specified: Defaulting to ...". Reviewed-by: mauricek
* | compileMaurice Kalinowski2009-04-061-1/+1
| | | | | | | | | | | | Reviewed-by: thartman function declaration was missing arguments as done in the other testcases in 831d2742b7c41924f052acd81620e8bfc58afde7
* | remove dead codeMaurice Kalinowski2009-04-061-1/+0
| | | | | | | | Reviewed-by: jbache
* | compile for systems without Qt3SupportMaurice Kalinowski2009-04-061-1/+1
| | | | | | | | | | | | Reviewed-by: joerg QTest::newRow only accepts char* and without Qt3Support there is no implicit cast available.
* | BT: Fix combobox background color regressionJens Bache-Wiig2009-04-062-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
generated by cgit v0.12 at 2024-11-12 09:44:50 (GMT)