summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Resolved merge conflict in state machine overviewGeir Vattekar2009-06-181-125/+16
| | | | Reviewed-by: Trust Me
* Fix nasty qt3-qt4 porting trap: for a QStringList, lst.remove(lst.at(idx)) ↵David Faure2009-06-181-2/+2
| | | | | | used to only remove one item in Qt3, while it removes all occurrences of the item in Qt4 (remove==removeAll). To catch it I commented out remove(T) in my qlist.h, which caught this. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* 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
* Compile fix on HP-UXAndreas Aardal Hanssen2009-06-171-1/+1
| | | | Explicit casts make aCC happy.
* 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-172-8/+8
| | | | 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>
* Autotests: fix compile issues on HPUXThierry Bastian2009-06-172-45/+44
|
* reset debugger's state correctly when previous engine was deletedKent Hansen2009-06-172-15/+23
| | | | | | 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.
* Autotest: fixed compile issues on hp compilerThierry Bastian2009-06-172-25/+23
|
* 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-172-2/+7
|
* 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>
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtFriedemann Kleint2009-06-172-1/+24
|\
| * Phonon::VolumeSlider: Fixed the isMuteVisiblefunctionThierry Bastian2009-06-172-1/+24
| | | | | | | | | | | | | | | | | | 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
* | Fixed an oversight in Qt Designer that prevents one from designing empty tab ↵J-P Nurmi2009-06-171-5/+7
| | | | | | | | | | | | widgets. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Fixed an oversight in Qt Designer that prevents one from designing empty ↵J-P Nurmi2009-06-171-4/+7
|/ | | | | | stacked widgets. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* 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-172-13/+21
| | | | | | 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-178-8/+46
|\
| * bring back QAbstractTransition::triggered() signalKent Hansen2009-06-175-0/+25
| | | | | | | | | | | | 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
| * add tests for QAbstractState::{entered,exited}() signalsKent Hansen2009-06-171-0/+9
| |
* | Commented out code that breaks MinGW.Friedemann Kleint2009-06-171-1/+16
| | | | | | | | Reviewed-by: Simon Hausmann <shausman@trolltech.com>
* | Fixed MinGW compilation.Friedemann Kleint2009-06-171-1/+1
|/ | | | Reviewed-by: Simon Hausmann <shausman@trolltech.com>
* prevent subclasses from emitting entered() and exited()Kent Hansen2009-06-171-0/+3
| | | | The state machine decides when these signals are emitted.
* doc: Fixed several qdoc warnings.Martin Smith2009-06-173-36/+45
| | | | | | | | All the qdoc errors are fixed in QStringBuilder, but because the class is a template class and uses strange templates, qdoc gets very confused, and the resulting documentation for QStringBuilder is not complete and accurate. To fix this correctly will require changes to the qdoc program.
* Fix QGraphicsItem::ItemHasNoContents rendering of children.Andreas Aardal Hanssen2009-06-172-2/+30
| | | | | | | The ItemHasNoContents flag was preventing items that clip their children from rendering their children at all. Fixed now. Reviewed-by: bnilsen
* QNAM: Use QTcpSocket for HTTP if no encryption was requestedMarkus Goetz2009-06-171-9/+26
| | | | | | | This stops QNetworkAccessManager from loading the OpenSSL libs, certificates etc. when they are not needed for the non-HTTPS case. Reviewed-by: mariusSO
* Update license headers in files that are new in 4.6.Jason McDonald2009-06-17249-497/+497
| | | | Reviewed-by: Trust Me
* fix typoOswald Buddenhagen2009-06-161-1/+1
|
* Fixed a bottleneck in itemviews that would ask for an update outsideThierry Bastian2009-06-161-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
* Removed trailing whitespace.Bruno Abinader2009-06-165-116/+113
| | | | | | | Signed-off-by: Bruno Abinader <bruno.abinader@openbossa.org> Merge-request: 628 Reviewed-by: David Boddie <dboddie@trolltech.com>
* Fixed small typo on the animation framework documentation.Bruno Abinader2009-06-161-5/+6
| | | | | | | | | | QAbstractClass is in fact QAbstractTransition, also added proper link to the addAnimation() method from that class. Signed-off-by: Bruno Abinader <bruno.abinader@openbossa.org> Merge-request: 628 Reviewed-by: David Boddie <dboddie@trolltech.com>
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtVolker Hilsheimer2009-06-1656-197/+226
|\
| * Store promoted Widgets correctly in the ScratchPad.Friedemann Kleint2009-06-161-0/+10
| | | | | | | | | | | | | | Add code to make promoted widget entries to widget DB to widget box form builder. Task-number: 233683
| * 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
generated by cgit v0.12 at 2025-02-01 18:46:55 (GMT)