summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Fixed compile of scripttools with MSVC 2003.Rohan McGovern2009-06-131-0/+1
| | | | | | | Fixes compile error: debugging\qscriptdebuggercommand.cpp(567) : error C2664: 'QScriptDebuggerCommand::setAttribute' : cannot convert parameter 2 from 'const QStringList' to 'const QVariant &' Reason: cannot convert from 'const QStringList' to 'const QVariant' Source or target has incomplete type
* Fixed compile of Qt/Embedded.Rohan McGovern2009-06-131-2/+2
| | | | | | | Fixes compile error: kernel/qapplication_qws.cpp: In static member function 'static bool QApplicationPrivate::qws_apply_settings()': kernel/qapplication_qws.cpp:2014: error: no match for 'operator!' in '!QApplicationPrivate::styleOverride' kernel/qapplication_qws.cpp:2014: note: candidates are: operator!(bool) <built-in>
* Fixed compile of QtGui with MSVC.Rohan McGovern2009-06-121-1/+1
| | | | | MSVC requires the same linkage specifiers to be provided at both the declaration and definition.
* refactor some script debugger internalsKent Hansen2009-06-127-148/+363
| | | | Make it possible to reuse more code in remote debugger.
* Improved resetting the DESKTOP_STARTUP_ID envvar on X11Denis Dzyubenko2009-06-122-6/+23
| | | | | | | | | We shouldn't put static variable into the environment since it will crash if someone tries to access environment after Qt has been unloaded. Task-number: related to 217782 Reviewed-by: Bradley T. Hughes
* Fixed bitmap drawing in GL 2 engine when not using GL pixmap backend.Samuel Rødal2009-06-123-4/+8
| | | | | | | | | QPixmap shouldn't return true in hasAlphaChannel() for bitmaps, instead the paint engine should check whether the pixmap is a bitmap or not. In addition, QBrush::isOpaque() returned true for bitmap brushes, which is wrong according to the documentation. Reviewed-by: Trond
* CompileJens Bache-Wiig2009-06-123-0/+559
| | | | | | Adding missing files for proxy style after commit 4d0cc0b9600f8530bb0e8712b4bb109d1810c4a7 Reviewed-by: trust me
* make debugger console's auto-completion asynchronousKent Hansen2009-06-128-103/+196
| | | | Needed for remote debugging.
* Integrating QProxyStyleJens Bache-Wiig2009-06-1216-811/+871
| | | | | | | | | | | | This class adds convenient support for proxy styles in Qt. Note that to support proper proxying, styles now call their functions through proxy() so that the proxy regains control over subcomponents. Note that there is a small price to be payed by the extra function call which can at the cost of readability be redirected to the private class member in the future. Task-number: 229556 Reviewed-by: trond
* QTransform::shear cut-off.Bjørn Erik Nilsen2009-06-121-0/+3
| | | | | | Do nothing if both sh and sv is 0. Reviewed-by: Samuel
* Speedup QGraphicsItemPrivate::TransformData::computedFullTransformBjørn Erik Nilsen2009-06-122-10/+33
| | | | | | Do as little as possible and avoid premulitplication :) Reviewed-by: Samuel
* Fixed off-by-one color bug in GL 2 paint engine.Samuel Rødal2009-06-121-5/+5
| | | | | Calling premultiplyColor() with a red channel of 255, alpha channel of 255, and opacity 1 would result in a color with red channel of 254.
* make debugger's tooltip handling asynchronousKent Hansen2009-06-128-56/+110
| | | | Needed for remote debugging.
* fix bugs in the completion+tooltip providersKent Hansen2009-06-122-3/+2
|
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBjørn Erik Nilsen2009-06-1215-37/+223
|\
| * Fixed incorrect rendering of bitmap/pattern brushes in GL 2 engine.Samuel Rødal2009-06-126-9/+57
| | | | | | | | | | | | | | | | | | The pen color should be used when drawPixmap is called with a bitmap, and the brush color should be used for texture patterns that are bitmaps. Task-number: 245802 Reviewed-by: Trond
| * Made QPixmap autotest pass with -graphicssystem openglSamuel Rødal2009-06-124-15/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The window surface has been modified to track widget deletion to make sure it doesn't try to access the widget's context data after deletion. QGLPixmapData now also uses GL_RGB instead of GL_RGBA when appropriate, and hasAlphaChannel() has been modified in view of this. A number of other issues have been fixed in QGLPixmapData, and the autotest has been modified to use a more lenient pixmap compare function due to off-by-one pixel errors here and there. Reviewed-by: Trond
| * QHttp: Class made obsolete, changed module QDoc.Markus Goetz2009-06-121-3/+5
| | | | | | | | | | | | | | This should better communicate that new applications should use QNetworkAccessManager. Reviewed-by: David Boddie
| * doc: Fixed several qdoc warnings.Martin Smith2009-06-124-10/+79
| |