summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtVolker Hilsheimer2009-06-162-10/+29
|\
| * Prevent uic3 from clobbering the QLabel3::wordWrap property.Friedemann Kleint2009-06-161-7/+10
| | | | | | | | | | | | Basically make use of customer patch, do not try to use the value obtained from the alignment if property is present. Task-number: 128859
| * Made uic generate QLayout::setContentsMargin instead of setMargin.Friedemann Kleint2009-06-161-3/+19
| | | | | | | | | | With the exception of layout functions, which is too weird. Task-number: 255846
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-162977-6100/+5992
|\ \ | |/ |/|
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-06-163-2/+34
| |\
| | * Backported WebKit SVG revisions (r43590, r43795) from the trunkSimon Hausmann2009-06-163-2/+34
| | | | | | | | | | | | Reviewed-by: Ariya
| * | Cleanup our usage of the term "Qt Software".Jason McDonald2009-06-161-3/+3
| |/ | | | | | | Reviewed-by: Trust Me
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-163004-5991/+5991
| | | | | | | | Reviewed-by: Trust Me
| * Improved styling of expander arrows with Gtk+Jens Bache-Wiig2009-06-161-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation was based on the GtkExpander widget. However we do not have such a widget and the primary use case is for expanders inside item views. Hence it makes sense to base it on gtktreeview instead. As I can not reproduce the crash with any recent versions of cleanice I will remove the workaround as well. omment and edit as applicable ]---| Task-number: 256146 Reviewed-by: Thorbjørn
| * Prevented QCompleter popup from appearing briefly on Windows.jasplin2009-06-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | It turns out that the fix 7bf4512659113f8cc78e72f1c84158ce4f70a526 caused the QCompleter popup from appearing for a split second on Windows. This is because the popup is shown as a toplevel window on this platform. On other platforms than Mac and Windows it doesn't seem to matter, but be on the safe side, the fix is modified to apply for Mac only. Reviewed-by: Daniel Molkentin Task-number: 255374
| * QFile: Doc was pointing to deprecated QIODevice::isSequentialAccess()Markus Goetz2009-06-151-1/+1
| | | | | | | | | | | | Changed to QIODevice::isSequential() Reviewed-by: TrustMe
| * Fix wrong comparator in QSslCertificatePrivate::QByteArray_from_X509Markus Goetz2009-06-151-1/+1
| | | | | | | | | | | | | | | | | | Because less-than instead of less-or-equal-than was used, the last line of a PEM encoding was not built when the raw length was multiple of 64. Task-number: 256066 Reviewed-by: mariusSO
| * Rename nsCursorForQCursor -> qt_mac_nsCursorForQCursor.Morten Sørvig2009-06-154-4/+4
| | | | | | | | Reviewed-by: Richard Moe Gustavsen
| * BT Revert "Fix the behaviour of sql classes regarding quoted identifiers"Bill King2009-06-1515-536/+81
| | | | | | | | | | This reverts commit bb7bddc47dd0748b45d22180d9e3c8e5209010b3 due to forward binary compatibility issues in a point release.
| * Get rid of warningsAnders Bakken2009-06-141-2/+2
| | | | | | | | Reviewed-by: TrustMe
| * Fixed problems with the event handling in QCompleter on Mac.jasplin2009-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | On Mac, a new completer popup must initially have its show() method called rather than its hide() method. Otherwise the event handling done by the completer results in a bad state. On other platforms it doesn't matter. Reviewed-by: Richard Moe Gustavsen Task-number: 255374
* | QSslCertificate: lazy loading of some dataMarkus Goetz2009-06-161-5/+11
| | | | | | | | Reviewed-by: Andreas Aardal Hanssen
* | smaller optimisation in ::fromTransform() and fromScale()Lars Knoll2009-06-161-4/+6
| | | | | | | | | | | | | | We know the type of the transformation in these methods, so there is no point in setting a dirty flag for the type. Reviewed-by: Samuel
* | greatly speed up QTransform::mapRect() for projective transformsLars Knoll2009-06-161-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | The code so far was converting the rect to a painterpath, mapping that one and then taking the bounding rect. It is actually sufficient to simply map the four corners of the rectangle and take the bounding rect of these four points even in the projective case. Fix the MAP macro to be more correct for degenerated projective transformations. Reviewed-By: Samuel
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtMorten Sørvig2009-06-1619-65/+104
|\ \
| * | doc: Added info on two ways to customize the style.Martin Smith2009-06-162-10/+19
| | |
| * | attempt to compile on solarisKent Hansen2009-06-161-2/+2
| | |
| * | We should make sure the text cursor is visible when using input methods.Denis Dzyubenko2009-06-162-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | When typing directly text cursor is always visible (and if it isn't, the widget automatically scrolls to make it visible). It should work the same when typing using input methods. Task-number: 254766 Reviewed-by: trustme
| * | Fix for resetting DESKTOP_STARTUP_ID envvar.Denis Dzyubenko2009-06-162-16/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That was wrong to reset environment variable returned with a putenv since getenv returns a value only. This fix reverts to old behavior when unsetenv is not available and will leak 20 bytes once on qapplication initialization. This fixes 2f4ca8e06be0477503acf2a4bf38a1c76f52e5b1. Reviewed-by: Bradley T. Hughes
| * | Updated WebKit from /home/shausman/src/webkit/trunk to ↵Simon Hausmann2009-06-166-15/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | origin/qtwebkit-4.6-staging ( 751940f0f1fb2599250632d7f0a3ead3930466af ) Changes in WebKit since the last update: ++ b/WebKit/qt/ChangeLog 2009-06-16 David Boddie <dboddie@trolltech.com> Reviewed by Simon Hausmann. Doc: Fixed QWebPage::forwardUnsupportedContent documentation and added more information about Web plugins. * Api/qwebpage.cpp: * Api/qwebsettings.cpp: * docs/qtwebkit.qdoc: 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:
| * | doc: Fixed several qdoc errors.Martin Smith2009-06-165-17/+18
| | |
| * | Don't mark ItemHasNoContents items as dirty, ever.Andreas Aardal Hanssen2009-06-161-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGraphicsItem::ItemHasNoContents flag ensures that we don't have to ever paint this item. So let's not mark it as dirty at all (items are marked as dirty when updated, moved, or transformed). This is a minor optimization. Reviewed-by: bnilsen
| * | Early exit from QRegion::intersects() if there is only one rect.Andreas Aardal Hanssen2009-06-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't waste cycles with constructing a vector with rectangles if there is only one rectangle in the source region. Same as 36ff1b507bf2d509019ae8ddd638922b09755c6b, but for QRegion::intersects(QRect). Reviewed-by: bnilsen
| * | Early exit from QRegion::intersects() if there is only one rect.Andreas Aardal Hanssen2009-06-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Don't waste cycles with constructing two vectors with rectangles if there is only one rectangle in each of the two regions. Reviewed-by: Lars Reviewed-by: bnilsen
* | | Implement QMenu::separatorsCollapsible on Mac/Cocoa.Morten Sørvig2009-06-162-12/+52
|/ / | | | | | | | | | | | | | | | | | | Hide duplicate separators and separators at the beginning and end of the menu. The main challenge here is that separators and "normal" menu items can be added in any order, for example add all the separators first and then fill in the items. This means that we have to redo the visibility decision for separators above and below when adding normal items. Reviewed-by: Prasanth Ullattil
* | small refactoring so remote debugger can use the same codeKent Hansen2009-06-153-33/+52
| |
* | Optimization: Don't determine the expose if the item is invisible.Andreas Aardal Hanssen2009-06-151-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | If the item either sets the ItemHasNoContents flag, or if it's invisible but has child items that are not (and ignore parent opacity), then don't bother calculating the item's exposed view rect as the item will not get drawn anyway. This carves down the number of QTransform::mapRect operations by 25% when running the Declarative UI calculator transition. We'll proceed to removing such operations from the markDirty step as well. Reviewed-by: bnilsen
* | Fix build error on Mac (Cocoa 64)Prasanth Ullattil2009-06-151-1/+1
| | | | | | | | | | | | | | Using QSQLLEN instead of SQLINTEGER, similar to the one used in qGetIntData(). Reviewed-by: Jens Bache-Wiig
* | don't try to delete script object snapshots when debugger front-end is deletedKent Hansen2009-06-151-1/+0
| | | | | | | | | | | | | | | | | | | | The locals model is technically part of the debugger front-end. When it's deleted we will have detached (or are in the process of detaching) from the debugger target anyway, which means that the object snapshots will be cleaned up by the back-end itself. In any case we shouldn't be sending debugger commands from a destructor, since we're not in a stable state. For in-process debugging, we were lucky and this magically worked, but for out-of-process debugging it caused the debugger to crash.
* | Disabled the use of VERSION_1_3 GLX functions on HPUX.Carlos Manuel Duclos Vergara2009-06-151-4/+8
| | | | | | | | | | | | This is a compilation fix reported by pulse agent on HPUXi. Reviewed-by: Samuel
* | small refactoringKent Hansen2009-06-151-7/+10
| | | | | | | | Preparing to make it work with remote debugging.
* | doc: First review of QProxyStyle doc; mainly just corrected qdoc errors.Martin Smith2009-06-152-47/+97
| |
* | Fix build on windows.Prasanth Ullattil2009-06-151-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Fix build on WindowsAlexis Menard2009-06-151-1/+1
| | | | | | | | Reviewed-by:TrustMe
* | implement equality operator in a more sane wayLars Knoll2009-06-154-5/+56
| | | | | | | | | | | | | | | | | | | | | | | | Using qFuzzyCompare for checking whether two transformations are equal doesn't give us too much and is inconsistent with our other matrix classes. Using simple floating point equality is a lot faster as well. Added qFuzzyCompare overloads for QMatrix and QTransform to still allow for fuzzy comparisons. Reviewed-By: Samuel Rødal
* | Improve the speed of QDir, QFileInfo and QDirIterator.Alexis Menard2009-06-155-69/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch basically avoid to call too often currentFileInfo in QDirIterator. It replaces the QHash that was overkill in QFileInfo for caching filenames. The last part is reordering the matchesFilter to avoid stat as much as possible by using the power of && and filters that are set on QDirIterator. And it fixes some random "mistake". I have added a benchmark in QDir which test some use case with 10000 files in a dir. Written-with: Benjamin Reviewed-by: phartman
* | Enabled switching multisampling on/off in GL2 engine on desktop.Samuel Rødal2009-06-151-0/+14
| | | | | | | | | | | | | | Switching multisampling is not supported in GLES 2.0, but it's supported in GL 2.0 so we should do it on desktop at least. Reviewed-by: Trond
* | Re-enabled GL pixmap backend and window surface to work without GL2.Samuel Rødal2009-06-153-1/+15
| | | | | | | | | | | | | | GL window surface and GL pixmap backend should work with old GL engine as well, though not supported to the same degree. Reviewed-by: Trond
* | doc: Fixed several qdoc warnings.Martin Smith2009-06-151-1/+1
| |
* | Updated WebKit from /home/shausman/src/webkit/trunk to ↵Simon Hausmann2009-06-152798-92516/+236605
| | | | | | | | qtwebkit-4.6-snapshot-15062009 ( 65232bf00dc494ebfd978f998c88f58d18ecce1e )
* | Add detailed warning when idc fails.Prasanth Ullattil2009-06-151-0/+3
| | | | | | | | | | | | | | When idc fails to dump IDL, the input executable name is now displayed on the commnad line. Reviewed-by:TrustMe
* | Fix QPlainTextEdit auto testmae2009-06-151-1/+1
| | | | | | | | | | Width 0 was used as magic value to optimize the widget's startup and initial resize. We now use the illegal value -1 as magic value insetad.
* | Fixed minor doc typos.jasplin2009-06-151-3/+3
| | | | | | | | Reviewed-by: TrustMe
* | Stage 1 of incorporating database level precision policy.Bill King2009-06-1515-238/+311
| | | | | | | | | | | | | | | | Queries now ask the database object what precision they should be, allows for setting precision policies on sql models, where previously this was not available. Also fixes some failing precisionpolicy implementations, as well as working around the fact qstring can't convert from "123.00" to an int based type.
* | ControlPointRect is no longer a QRealRectAnders Bakken2009-06-141-1/+1
| | | | | | | | | | | | | | | | s/y2/bottom()/ Compile. Reviewed-by: TrustMe
generated by cgit v0.12 at 2025-01-03 23:23:10 (GMT)