summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-06-254-18/+23
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * No point running spring physics faster than our timer.Martin Jones2009-06-251-4/+4
| |
| * QmlTimer::firesOnStart -> triggeredOnStartMartin Jones2009-06-252-13/+14
| |
| * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-06-24116-1546/+8253
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Fix GridView handling of unrequested items.Martin Jones2009-06-242-1/+5
| | | | | | | | | | | | | | | If unrequested items were added before we had populated any items they would not be laid out at all.
* | | Expose extended type URLs through the QML DOM APIAaron Kennedy2009-06-255-1/+18
| | |
* | | A little cleanupAaron Kennedy2009-06-253-62/+92
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-06-24123-1560/+8444
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Add pause/resume functionality for animations.Michael Brasser2009-06-243-1/+70
| | |
| * | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-06-242-8/+162
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Flesh out the Timer element.Martin Jones2009-06-242-8/+162
| | |
| * | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-06-241-0/+9
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-06-247-16/+47
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Display errors in component creation in setQml()Martin Jones2009-06-241-0/+9
| | | |
| * | | Fix possible crash.Michael Brasser2009-06-241-4/+5
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-06-245-11/+37
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-06-242-5/+10
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Allow fill color to be specified, as solid fill makes for muchWarwick Allison2009-06-243-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | faster painting. Better would be for the paint engine to work this out for itself, but that is often difficult.
| | * | | Clean up some code that has moved to QFxPaintedItemWarwick Allison2009-06-243-9/+0
| | | |/ | | |/|
| * | | Don't repaint on an empty dirty rect.Michael Brasser2009-06-241-3/+3
| | | |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-24110-1533/+8158
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/global/qglobal.h
| | * | Put back in these status bar changes for 10.4Norwegian Rock Cat2009-06-232-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | I was a bit overzelous removing them, but they should remain for 10.4 Reviewed-by: Morten Sørvig
| | * | Reduced button height in standard dialogs on WindowsXP/VistaJens Bache-Wiig2009-06-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is somewhat related to task 254526. The height of buttons on Vista/XP is a few pixels too tall in standard dialogs because they incorrectly reserve space for a default frame which is not used in these styles. Reviewed-by: prasanth
| | * | More culling of Panther Code.Norwegian Rock Cat2009-06-2319-691/+249
| | | | | | | | | | | | | | | | | | | | | | | | Removed lots of places where we check for Tiger. Now we can assume it. Reviewed-by: Morten Sørvig
| | * | Clean up the font hash and palette hash stuff.Norwegian Rock Cat2009-06-238-17/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are used enough (at least on the mac) to justify them being accessible in a private header. As a bonus it "hides" the actual container being used, so we could potentially sway it out with something different. Reviewed by: Jens Bache-Wiig
| | * | Scroll the dirty parts of the scroll area in scrollby for Cocoa.Norwegian Rock Cat2009-06-231-14/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ah! One less ###! The scroll functions in Carbon and Cocoa don't scroll the regions that have been marked dirty. In the past, we killed performance by updating the whole view. We got a workaround for Carbon in the form of an SPI, but I wasn't aware of a corresponding item in the NSView API, but it is there publically and available in 10.5. Fast scrolling in Cocoa now for people who like to use the keyboard. Reviewed by: Morten Sørvig
| | * | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-2318-90/+152
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/ChangeLog tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-06-234-6/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4552f381497b5adc18714d7f6e33eba678e3a9b2 ) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-06-23 Thiago Macieira <thiago.macieira@nokia.com> Reviewed by Simon Hausmann. Fix Qt build with Phonon. The #include <phonon> header no longer exists. And the <Phonon> or <Phonon/Phonon> headers have never existed (neither for us nor for the Phonon sources). You have to select each and every header that you do want now. * platform/graphics/qt/MediaPlayerPrivatePhonon.cpp: 2009-06-23 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> Reviewed by Simon Hausmann. Fix NPAPI mouse translation issues on Mac The WindowRef we pass to the plugin refers to the the top level window, so the x and y positions have to be relative to this position, but we have to manually compensate for title bar decorations and other parents of the QWebView since contentsToWindow() only traverses to the QWebView. Previously we did this compensation when passing on mouse coordinates to the plugin, which caused various issues with translations such as not being able to close the Flash settings dialog, or the hand cursor not appearing over links. We now do the compensation as part of the call to NPP_SetWindow, and then pass mouse coordinates in global context without any compensation, similar to how both Safari and Mozilla does it. * plugins/mac/PluginViewMac.cpp: (WebCore::PluginView::updatePluginWidget): (WebCore::PluginView::globalMousePosForPlugin): ++ b/WebKit/qt/ChangeLog 2009-06-16 Morten Engvoldsen <morten.engvoldsen@nokia.com> Reviewed by Ariya Hidayat. Clearifying QWebFrame docs Adding docs to toHtml() and toPlainText() * Api/qwebframe.cpp:
| | | * | Remove some warnings in the Cocoa build.Norwegian Rock Cat2009-06-2313-48/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After discussing with some of the Objective-C people I have finally got a fair number of the warnings to disappear in both 10.5 and 10.6. I also took the opportunity to remove a bunch of other warnings. Reviewed by: Morten Sørvig
| | | * | Add an error message for building architecture mismatchNorwegian Rock Cat2009-06-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snow Leopard defaults to 64-bit if you don't specify an architecture, whereas in the past it defaulted to 32-bit. This isn't a problem for Qt per-se. It *is* a problem if you just build an application that uses Qt but isn't using qmake stuff. To help in those situations, we should error out to let the person know that they need to change their configuration (in any case, the headers are going to complain and they get a much more cryptic message). Reviewed by: Morten Sørvig
| | | * | Added QPen warning when setting dash pattern with non-positive entries.Samuel Rødal2009-06-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 256720 Reviewed-by: Trond
| | | * | Regression against 4.4 in QRectF::operator|.Bjørn Erik Nilsen2009-06-232-35/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 4.4 QRectF handled flat rectangles in the same fashion as QRect does, but that changed with Lars' and Jo's optmizations done in the falcon branch. The difference is that the optimized version only checks whether the width or height is 0, whereas in 4.4 both had to be 0 (isNull()) before we bailed out. This regression also introduced a regression in QGraphicsItem::childrenBoundingRect(). Auto-test included. Task-number: 254995 Reviewed-by: Lars
| | * | | Fix option rect offset for QComboBox on Vista styleJens Bache-Wiig2009-06-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 254805 Reviewed-by: prasanth
| | * | | Fixed build error on X11 with gcc 4.1.2.jasplin2009-06-231-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gcc 4.1.2 on X11 somehow confuses assignment of a temporarily constructed QSettings object to a reference with invalid access to the private assignment operator of QSettings. Reviewed-by: mgoetz
| | * | | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-2315-61/+104
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp
| | | * | Fix compilation after the last change.Thiago Macieira2009-06-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The #include <phonon> header no longer exists. And the <Phonon> or <Phonon/Phonon> headers have never existed (neither for us nor for the Phonon sources). You have to select each and every header that you do want now. Reviewed-By: Marius Storm-Olsen
| | | * | Attempt to fix header installation for Phonon.Thiago Macieira2009-06-231-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the long-standing issue of whether Phonon headers should be written with a capital P or a lowercase one. KDE releases of Phonon had <Phonon/CapitalClassName> whereas Qt 4.4 had <phonon/filename.h>. I tried to solve this before by adding a Phonon subdir next to phonon in include/, but that only compounded the error: the presence of two dirs caused problems and the installation wasn't fixed. So instead try to place Phonon/ClassName inside include/phonon. And fix the installation to do it properly: just copy the include/$lib dir into the target, then overwrite the .h files with the sources from src/$lib. Reviewed-by: Marius Storm-Olsen
| | | * | Improve text drawing quality with CarbonSimon Hausmann2009-06-231-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable fractional coordinates for text output, to produce the same output as regular Carbon/ATSUI applications. Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
| | | * | make the last checkin compile.Bill King2009-06-231-2/+0
| | | | |
| | | * | Fixes non-unicode strings should be strings, not bytearrays.Bill King2009-06-231-17/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passes all autotests. Task-number: 251739
| | | * | Prevented QWizard from crashing upon removing a page after deleting a field ↵jasplin2009-06-222-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object. QWizard crashed when removing a page after deleting an object that was already registered as a field for the page. This patch prevents such a crash by doing the necessary cleanup immediately when the object is deleted. QWizard::removePage() will then see a consistent state in this case. Reviewed-by: janarve Task-number: 255350
| | | * | Fixed drawTiledPixmap() for the GL paint engine.Trond Kjernåsen2009-06-221-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The offset was completely ignored for the GL 1 paint engine. Task-number: 256608 Reviewed-by: Samuel
| | | * | Check for null pointer in QGraphicsProxyWidget::event() in case there is no ↵Marius Bugge Monsen2009-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | focusWidget(). Reviewed-by: Thierry Task-number: 255468
| | | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Marius Bugge Monsen2009-06-221-1/+4
| | | |\ \
| | | | * | Moving a child widget right after show() does not work as expected.Bjørn Erik Nilsen2009-06-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that we did an accelerated move, i.e. scrolled the widget's contents in the backing store and repainted the old area. We cannot do this trick when the widget has been invalidated (show(), resize()). In this case the widget had never been painted, so we basically scrolled the content of its parent and the widget itself appeared as invisible. Auto-test included. Task-number: 255117 Reviewed-by: Paul
| | | * | | Check if the row larger or equal to the flowPositions vector to prevent out ↵Marius Bugge Monsen2009-06-221-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of bounds access. This problem is encountered if a model doesn't report it's changes correctly. Reviewed-by: Thierry Task-number: 256617
| | | * | Fixed wrong painting when doing IntersectClip after setClipping(false).Samuel Rødal2009-06-222-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation is a bit ambiguous on what the expected behavior here is, but the behavior was consistent across paint engines before 4.5. QPaintEngineEx introduced inconsistencies in the raster and OpenGL paint engines, so this patch reverts the behavior back to what it was in 4.4. Task-number: 256549 Reviewed-by: Trond
| | | * | task 226042Derick Hawcroft2009-06-221-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until the PostgreSQL API has this functionality. Use a hack to find out if a transaction has failed or not. This hack is a limited to 8.x versions of PostgreSQL. Bill King
| | | * | Minor optimizationAnders Bakken2009-06-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to set the pen in begin. It's always done before it's used anyway. Reviewed-by: TrustMe
| | | * | Bail out on invalid color in fillRectAnders Bakken2009-06-221-1/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe