summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-076-9/+12
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Make sure cancelling image loading cancels progress reporting.Martin Jones2009-05-076-9/+12
| |
* | Fix double-click.Warwick Allison2009-05-071-1/+0
|/
* Fix loading of components containing sub components through QmlDomKai Koehne2009-05-072-4/+3
| | | | | Pass a (optional) url to QmlDomDocument::load so that the compiler can find referenced components
* Get view to view transitions working properly... for PathView.Martin Jones2009-05-075-20/+97
|
* Add property view to the debuggerAaron Kennedy2009-05-075-3/+205
|
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-075-20/+20
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-0714-77/+368
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Use focus property, not active focus for control focusIan Walters2009-05-072-18/+9
| | | | | | | | | | | | | | | | | | | | | | | | ActiveFocus is misleading in QML, between KeyProxy and FocusRealm, an item with focus, but not activeFocus could still get keys. focus means 'I want key events'. Hence if focus is true, blink the cursor.
| * | KeyProxy to send to focused child of focus realms.Ian Walters2009-05-073-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | If a component is loaded into a focus realm, it is likely when specifying it as a target of a focus proxy the intent is to have it behave as if the focus proxy target had focus. This means for focus scopes, descend to find the focused descendent of that scope, rather than sending directly to the item itself.
* | | Add a QmlDebuggerStatus interface elements can use to interact with the debuggerAaron Kennedy2009-05-0710-10/+193
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-076-34/+168
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-072-3/+14
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Don't crashMartin Jones2009-05-072-14/+15
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-074-12/+41
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Viewing the same image twice showed no image the second time.Martin Jones2009-05-071-0/+11
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-0757-538/+833
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Add progress reporting to Image and use it in the flickr demo.Martin Jones2009-05-075-10/+86
| | | | |
| * | | | Doc.Martin Jones2009-05-061-11/+57
| | | | |
* | | | | Disable watcher table selectionAaron Kennedy2009-05-071-0/+1
| | | | |
* | | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-072-3/+14
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-074-12/+41
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0717-233/+500
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Use correct 'from' value for repeating animations.Michael Brasser2009-05-072-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Each loop, we need to check whether the user has set a from value, and if not get the current value.
* | | | | Add "watchers" to debuggerAaron Kennedy2009-05-076-40/+185
| |_|/ / |/| | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-073-11/+35
|\ \ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-0717-233/+500
| |\ \ \ \ | | | |/ / | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Fix QmlXmlListModel on property changes, on empty results.Warwick Allison2009-05-072-10/+34
| | | | | | | | | | | | | | | | | | | | Tags in flickr demo.
| * | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-0651-1260/+1535
| |\ \ \ \ | | | |/ / | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | default QGVWarwick Allison2009-05-061-1/+1
| | | | |
* | | | | Layouts should only modify items in their direction of operationAaron Kennedy2009-05-071-1/+6
| |_|/ / |/| | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0753-1275/+1550
|\ \ \ \ | | |/ / | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Fix typo.Michael Brasser2009-05-061-1/+1
| | | |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-0639-304/+332
| |\ \ \ | | |_|/ | |/| | | | | | kinetic-declarativeui
| | * | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-0659-864/+1850
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| | | * | Improved debug output for directfb:debugAnders Bakken2009-05-061-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include info on the primary surface pixelformat. Reviewed-by: TrustMe
| | | * | Pass the scale parameter as an int.Anders Bakken2009-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're just printout out the integer value anyway. Reviewed-by: TrustMe
| | | * | Make Scale publicAnders Bakken2009-05-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Needed for fallback warnings Reviewed-by: TrustMe
| | | * | Fix crash in QWebView when application has a style sheetMarkus Goetz2009-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task: 252796 Rev-By: Tor Arne
| | | * | Crash in QWidget::render when passing an untransformed QPixmap painter.Bjoern Erik Nilsen2009-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash only occurred on Windows and X11 when running with -graphicssystem raster. The reason is that the actual paint device in QRasterPaintEngine::begin() is changed to pixmap->data->buffer(), which means QPaintEngine::paintDevice() returns something else than what it was told to paint on (see cb0c899b56b84154f69ddc545991bc6ded96ab01) The root of the problem, however, was that we used a weird condition (painter->worldMatrixEnabled(), added in 345072b9 for Qt 4.4) to find the target device. We did that because the shared painter was completely different in 4.4. We refactored it in 4.5.0, and we can only trust QPaintEngine::paintDevice to be the target device. Auto-test included. Task-number: 252837 Reviewed-by: Trond
| | | * | QNetworkDiskCache: check if opening file succeedsBenjamin C Meyer2009-05-061-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QNetworkDiskCache::prepare() When QTemporaryFile::open fails, delete the cache item and return 0 rather then returning a closed device. And a spelling mistake in a qWarning() Reviewed-by: Peter Hartmann
| | | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Geir Vattekar2009-05-0611-27/+91
| | | |\ \
| | | | * | QGraphicsItem::setOpacity(0.0) does not trigger an update.Bjoern Erik Nilsen2009-05-063-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that we discarded update requests for fully transparent items, which is correct, but we even did that when the update was issued from QGraphicsItem::setOpacity. We don't have to, and shouldn't, consider the opacity in that case. Whenever we reach the fullUpdateHelper call in setOpacity it means we have to do an update regardless of the current opacity (oldOpacity was not 0.0 if the currentOpacity is 0.0). Auto-test included. Task-number: 252913 Reviewed-by: Andreas
| | | | * | Re-enabled antialiasing for large font sizes in OpenGL paint engine.Samuel Rødal2009-05-064-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 4.4 alphaMapForGlyph() would return valid images for any font size, but this was changed in 4.5, forcing us to use the path fallback instead. This lead to non-antialiased fonts when not using a multisample-enabled GL format. This patch re-introduces the alphaMapForGlyph() fallback in QFontEngine from 4.4 which uses the raster paint engine to draw the glyph. Task-number: 247083 Reviewed-by: Trond
| | | | * | Prevented X server crash when calling XFillPolygon with >200000 points.Samuel Rødal2009-05-061-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't know why the X server crashes, but it's reproducible both by us and customers so we should fall back to the raster paint engine to avoid the crash. Task-number: 244362 Reviewed-by: Trond
| | | | * | Fixed bug in QTabBar::setTabButton() for a scrolled tab bar.jasplin2009-05-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix ensures that the current tab is visible after calling setTabButton() on a scrolled tab bar. Reviewed-by: bnilsen Task-number: 252472
| | | | * | Added comment to QTextStream - clarification of the documentationMorten Engvoldsen2009-05-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explained why you cannot use QTextStream::atEnd with stdin. Task-number:251171
| | | | * | Fixing task 252319Thomas Hartmann2009-05-061-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is still not a perfect solution since it breaks 245347 again Task-number: 252319 Reviewed-by: Maurice
| | | * | | Doc: Updated docs for collision between QGraphicsItemsGeir Vattekar2009-05-061-8/+20
| | | |/ / | | | | | | | | | | | | | | | Task-number: 252287
| | | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Geir Vattekar2009-05-065-10/+19
| | | |\ \
generated by cgit v0.12 at 2024-10-25 15:41:16 (GMT)