summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* If EGL fails to provide a valid Visual ID, try XRender for ARGBsTom Cooksey2009-05-221-9/+55
| | | | | | | | | This patch is inspired by the "Fix ARGB visuals" patch in the Maemo branch. Thanks go to the author of that patch (who isn't signed up to Gitorious and thus can't be named - you know who you are! Thanks!!). This patch should also fix ARGB visuals (even if they are supplied by EGL) as such visuals require a colormap.
* Try to use the X11 visual ID provided by EGLTom Cooksey2009-05-221-30/+74
| | | | | | | EGL has an EGL_NATIVE_VISUAL_ID which can by used as the window's visual ID. We now try to use this ID to avoid an XVisual <-> EGLConfig mis-match. Of course this is usually broken in the EGL library, so we fall back to trying to match outselves.
* Fix changed behaviour after QEglProperties::value() patchTom Cooksey2009-05-222-14/+14
| | | | | | | Patch 27fadaa7eb2d58b47e7f0f508e3402e7a8de3894 (Make QEglProperties::value() return the EGL default if not set) changed behaviour. This patch reverts this change to behaviour but keeps QEglProperties::value() returning the EGL default value.
* Merge commit 'qt/master'Samuel Rødal2009-05-20142-2030/+2327
|\
| * Merge commit 'origin/4.5'Samuel Rødal2009-05-204-6/+6
| |\
| | * Fix a compile error on MSVC 64bits due to qhash casting a pointer.Thierry Bastian2009-05-201-4/+1
| | | | | | | | | | | | | | | | | | | | | I tested it with 32 bits compilation and there is no warning any more. Task-number: 247325 Reviewed-by: ogoffart
| | * Fix a wrong compiler define (was a typo).Ariya Hidayat2009-05-201-1/+1
| | | | | | | | | | | | The typo was in commit 30f7edc0aab629499b74263391ae529ad31b2ff8.
| | * Make the range controls accessibleHarald Fernengel2009-05-201-0/+2
| | |
| | * Don't draw an arrow for toolbuttons that are text only and have a menu.Norwegian Rock Cat2009-05-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I made this change to make things look a bit better on the mac. However, a toolbutton with text only looks strange and as a bonus the arrow covers some of the text, which no one wants. It seems that similar consructions in Cocoa don't show the arrow for text button, so we shouldn't either. Task-number: 253339 Reviewed-by: Jens Bache-Wiig
| * | Remove QDumper. It was used in a previous version of creator but is nowThierry Bastian2009-05-202-1158/+0
| | | | | | | | | | | | useless.
| * | allow to debug QVariant of float typeThierry Bastian2009-05-201-1/+4
| | | | | | | | | | | | Reviewed-by: ogoffart
| * | Use a per object lock for signal/slotsOlivier Goffart2009-05-201-22/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That way we prevent the current possible race condition that may appears while touching signals slot while object are moved to different threads. For exemple, when we do sender->threadData->mutex->lock(); the sender can possibly be moved to another thread between the moment we get the pointer to the threadData and the moment we aquire the lock. We could check if we locked the right mutex and retry otherwise, but that would break if the threadData (and hence the mutex) get destroyed in between. The per object mutex is implemented with a thread pool. I'm not using the global QThreadPool because we might ends up locking two of their mutex, and that would be dangerous if something else holds a lock on the same mutex (possible deadlock) Putting the mutex pool in a Q_GLOBAL_STATIC doesn't work as it might result of the ppol being deleted before some other object in others Q_GLOBAL_STATIC structures There is no need to lock this mutex in moveToThread as this is safe. When emiting a signal, we do not need to lock the thread data, as the user must ensure that the object is not moved to a thread while emiting a AutoConnection signal. Reviewed-by: Brad
| * | Merge branch '4.5' of ../qt-45-documentationDavid Boddie2009-05-2018-207/+105
| |\ \
| | * \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-05-2017-191/+89
| | |\ \ | | | |/
| | | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-205-22/+27
| | | |\
| | | | * QComboBox: style change event should not resets custom item delegatesOlivier Goffart2009-05-202-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from 4.4 introduced while fixing task 167106 Autotest: tst_QComboBox::task253944_itemDelegateIsReset() Task-number: 253944 Reviewed-by: jbache
| | | | * Silence warning by MSVC.Frans Englich2009-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | | | * Revert focus apparance on itemviews for X11Jens Bache-Wiig2009-05-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We changed this primarily for the mac as active appearance on widgets in itemviews should depend on the window activation state and not on the focus widget. It was explicitly added back for windows only but has been reported as a bug on X11 as well so we might as well keep it mac-only for now. Reviewed-by: mortens
| | | | * Remove bad documentation about window modality and QMessageBox.Norwegian Rock Cat2009-05-201-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMessageBox is like QDialog. It doesn't have any extra magic with window modality on creation, so don't advertise that it does. The note about using message boxes as sheets is also updated.
| | | * | qdoc: Moved a qdoc comment to a file that is in all packages.Martin Smith2009-05-203-4/+7
| | | |/ | | | | | | | | | | | | Task-number: 252565
| | | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-2013-28/+94
| | | |\
| | | | * Fix a crash where QCocoaWindow get events after its widget is deadNorwegian Rock Cat2009-05-202-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The invariant that QCocoaWindow's lifetime is contained in a QWidget is simply not true. A top-level QWidget gets associated with a QCocoaWindow (which is reference counted). However, it can be the case that we've destroyed our QWidget, the link is removed, the window is hidden, but the window still gets an event. In that case we would crash with an eventual null pointer access. However, we don't really need to do anything in this case, so just call super and return. Task-number: 253402 Reviewed-by: Morten Sørvig
| | | | * Fix a typo in the class documentation for QItemDelegateAndy Shaw2009-05-201-1/+1
| | | | |
| | | | * Optimize QIoDevice::readAll() to possibly do less (re)allocationsMarkus Goetz2009-05-201-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart Reviewed-by: Peter Hartmann Reviewed-by: João Abecasis
| | | | * Fixes a memory leak in the interbase sql driver.Bill King2009-05-201-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As suggested in gitorius merge request 421, solution supplied by Harald. Reviewed-by: Harald Fernengel
| | | | * Adds thread initialisation/cleanup code to mysql.Bill King2009-05-201-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows for cleaner multi-thread working for mysql clients. Task-number: 253407
| | | | * Updated WebKit from /home/ariya/dev/webkit/qtwebkit-4.5 to ↵Ariya Hidayat2009-05-193-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | origin/qtwebkit-4.5 ( 40b523e9eaaba38c182e5a9c319f0069ebf98330 ) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-05-11 Yael Aharon <yael.aharon@nokia.com> Reviewed by Holger Freyther. Change Qt port to match the mac and windows ports, and unregister plugins when plugins are stopped. Not doing that can cause assersion failure. https://bugs.webkit.org/show_bug.cgi?id=25702 * plugins/qt/PluginViewQt.cpp: (WebCore::PluginView::stop):
| | | | * Revert commit a372fc602a3cb09379875ced99ec969c371917d7.Ariya Hidayat2009-05-196-695/+1645
| | | | | | | | | | | | | | | | | | | | This was accidentally committed.
| | | | * Updated WebKit from /home/ariya/dev/webkit/qtwebkit-4.5 to ↵Ariya Hidayat2009-05-196-1645/+695
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | origin/qtwebkit-4.5 ( 7b8d6ab6f2b73862d11c2a41ab0223e55585d88f ) Changes in WebKit since the last update:
| | | * | qdoc: Moved qdoc comments from qmacstyle_mac.mm to qstyles.qdocMartin Smith2009-05-201-152/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The .mm file is not read by qdoc for packages other than for the MAC. This problem is overcome by moving the qdoc comments from the .mm file to a .qdoc file in doc/src, because all these files are read by qdoc for each of the packages. #Task-number: 252566
| | * | | Doc: Fixed the paper sizes again.David Boddie2009-05-201-16/+16
| | | |/ | | |/| | | | | | | | | | | | | Task-number: 254179 Reviewed-by: Norwegian Rock Cat
| * | | Add string-->enum conversion for properties and slotsKent Hansen2009-05-203-7/+32
| | | |
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-1961-90/+312
| |\ \ \ | | |/ /
| | * | Fix stopping link loops in QDirIterator on WindowsEskil Abrahamsen Blomfeldt2009-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | currentFileInfo is only used for returning from the public functions since the file info used in the algorithm is one step ahead. nextFileInfo is the one actually used in the algorithm. The bug was introduced in a compile fix for Windows and broke the stopLinkLoop test for QDirIterator. Reviewed-by: Olivier
| | * | Clarifying what QLocale::C is and is notNils Christian Roscher-Nielsen2009-05-191-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | Updated WebKit from /home/ariya/dev/webkit/qtwebkit-4.5 to ↵Ariya Hidayat2009-05-193-11/+41
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | origin/qtwebkit-4.5 ( 7b8d6ab6f2b73862d11c2a41ab0223e55585d88f ) Changes in WebKit since the last update: ++ b/WebKit/qt/ChangeLog 2009-03-27 Erik L. Bunce <elbunce@xendom.com> Reviewed by Simon Hausmann. https://bugs.webkit.org/show_bug.cgi?id=24746 Improved selection tests. * tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::textSelection):
| | * Clearifying QUrl docsMorten Engvoldsen2009-05-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Adding more details on QUrl::addQueryItem() Task-number: 234125 Rev-by: Thiago Macieira
| | * Ignore GCC warning of unsafe floating point comparisons.Ariya Hidayat2009-05-191-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to optimizations, there are few cases where comparing with a constant is needed, e.g. in operator*=. G++ will give us a warning for this. Since we know what we are doing, surpress the warning. The only drawback for this workaround is if somebody includes qtransform.h in his code and disable the float-equal warning since the warning will be activated again. Reviewed-by: Samuel Rødal
| | * Fix compiler warning: use C++ cast operator, not the old-style C cast.Ariya Hidayat2009-05-191-1/+1
| | | | | | | | | | | | Reviewed-by: Marius Storm-Olsen
| | * Updated WebKit from /home/ariya/dev/webkit/qtwebkit-4.5 to ↵Ariya Hidayat2009-05-189-10/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | origin/qtwebkit-4.5 ( 1f83e4058bffd5a3fe7e44cf45add01953a772d4 ) Changes in WebKit since the last update: ++ b/LayoutTests/ChangeLog 2009-05-12 Ariya Hidayat <ariya.hidayat@nokia.com> Reviewed by Dimitri Glazkov. Added Qt-specific expected result for toDataURL test, since Qt does not support saving pixmaps to GIF. * platform/qt/fast/canvas/toDataURL-supportedTypes-expected.txt: Added. 2009-05-12 Ariya Hidayat <ariya.hidayat@nokia.com> Rubber-stamped by Simon Hausmann. Added Qt-specific expected result for Canvas getImageData's test. https://bugs.webkit.org/show_bug.cgi?id=22150 Since Qt is internally using premultiplied ARGB32 for doing alpha-blending painting, reading the color back will not necessarily give the same exact color. * platform/qt/Skipped: Excluded canvas-getImageData. * platform/qt/fast/canvas/canvas-getImageData-expected.txt: Added. 2009-04-29 Ariya Hidayat <ariya.hidayat@nokia.com> Reviewed by Simon Fraser. Updated expected results after Qt's GraphicsContext fixes. * platform/qt/fast/canvas/set-colors-expected.txt: 2009-04-24 Ariya Hidayat <ariya.hidayat@nokia.com> Reviewed by Simon Hausmann. Added Qt-specific expected result for color conversion. This is to compensate the lack of color profile in Qt to do color conversion, hence CMYK 0,0,0,1 always give pure black (#000) instead of very dark black. * platform/qt/fast/canvas/set-colors-expected.txt: Added. ++ b/WebCore/ChangeLog 2009-05-18 Ariya Hidayat <ariya.hidayat@nokia.com> Reviewed by Simon Hausmann. Done together with Balazs Kelemen <kelemen.balazs@stud.u-szeged.hu>. https://bugs.webkit.org/show_bug.cgi?id=24551 [Qt] Reuse FontPlatformData for the same FontDescription. This effectively prevents growing heap usage for loading every web page. * platform/graphics/qt/FontCacheQt.cpp: (WebCore::qHash): Necessary for FontPlatformDataCache. (WebCore::FontCache::getCachedFontPlatformData): Reuse the instance if it exists, otherwise create a new one and insert it in the cache. 2009-05-18 Balazs Kelemen <kelemen.balazs@stud.u-szeged.hu> Reviewed by Ariya Hidayat. https://bugs.webkit.org/show_bug.cgi?id=24551 [Qt] Fix the leak in FontFallbackList::fontDataAt() function. When creating a new instance of SimpleFontData, put it in the font list so that it can deleted later on. * platform/graphics/qt/FontFallbackListQt.cpp: (WebCore::FontFallbackList::invalidate): (WebCore::FontFallbackList::releaseFontData): (WebCore::FontFallbackList::fontDataAt): 2009-05-15 Ariya Hidayat <ariya.hidayat@nokia.com> Reviewed by Holger Freyther. [Qt] In the image decoder, remove the raw image data represented as QImage once the image is converted to QPixmap and inserted in the pixmap cache. This effectively reduces the heap usage when running on graphics system other than raster (i.e the case where QImage != QPixmap). * platform/graphics/qt/ImageDecoderQt.cpp: (WebCore::ImageDecoderQt::imageAtIndex): Nullified the image on purpose. * platform/graphics/qt/ImageDecoderQt.h: Made m_imageList mutable. 2009-05-15 Ariya Hidayat <ariya.hidayat@nokia.com> Reviewed by Holger Freyther. [Qt] Refactor alpha channel detection the image decoder. Sets the boolean flag as soon as the image is being read. * platform/graphics/qt/ImageDecoderQt.cpp: (WebCore::ImageDecoderQt::ImageDecoderQt): Initialized m_hasAlphaChannel. (WebCore::ImageDecoderQt::setData): Set the flag when appropriate. (WebCore::ImageDecoderQt::supportsAlpha): Simplified. (WebCore::ImageDecoderQt::reset): Resetted the flag. * platform/graphics/qt/ImageDecoderQt.h: Added m_hasAlphaChannel. 2009-05-13 Ariya Hidayat <ariya.hidayat@nokia.com> Reviewed by Sam Weinig. [Qt] Fix "lighther" composition mode. QPainter::CompositionMode_Plus is the right match. * platform/graphics/qt/GraphicsContextQt.cpp: (WebCore::toQtCompositionMode): 2009-04-29 Ariya Hidayat <ariya.hidayat@nokia.com> Reviewed by Simon Fraser. [Qt] Initialize GraphicsContext's and ImageBuffer's QPainter to match the default values of canvas attributes. * platform/graphics/qt/ImageBufferQt.cpp: (WebCore::ImageBufferData::ImageBufferData): 2009-04-27 Ariya Hidayat <ariya.hidayat@nokia.com> Reviewed by Tor Arne Vestbø. https://bugs.webkit.org/show_bug.cgi?id=18475 [Qt] Widget painting should follow the layout direction (LTR, RTL) of the element style, not the application layout direction. * platform/qt/RenderThemeQt.cpp: (WebCore::RenderThemeQt::applyTheme):
| | * Added doc about QSharedMemory and other applicationsMarkus Goetz2009-05-181-0/+4
| | | | | | | | | | | | | | | Task-number: 253835 Reviewed-by: David Boddie
| | * Replace all occurences of "heirarchy" with "hierarchy"Andre Haupt2009-05-182-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Andre Haupt <andre@bitwigglers.org> Reviewed-By: Thiago Macieira
| | * Fix handling of dynamic casts in QSharedPointer.Thiago Macieira2009-05-181-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's wrong to assume that static_cast<> is allowed everywhere where dynamic_cast<> is allowed. For example, if class C derives from both A and B, then you can dynamic_cast<B *>(ptr_to_A), but you can't static_cast. So introduce a helper for dynamic casts that doesn't do static_cast. Reviewed-by: Olivier Goffart
| | * Fix some typos in the documentation.Frederik Schwarzer2009-05-1840-47/+47
| | | | | | | | | | | | | | | | | | Usually, "the the" is not proper English Reviewed-By: Thiago Macieira
| | * Fix QNetworkDiskCache to expire the oldest files first.Benjamin C Meyer2009-05-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When expiring cache files use a QMultiMap, when using a QMap not all files are put into the map because often many files (downloaded or updated at the same time) will have the same creation QDateTime and so only one will go into the QMap who's key is QDateTime. Reviewed-By: Thiago Macieira Reviewed-By: Peter Hartmann
| | * Prevent a crash with brushed metal windows and a qApp style sheetNorwegian Rock Cat2009-05-181-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My great metal hack simply needs to hack more and not do the "extra" assign since I'm doing this through a back door in set attribute. We probably should have had the brushed metal go via an actual QStyle subclass instead of through the attribute. Task-number: 253448 Reviewed-by: ogoffart
| * | Ensure that the export symbols are correct. Patch supplied by Saleem/Dallas ↵Frans Englich2009-05-191-1/+5
| | | | | | | | | | | | | | | | | | | | | team. Reviewed-By: Thiago Reviewed-By: jbache
| * | Set the resolution when saving a tiff fileBenjamin Poulain2009-05-191-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | The resolution was not saved when the image was saved as tiff. This fix add the resolution, and try to guess if the user have set it in dpi or dot per centimeter Task-number: 245242 Reviewed-by: Samuel
| * | compile fixes with namespaceshjk2009-05-191-0/+4
| | |
| * | Fixed typo.jasplin2009-05-191-1/+1
| | | | | | | | | | | | Reviewed-by: TrustMe