summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Use QTransform more efficiently.Bjørn Erik Nilsen2009-06-1817-69/+41
| | | | Reviewed-by: Samuel
* Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-187-35/+64
|\ | | | | | | | | | | | | Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
| * Fixed a problem with QSvgRenderer::animationDuration().Trond Kjernåsen2009-06-181-0/+1
| | | | | | | | | | | | | | May have returned random values for SVGs without animation tags. Task-number: 256073 Reviewed-by: Kim
| * QNAM HTTP code: Do not close TCP connection in all casesMarkus Goetz2009-06-181-1/+2
| | | | | | | | | | | | | | | | | | | | This makes sure the keep-alive connections stay open even if someone deletes a QNetworkReply which will then go all the way down to removeReply(QHttpNetworkReply). Should fix http://lists.trolltech.com/pipermail/qt-interest/2009-June/007777.html Reviewed-by: Peter Hartmann
| * QItemEditorFactory: made sure the ownership is taken on theThierry Bastian2009-06-181-2/+14
| | | | | | | | | | | | | | | | | | | | QItemEditorCreator The creators were not deleted i nthe destructor of QItemEditorFactory and they could not be safely used for more than one type. Task-number: 228255 Reviewed-by: jasplin
| * Made QInputDialog::getText() return null QString when rejectedStian Sandvik Thomassen2009-06-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This reverts a behavior change introduced with Qt 4.5.0 where QInputDialog::getText() returned the line edit's text when the dialog was rejected. However, the behavior since Qt 4.0 has been to return a null QString when the dialog is rejected. Task-number: 256299 Reviewed-by: Andy Shaw
| * Fixed bugs in QPainterPath::united().Samuel Rødal2009-06-171-27/+42
| | | | | | | | | | | | | | | | | | | | Change from a relative to an absolute fuzzy compare as was the case pre-4.4. With a relative fuzzy compare points that have an x or y coordinate of 0 will never be merged with points that are very close to 0, for example (1e-15, 0). Task-number: 251909 Reviewed-by: Trond
| * Fixed segmentation fault caused by empty clip.Samuel Rødal2009-06-172-2/+2
| | | | | | | | | | | | | | | | Make sure not to use the broken QRect constructor, and do an early check on whether the clip rect is empty in QRasterizer::rasterizeLine(). Task-number: 254105 Reviewed-by: Trond
| * ItemViews : Fixed a performance regression whne changing data in theThierry Bastian2009-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | model This is a part of a bigger patch from 4.6 90cdbf8bd409652fd1e28adcd7f02fc1fae2c1c0 Task-number: 256183 Reviewed-by: ogoffart
| * Fixed a bottleneck in itemviews that would ask for an update outsideThierry Bastian2009-06-171-2/+8
| | | | | | | | | | | | | | | | | | | | of the boundaries of the viewport. Now we catch this and don't call update. This was a performance regression against 4.4. Task-number: 256183 Reviewed-by: alexis
* | Don't initialize data that will be overwritten immediately.hjk2009-06-184-20/+10
| | | | | | | | Reviewed-by: mariusSO
* | Use enum Qt::Uninitialized instead of struct QString::Uninitializedhjk2009-06-183-4/+3
| | | | | | | | | | | | | | There is no BC issue as the changed constructor was introduced recently and there is no released version of Qt using it. Reviewed-by: mariusSO
* | QFontDialog: fixed the current font not being updatedThierry Bastian2009-06-181-11/+0
| | | | | | | | | | | | | | | | This could happen when the list of styles depending on the font is different from the font you selected before. It then is not updated and the style of the font returned by the QFontDialog is wrong. Task-number: 256466
* | Make construction of unitialized QTransform/QMatrix a no-op.Bjørn Erik Nilsen2009-06-185-0/+15
| | | | | | | | | | | | | | | | | | | | These constructors are useful when you have to create a temporary uninitialized QTransform/QMatrix and later initialize it to something else. Done with Lars. Reviewed-by: samuel
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGeir Vattekar2009-06-188-14/+111
|\ \
| * | Prevented unnecessary depth clip updates in OpenGL paint engine.Samuel Rødal2009-06-182-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Keep track of whether the depth clip has actually changed between states, so that when QPainter::restore() is called we don't call the potentially expensive updateDepthClip() function when not needed. Task-number: 254658 Reviewed-by: Trond
| * | Added save state detection in OpenGL engine to avoid dirtying state.Samuel Rødal2009-06-181-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | When setState() is called right after createState() it means that none of the OpenGL state needs changing, so we can simply return. Task-number: 254658 Reviewed-by: Trond
| * | QMenuBar: fixed highlight problem on actions without menuThierry Bastian2009-06-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | An item without menu could stay highlighted even when the mouse left the menu bar. Task-number: 256322 Reviewed-by: alexis
| * | Compile on MSVC.Bjørn Erik Nilsen2009-06-182-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | The QtSVG module failed to link because it includes qgraphicsitem_p.h, which had an inlined function (updateHelper) that called an undeclared function (QGraphicViewPrivate::update(Region|Rect))...Resulting in unresolved symbols. Reviewed-by: MariusSO
| * | doc: Added explanation of QStringBuilder in QStringMartin Smith2009-06-182-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | The QStringBuilder class documentation is marked \internal. A section has been added to the documentation for QString that explains how to use the reimplemented '%' operator of QStringBuilder to obtain more efficient string concatenation operations.
| * | Fix accidental selection of popup items under the mouse in QComboBoxmae2009-06-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the widget under mouse is hidden, Qt can generate a synthetic mouse move event which gets delivered to the already hidden widget. This can then result in the wrong item being selected. Workaround: in QListView, ignore mouse move events when the widget is hidden. Reviewed-by: Denis
| * | Remove wrong negation.Bjørn Erik Nilsen2009-06-181-1/+1
| | | | | | | | | | | | | | | I changed the logic in e920c83084b48db7fe1925c7b98e34794eec6d55 and this negation incidentally snuck in.
* | | Doc: Removed mention of QItemAnimation from animation docs and setGeir Vattekar2009-06-181-0/+1
|/ / | | | | | | | | | | QPropertyAnimation as a main class. Reviewed-by: Trust Me
* | Fix a couple of issues after QPixmapData optimsAnders Bakken2009-06-184-23/+20
| | | | | | | | | | | | | | | | Make sure we always set w, h and d. See fa8030a935acaacee570eee320e7510a4cfdc853 Reviewed-by: TrustMe
* | Small optimization to QGraphicsScenePrivate::drawSubtreeRecursive.Bjørn Erik Nilsen2009-06-171-1/+5
| | | | | | | | We save three function calls by calling item->paint() directly.
* | Speedup QGraphicsScenePrivate::processDirtyItemsRecursiveBjørn Erik Nilsen2009-06-172-13/+20
| | | | | | | | Avoid QTransform copy in common case.
* | Speedup QGraphicsScenePrivate::processDirtyItemsRecursiveBjørn Erik Nilsen2009-06-171-13/+16
| | | | | | | | Don't calculate dirty scene transforms for invisible items.
* | Sometimes broken transforms in GV.Bjørn Erik Nilsen2009-06-171-4/+4
| | | | | | | | | | | | Broken after: 85f811b849f3b0e0b79e0f1b7bf41512d7f53414 QPainter::worldTransform returns a const reference(!) so we have to make a copy.
* | Reduce QTransform operations in QGraphicsView::paintEvent.Bjørn Erik Nilsen2009-06-171-9/+18
| | | | | | | | | | | | | | The view is usually untransformed, and in that case there's no need to call QGraphicsView::viewportTransform() and QPainter::setWorldTransform(). Reviewed-by: Andreas
* | Remove two work-arounds in QGraphicsView::paintEvent.Bjørn Erik Nilsen2009-06-171-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | The accelerate scrolling work-around is fixed by: 8ebe882b077fffedc3ff80fb80d2e181d5e56ab8 The other case was trying to avoid doing expensive QRegion calculations when everything must be repainted anyways. However, it was not entirely correct to assume all paintEvents are triggered by GV itself. Anyways, we don't need it anymore :-) Reviewed-by: Andreas
* | QNAM: More comments, some renamingsMarkus Goetz2009-06-177-34/+50
| | | | | | | | | | | | | | Renamed some classes and member variables. Their names were causing confusion before because. Reviewed-by: Peter Hartmann
* | Fixes: Tablet not sending mouse release events.Thomas Zander2009-06-171-61/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | Rewrote the usage of XCheckTypedWindowEvent to now use a XCheckIfEvent based scanner. Using XCheckTypedWindowEvent caused us to sometimes hop over relevant events while doing compression. So we could end up merging a tablet move event with another tablet move event even while there was a mouse-release event between them. This rewrite makes sure we stop merging when needed. Task: 249606 Reviewed-by: Bradley T. Hughes
* | Fix tst_QGraphicsItem::opacityZeroUpdatesBjørn Erik Nilsen2009-06-171-0/+6
| | | | | | | | | | Child items must ignore visible/opacity if parent does. Broke after: c9ab7a8b8504101c06456b706a84e0eb0693c77e
* | QNAM: Added comment to de-confuse myselfMarkus Goetz2009-06-171-0/+1
| | | | | | | | I mixed this up several times before, so here is the comment for it.
* | QSslCertificate: Doc fixMarkus Goetz2009-06-171-3/+4
| | | | | | | | Change doc that refered to functions that got renamed
* | Speedup QGraphicsScenePrivate::processDirtyItemsRecursive.Bjørn Erik Nilsen2009-06-175-42/+77
| | | | | | | | | | | | | | | | Don't process invisible items or items with no contents. I've also added cut-offs to QGraphicsViewPrivate::update(Region|Rect) to make sure update areas outside the viewport are discarded immediately. Reviewed-by: lars
* | make sure __FILE__ and __LINE__ properties are restored correctlyKent Hansen2009-06-171-4/+6
| | | | | | | | Task-number: 256184
* | fix crash when detach()ing a debugger and then evaluating script print() ↵Joel Nordell2009-06-172-7/+14
| | | | | | | | | | | | | | function Merge-request: 554 Reviewed-by: Kent Hansen <khansen@trolltech.com>
* | reset debugger's state correctly when previous engine was deletedKent Hansen2009-06-171-15/+15
| | | | | | | | | | | | If the engine was deleted, the agent will be 0, but we still want to fall through rather than return immediately, so that the other variables are reset correctly.
* | QIoDevice and QAbstractSocket: Clarify doc about waitForReadyRead()Markus Goetz2009-06-172-4/+4
| |
* | kill some includes not needed anymoreKent Hansen2009-06-171-4/+0
| | | | | | | | The debugger is completely abstracted from QScriptEngine, whee
* | fix the QScriptEngineDebugger::state() logic, add test, improve docsKent Hansen2009-06-171-2/+5
| |
* | add a state() function to QScriptEngineDebugger for determining whether the debuJoel Nordell2009-06-174-0/+36
| | | | | | | | | | | | | | gger is suspended or not Merge-request: 555 Reviewed-by: Kent Hansen <khansen@trolltech.com>
* | Phonon::VolumeSlider: Fixed the isMuteVisiblefunctionThierry Bastian2009-06-171-1/+1
| | | | | | | | | | | | | | | | | | The problem is that it was relying on button->isVisible whereas it should rely on isHidden. isVisible returns false initially when the whole widget is not yet shown. I also added an autotest for it. Task-number: 256331
* | Speed up QPixmap::width(), height(), isNull() and depth().Andreas Aardal Hanssen2009-06-1712-52/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves the w, h, d variables to QPixmapData and introduces is_null to keep track of nullness. This is possible only because QPixmapData is internal API; otherwise we'd have to be smarter. The optimization makes the QPixmap::width() function take 7 instructions, down from 34 before. For the calculator demo in the declarative ui branch this reduces a block of 750000 instructions (out of 30000000) to around 100000-150000 instructions. Tested on Windows, Linux, Mac. Raster, X11 and OpenGL paint engines. Have not tested the DirectFB engine. Reviewed-by: Trond
* | perform all property assignments of initial state that's nestedKent Hansen2009-06-171-2/+2
| | | | | | | | | | | | If the machine's initial state is nested, a set of states will be entered, and we need to do the property assignments of all of them.
* | QWebPage: Don't call supportsSsl()Markus Goetz2009-06-171-2/+6
| | | | | | | | | | | | | | This stops QWebPage from loading the OpenSSL libs, certificates etc. when they are not needed for the non-HTTPS case. Reviewed-by: Simon Hausmann
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtFriedemann Kleint2009-06-177-8/+35
|\ \
| * | bring back QAbstractTransition::triggered() signalKent Hansen2009-06-174-0/+23
| | | | | | | | | | | | | | | | | | It's been requested by several users. Since we have QAbstractState::{entered,exited}() signals, we should have this one as well.
| * | Prevented infinite recursion in GL graphics system.Samuel Rødal2009-06-173-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If creating a QGLWidget triggers the creation of a QPixmap then we might end up in an infinite recursion due to QPixmap trying to access qt_gl_share_widget(). This can happen via setWindowIcon for example. Adding an initializing flag to QGLGlobalShareWidget and preventing QGLFramebufferObject::hasOpenGLFramebufferObjects() and ::hasOpenGLFramebufferBlit() from creating a QGLWidget every time they are called with no active GL context. Reviewed-by: Trond