summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Optimized fast scaling of ARGB8565 images onto RGB16 images.Samuel Rødal2009-05-271-1/+58
| | | | | | | There was an optimized blend function for this case but not an optimized scale function. Performance increase seems to be in the order of 5x. Reviewed-by: Trond
* Integrate merge-request #504 into branch 'master'Simon Hausmann2009-05-271-81/+81
|\ | | | | | | | | | | | | | | | | | | | | Frederik Schwarzer (4): wording: Warnung -> Achtung wording: Voransicht -> Vorschau wrong translation of the Chinese writing systems quite a bunch of fixes and suggenstions Request-url: http://qt.gitorious.org/qt/qt/merge_requests/504 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * quite a bunch of fixes and suggenstionsFrederik Schwarzer2009-05-221-72/+72
| | | | | | | | | | If it comes to unification in wording style, there is a long road ahead...
| * wrong translation of the Chinese writing systemsFrederik Schwarzer2009-05-221-2/+2
| | | | | | | | | | The translations for Traditional and Simplified Chinese are Chinesisch (Langzeichen) and Chinesisch (Kurzzeichen)
| * wording: Voransicht -> VorschauFrederik Schwarzer2009-05-221-2/+2
| |
| * wording: Warnung -> AchtungFrederik Schwarzer2009-05-221-5/+5
| |
* | Integrate merge-request #525 into branch 'master'Simon Hausmann2009-05-272-1519/+1515
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Ritt Konstantin (1): Update Russian translation for Qt libraries (xmlpatterns and statemachine are not translated yet) Request-url: http://qt.gitorious.org/qt/qt/merge_requests/525 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * | Update Russian translation for Qt libraries (xmlpatterns and statemachine ↵Ritt Konstantin2009-05-242-1519/+1515
| | | | | | | | | | | | are not translated yet)
* | | Integrate merge-request #526 into branch 'master'Simon Hausmann2009-05-272-229/+237
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | axasia (1): Update japanese translation of Qt Linguist. Request-url: http://qt.gitorious.org/qt/qt/merge_requests/526 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Merge commit 'c95384106fc69c2e78db20a10e8bedc14f3c58d5' into HEAD
| * | | Update japanese translation of Qt Linguist.axasia2009-05-242-229/+237
| |/ /
* | | A few html code generator fixes.Martin Smith2009-05-271-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | There was an empty <div> element with a name that came after it. I moved the name inside the <div> element. And there were some <b> elements that began inside one element and ended inside the next element. I just removed them, because they didn't really add anything. And I made the "Access functions:" bold.
* | | Make QGLWidgets have the same background colour as QWidgetsTom Cooksey2009-05-274-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | QWidgets are filled with Qt::transparent when WA_TranslucentBackground is set, reguardless of what their background colour has been set to. This patch makes QGLWidgets behave the same way. Reviewed-By: Samuel Rødal
* | | Add comparation of images with indexed colorBenjamin Poulain2009-05-272-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | Previously, two images with indexed colors were not equal if their color tables were not the same. The image are not compared by the value of the pixels Reviewed-by: Samuel
* | | Make WA_TranslucentBackground work on QGLWidget for X11Tom Cooksey2009-05-275-15/+146
| | | | | | | | | | | | | | | | | | | | | This patch enables QGLWidget's to have an ARGB visual on X11, alowing GL rendering on semi-transparent windows. Reviewed-By: Trond
* | | Avoided expensive image upload for GL pixmap backend for QPixmap::fill.Samuel Rødal2009-05-274-11/+59
| | | | | | | | | | | | | | | | | | | | | In the fill case we can simply set a flag saying the pixmap needs to be filled, and then when painting on the pixmap we start by filling the background using glClear via the existing QGLDrawable::autoFillBackground interface.
* | | Fixed bugs in GL2 paint engine when several engines are active.Samuel Rødal2009-05-274-33/+41
| | | | | | | | | | | | | | | | | | | | | Make sure makeCurrent() on a window surface unbinds any active FBO, and simplify ensureActive() code in GL2 paint engine a bit. We don't need the last_engine pointer as ensureActive() will take care of ensuring the correct engine is active anway.
* | | Optimized QRasterPixmapData::metric.Samuel Rødal2009-05-271-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid needless DPI calculations when not needed, and simplify the DPI calculations to the point where most of the operations disappear. Also avoid calling QImage::metric() so that we don't need to go through two switch statements and an extra function call just to get the width of a pixmap. Reviewed-by: Trond
* | | Avoid deep copies of pixmaps when using cache in QGraphicsView.Alexis Menard2009-05-274-13/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we have already a pixmap of an item in the cache, we should remove the entry from the cache otherwise when we will repaint/modify the copy of the pixmap (the copy of the cache) then we will trigger a deep copy ; this is because both entries in the cache and our copy share the same data and if you modify one of them a copy is triggered. I have added a benchmark as well to test that. Reviewed-by:bnilsen Reviewed-by:andreas
* | | small refactor to change the interpolator at the same time as theThierry Bastian2009-05-274-34/+40
| | | | | | | | | | | | current interval in the variant animations
* | | Do not use the locale in QDoubleSpinBoxPrivate::roundOlivier Goffart2009-05-271-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had a report from a customer saying this breaks if the decimal separator is the same as the group separator. This is not really something we want to support, but because this fix is easy and cleanup the code I decided to fix it. Reviewed-by: Thierry Task-number: 253962
* | | Add a flag that ensure that a connection is made only oneOlivier Goffart2009-05-275-19/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is often desirable, when doing connection, to ensure that the same connection is only made once. This can be done with the Qt::UniqueConnection 'flag' Also documented the order the slot are called Reviewed-by: Brad
* | | Use GLInt and not uint because of Apple's old header swapMartin Smith2009-05-271-1/+1
| | |
* | | Fix WinCE compile error not fixed by c666b88Jason McDonald2009-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | You can't implicitly convert QLatin1Char to QString and thus neither to QFileInfo. Instead do the conversion the correct way, as illustrated by the code five lines above the line that broke. Reviewed-by: Lincoln Ramsay Reviewed-by: Andy Shaw
* | | Fixed crash when encountering invalid forms.Friedemann Kleint2009-05-261-1/+4
| | | | | | | | | | | | | | | | | | | | | Crash when replacing the QDockWidget contents widget by a widget using a container extension. Task-number: 254553
* | | doc updateThierry Bastian2009-05-262-40/+186
| | | | | | | | | | | | no more warnings while generating the docs
* | | some cleanups on private exported symbolsThierry Bastian2009-05-2613-41/+14
| | |
* | | Mac: Prefix sat in qt.conf is ignored on MacRichard Moe Gustavsen2009-05-261-8/+8
| | | | | | | | | | | | | | | | | | | | | Fix: Make sure to add the prefix to the value we return in QLibraryInfo Task-number: 254545 Reviewed-by: Trenton Schulz
* | | A GLint is converted to int for passing to qBound().Martin Smith2009-05-261-1/+1
| | |
* | | We first remove the pixmap from the cache and then release the keyAlexis Menard2009-05-262-1/+11
| | | | | | | | | | | | | | | | | | | | | If we don't remove the pixmap from QCache first then the key is invalid and the removal failed Reviewed-by: sroedal
* | | Windows CE compile fixJoerg Bornemann2009-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | QFileInfo doesn't have a constructor for QLatin1Char and implicit conversion didn't work. Reviewed-by: Thierry
* | | Fixed a bug in animation when you set a start value that doesn't haveThierry Bastian2009-05-262-22/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | the same type as the property For example, if you set a start value of 0 (integer) for a qreal animation, it would not work. Reviewed-by: janarve
* | | Fixed keywords signals and slots to Q_SIGNALS and Q_SLOTSThierry Bastian2009-05-264-4/+4
| | |
* | | Fix the previous fix.Jan-Arve Sæther2009-05-261-177/+5
| | | | | | | | | | | | | | | The previous fix fails on msvc-2005, since QString::setNum() does not handle rounding of numbers such as 0.015625 consistently.
* | | Fix doc warnings for PhononThierry Bastian2009-05-261-2/+30
| | |
* | | Fixed docs warnings for Animation APIThierry Bastian2009-05-263-6/+15
| | |
* | | Fix build failure on MacOS 10.4Tom Cooksey2009-05-261-3/+3
| | | | | | | | | | | | | | | | | | It seems GLint is typedefed to long on 10.4. Reviewed-By: Rhys Weatherley
* | | Protect dump function by ifdef.Ian Walters2009-05-252-1/+11
| | | | | | | | | | | | | | | Use the same pattern for protecting the dump function as qmap.h and qhash.h employ.
* | | implement --locations option (complementing lupdate)Oswald Buddenhagen2009-05-252-1/+18
| | |
* | | implement --no-ui-lines option (complementing lupdate)Oswald Buddenhagen2009-05-253-0/+28
| | |
* | | remove now unused static functionOswald Buddenhagen2009-05-251-11/+2
| | | | | | | | | | | | sneak in white space change :)
* | | Fix all docs warnings and add since 4.6 to new methodsAlexis Menard2009-05-251-7/+22
| | | | | | | | | | | | Reviewed-by:TrustMe
* | | Fixed insertion of unnecessary spaces at the end of attribute listsThorbjørn Lindeijer2009-05-251-3/+2
| | | | | | | | | | | | | | | | | | | | | Also makes QDomDocument::toString() consistent with QXmlStreamWriter and xmlTextWriter from libxml2. Reviewed-by: Thiago Macieira
* | | Some refactoring of windows specific code + a private class of animationsThierry Bastian2009-05-258-82/+56
| | |
* | | Removed some export to symbols that don't need itThierry Bastian2009-05-259-62/+25
| | | | | | | | | | | | ...hopefully
* | | qdoc: Fixed non-well-formed XML.David Boddie2009-05-252-1/+2
| | | | | | | | | | | | Reviewed-by: Martin Smith
* | | Fix a warning on MSVCThierry Bastian2009-05-251-1/+1
| | |
* | | Compile fixThierry Bastian2009-05-252-2/+2
| | |
* | | Added QT_NO_ANIMATION to qfeaturesThierry Bastian2009-05-252-4/+17
| | | | | | | | | | | | | | | Now you can opt it out to save disk space (for embedded). Also tested it and fixed code in state machine.
* | | Warnings fixed on MSVCThierry Bastian2009-05-251-1/+3
| | | | | | | | | | | | simply added Q_UNUSED for parameters that weren't used in a function
* | | Fixed 'crazy' warnings about using a string instead of a characterThierry Bastian2009-05-2573-223/+220
| | | | | | | | | | | | | | | | | | | | | Wherever I found that we were using a string instead of a single char I fixed the code. Reviewed-by: olivier