summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* docWarwick Allison2009-05-071-2/+3
|
* Forgot progress bar.Martin Jones2009-05-071-0/+25
|
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-076-20/+60
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Tweaks to viewer.Michael Brasser2009-05-073-6/+34
| |
| * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-072-0/+280
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Add missing 'Quit' menu item.Yann Bodson2009-05-071-0/+6
| | |
| * | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0734-579/+86
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0720-243/+547
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Use correct 'from' value for repeating animations.Michael Brasser2009-05-073-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | Each loop, we need to check whether the user has set a from value, and if not get the current value.
* | | | | Don't crashMartin Jones2009-05-072-14/+15
| | | | |
* | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-0735-575/+346
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-05-071-1/+6
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-0716-37/+66
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Layouts should only modify items in their direction of operationAaron Kennedy2009-05-071-1/+6
| | | | | |
| * | | | | Use VisualModelYann Bodson2009-05-071-0/+274
| | |/ / / | |/| | |
| * | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-0738-784/+561
| |\ \ \ \ | | |/ / / | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Remove phonebrowser demo. Flickr is better.Aaron Kennedy2009-05-0717-537/+0
| | | | |
| * | | | Fix QmlXmlListModel on property changes, on empty results.Warwick Allison2009-05-074-14/+48
| | | | | | | | | | | | | | | | | | | | Tags in flickr demo.
| * | | | docWarwick Allison2009-05-071-2/+2
| | | | |
| * | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-06109-2063/+2469
| |\ \ \ \ | | | |/ / | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | white background no good in web page, go grayWarwick Allison2009-05-069-7/+7
| | | | |
| * | | | default to QGVWarwick Allison2009-05-061-5/+0
| | | | |
| * | | | default QGVWarwick Allison2009-05-061-1/+1
| | | | |
| * | | | namespaces docWarwick Allison2009-05-061-8/+8
| | | | |
* | | | | Viewing the same image twice showed no image the second time.Martin Jones2009-05-073-3/+17
| | | | |
* | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-0779-605/+1220
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Fix z handling to avoid uglynessAaron Kennedy2009-05-071-4/+14
| | |_|/ | |/| |
| * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-073-10/+47
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-05-0758-358/+659
| | |\ \ \ | | | | |/ | | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Add simple menubar to qmlviewer.Yann Bodson2009-05-073-10/+47
| | | | |
| * | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-07113-2080/+2487
| |\ \ \ \ | | | |/ / | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-061-2/+3
| | |\ \ \ | | | |/ / | | | | | | | | | | 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-0657-357/+658
| | |\ \ \ | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| | | * \ \ Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-0679-910/+2264
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Nils Christian Roscher-Nielsen2009-05-061-1/+1
| | | | |\ \ \
| | | | | * | | Fix crash in QWebView when application has a style sheetMarkus Goetz2009-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: 252796 Rev-By: Tor Arne
| | | | * | | | Fixed typo in README fileNils Christian Roscher-Nielsen2009-05-061-1/+1
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie <dboddie@trolltech.com>
| | | | * | | Crash in QWidget::render when passing an untransformed QPixmap painter.Bjoern Erik Nilsen2009-05-062-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Geir Vattekar2009-05-061-2/+6
| | | | |\ \ \
| | | | | * | | 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
| | | | * | | | Doc: Added info on NOTIFY to the Q_PROPERTY docs.Geir Vattekar2009-05-062-1/+7
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | Task-number: 248336
| | | | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Geir Vattekar2009-05-0614-29/+186
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Andy Shaw2009-05-064-16/+102
| | | | | |\ \ \
| | | | | | * | | QGraphicsItem::setOpacity(0.0) does not trigger an update.Bjoern Erik Nilsen2009-05-064-16/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | * | | | Adds in documentation for RESOURCESAndy Shaw2009-05-061-0/+7
| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kavindra Palaraja <kavindra.palaraja@nokia.com>
| | | | | * | | 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