summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed cap and join styles when printing to native Windows printers.Trond Kjernaasen2009-06-261-1/+19
| | | | | | | | Line and polygon strokes did not respect the join/cap styles set on a painter. Task-number: 256914 Reviewed-by: Samuel
* Fix build on Solaris: test -e isn't available to Bourne shellsThiago Macieira2009-06-261-1/+1
| | | | | | | I don't know why, even though it's specified in POSIX. But we have to cope with broken stuff. Reviewed-by: Bradley T. Hughes
* make invokable constructors work with classes in namespaceKent Hansen2009-06-253-3/+31
| | | | | | | | | | Use the fully qualified classname at relevant places in the moc-generated code. Also, QMetaObject::newInstance() needs to strip the namespace part, since the constructor signatures don't contain the fully qualified name. Task-number: 246064 Reviewed-by: Simon Hausmann
* Bump Qt version number.Jason McDonald2009-06-2511-21/+144
| | | | Reviewed-by: Trust Me
* Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-06-253-1/+24
| | | | | | | | | | | | | | | | | | | | | e65b4879116f4a8b0ee8b09607eef666c68c61d6 ) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-06-25 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by and done with Tor Arne Vestbø. Fix shortcut keyboard handling with plugins on the Qt/Mac build. When we receive shortcut events like Ctrl+V then the text in the QKeyEvent is empty. If we're asked to disambiguate the event into a Char keyboard event, we try to detect this situation and still set the text, to ensure that the general event handling sends a key press event after this disambiguation. * platform/qt/PlatformKeyboardEventQt.cpp: (WebCore::PlatformKeyboardEvent::disambiguateKeyDownEvent):
* QNetworkReplyImpl: Protect against recursive event loopsMarkus Goetz2009-06-255-2/+175
| | | | | | | | | | This fixes a bug that occured together with a QProgressDialog. The signal emission was like: readyRead readyRead readyRead [...] readyRead finished readyRead Now finished should be properly at the ending of this sequence. Task-number: 256630 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* Change QSharedPointer to track (or not) pointers when the #define isThiago Macieira2009-06-253-3/+8
| | | | | | | | | enabled. This allows mixing of debug and non-debug code (possible on Unix systems) without causing assertion failures. Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* save on a couple of mallocsDerick Hawcroft2009-06-241-1/+1
|
* Fix off by one bug in DirectFBPaintEngineAnders Bakken2009-06-241-2/+2
| | | | | | This bug made us call lock more than we needed to. Reviewed-by: Donald <qt-info@nokia.com>
* Fix a rendering issueAnders Bakken2009-06-242-3/+8
| | | | | | Make sure surfaces always are locked when used as source for something. Reviewed-by: TrustMe
* Fixup ibase.Derick Hawcroft2009-06-241-2/+2
| | | | delete -> delete []
* Make sure simplePen gets set properlyAnders Bakken2009-06-241-5/+11
| | | | | | | | | The logic regarding whether or not a pen was simple was broken. Essentially the pen is sonly simple if it should en up as a single pixel line. Reviewed-by: Donald <qt-info@nokia.com>
* fix crash when using plugin that supplies a QDesignerMemberSheetExtensionJoel Nordell2009-06-241-2/+2
| | | | | | | | plugins external to Qt Designer can not define objects inheriting from QDesignerMemberSheet, as that is defined in a private header. the functions isQt3Signal and isQt3Slot assume that all QDesignerMemberSheetExtension objects at QDesignerMemberSheet, but this is not the case with 3rd party plugins. Merge-request: 452 Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-By: Thorbjørn Lindeijer
* Fix comparison of different-sized QStringRefs.Thiago Macieira2009-06-241-1/+1
| | | | | | | Two strings are only equal if they have the same size. Task-number: 256763 Reviewed-by: TrustMe
* QColorDialog: Fix setting of alpha valuesMarkus Goetz2009-06-241-1/+1
| | | | | | | | | When alpha was changed and then another color was picked in the GUI still the old alpha remained (good) but it was not returned in the returned color (bad). Task-number: 256164 Reviewed-by: jasplin
* Backport: Mark tests as XFail until they can be investigated further.Bill King2009-06-241-7/+13
|
* These database connections need this parameter to work properly.Bill King2009-06-241-2/+2
|
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Keith Isdale2009-06-24748-2455/+3949
|\
| * bug fix for ibase sql driverDerick Hawcroft2009-06-241-16/+36
| | | | | | | | | | | | | | | | - add checks for failed malloc's - convert some of the obvious malloc'ed stuff to use new/delete Task-number: 200217 Reviewed-by: Bill King
| * Avoid running "make distclean" before there's a Makefile in the test dir.Thiago Macieira2009-06-231-1/+2
| | | | | | | | | | | | | | | | | | | | I have been bitten by this quite often and I had never found out why suddenly configure decided to erase all my build. It happens that my "make" replacement script command tries to search for a Makefile in the parent dirs (so I can run "make" while inside src/corelib/tools), and this caused the whole build to be erased. Reviewed-by: Trust Me
| * Compile.Norwegian Rock Cat2009-06-231-1/+1
| | | | | | | | Mismatch in preprocessor my previous commit.
| * Some fixes for LLVM on the Mac.Norwegian Rock Cat2009-06-232-4/+2
| | | | | | | | | | | | | | | | | | | | | | The GCC-LLVM compilers on Snow Leopard have advanced enough to make them worth the effort to make sure they at least work again. These are the minimum changes needed to make things work. The current gcc-llvm compilers on Mac OS X support Objective-C++ so, no need to special case them anymore either. You STILL need to make sure your path is correct however. Reviewed by: Morten Sørvig
| * Recognize | as separator characterThorbjørn Lindeijer2009-06-231-0/+1
| | | | | | | | Reviewed-by: mae
| * Remove these outdated referencesNorwegian Rock Cat2009-06-231-4/+3
| | | | | | | | | | | | | | | | | | This doesn't work, the paths are wrong. It's not properly checking the arch, and none of our compilers use it. Unsupported ones might, but I'd rather leave it blank and let them figure out how to do it correctly then lead them down a blind alley. Discussed with Morten Sørvig
| * 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-233-35/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add new auto-test QGraphicsItem::childrenBoundingRect2().Bjørn Erik Nilsen2009-06-231-0/+11
| | | | | | | | Reviewed-by: Andreas
| * Fix compilation after the last change.Thiago Macieira2009-06-232-2/+6
| | | | | | | | | | | | | | | | | | 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-232-28/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * mark plural messages as such in the qm readerOswald Buddenhagen2009-06-231-0/+18
| | | | | | | | | | | | this contains both a "clean" code path based on translation count and a fallback path based on looking for "%n" (for languages with only one form).
| * add -input-codec option for qm readerOswald Buddenhagen2009-06-232-3/+10
| | | | | | | | | | basing the input codec on the locale was broken by design and didn't really work anyway. so adding this option really is a bugfix, kind of.
| * Fix the dash pattern examples in the documentation of QPenBenjamin Poulain2009-06-231-2/+2
| | | | | | | | | | The custom dash pattern must have an even number of entries. Our examples were using an odd number.
| * Fix missing member initialization.kh2009-06-2315-1/+16
| | | | | | | | Reviewed-by: ossi
| * Doc - Adding the new Frozen Column Example by Pierre Rossi into our list ofKavindra Devi Palaraja2009-06-232-0/+2
| | | | | | | | | | | | examples Reviewed-By: TrustMe
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Kavindra Devi Palaraja2009-06-231-5/+0
| |\
| | * 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>
| * | Doc - Adding Pierre Rossi's frozen column exampleKavindra Devi Palaraja2009-06-2310-0/+758
| |/ | | | | | | Reviewed-By: TrustMe
| * 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-223-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-222-1/+32
| |\
| | * Moving a child widget right after show() does not work as expected.Bjørn Erik Nilsen2009-06-222-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-224-11/+29
| | | | | | | | | | | | | | | | | | | | 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
| * Fix crash in widget box when using load mode "LoadCustomWidgetsOnly"Eskil Abrahamsen Blomfeldt2009-06-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | When loading the widget box with load mode "LoadCustomWidgetsOnly", it will create an empty category. This will indirectly cause a resize event to be posted for the tree widget of the widget box, which in turn will cause adjustSubListSize() to be called for each category item in the tree widget. Since the category has not yet been populated, the assumption in adjustSubListSize() that cat_item->child(0) is non-null would cause a crash. The fix is to return immediately if the category is empty. Reviewed-by: Friedemann Kleint