summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0720-243/+547
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * 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
| * | | Shift QmlBindableValue data into d-ptrAaron Kennedy2009-05-064-25/+106
| | | |
| * | | Add an (unused) locations field to compiled dataAaron Kennedy2009-05-063-9/+22
| | | |
| * | | Improve parser line/column trackingAaron Kennedy2009-05-068-166/+210
| | | |
| * | | Track expression evaluation when debugging is enabledAaron Kennedy2009-05-064-33/+162
| | | |
* | | | 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.
* | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-061-2/+3
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Small fix. Rotation was not set back to 0 properly.Yann Bodson2009-05-061-2/+3
| | |
* | | 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
| | | * | 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
| | | * | Put the Dochwidget tabs on top as this was often requested.kh2009-05-061-0/+1
| | | | |
| | * | | 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-069-25/+61
| | |\ \
| | | * | fixed a typo in QPrintDialog documentationPierre Rossi2009-05-061-1/+1
| | | | |
| | | * | Fixes broken last tab page handling in case the search was hidden.kh2009-05-064-15/+42
| | | | |
| | | * | Optimize QCocoaView::registerDragTypes and mode switching in QtCreator.Morten Sørvig2009-05-063-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were registering the types each time drag and drop was enabled, which caused slowdowns when for example switching between the Edit and Debug modes in QtCreator. Instead, register the types on first enable and also when the custom types change. Add check to draggingEntered() that disables the drag if WA_DropSiteRegistered is false. Reviewed-by: nrc
| | | * | Moved the QT_BEGIN_NAMESPACE macro to the right place in qsslcipher.cppThiago Macieira2009-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 252298 Reviewed-by: Peter Hartmann
| | * | | Doc: Added links to Text Object Example in QTextDocument and QTextObjectGeir Vattekar2009-05-062-2/+2
| | |/ / | | | | | | | | | | | | Task-number: 244858
| | * | Doc: Said that QTextCursor is an implicitly shared class inGeir Vattekar2009-05-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | QTextCursor::operator= Task-number: 247955
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Geir Vattekar2009-05-0625-1465/+1567
| | |\ \
| | | * | QComboBox: Click-drag-release does not work for combo boxes using CocoaRichard Moe Gustavsen2009-05-061-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that the mouse event was redirected to the active pop-up, while it should have been redirected to the widget under the mouse under the active popup. This patch does the correct redirection Task-number: 252259 Reviewed-by: Trenton Schulz
| | | * | Mac OS X QWidget::setMinimumSize locks.Richard Moe Gustavsen2009-05-062-43/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was code for updating the size constrains inside setConstraints_sys. This is now added. Factored out the code that does this into a function, and since we never applied size constraines on a window upon creation, I also added an extra call from that code part Task-number: 219695 Reviewed-by: Trenton Schulz
| | | * | Fixed scrolling performance issue related to hidden blocksmae2009-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a wrong lookup (confusing line and block number) the scroll optimization was broken, causing the entire view to be updated. Reviewed-by: Thorbjørn Lindeijer
| | | * | Fixed some inconsistencies for image drawing on non-integer coords.Samuel Rødal2009-05-064-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use aliased coordinate delta for image drawing. Related to change fde7475bcf9c10522a8170e6eb8fb9a8fadc21cd. Task-number: 251561 Reviewed-by: Trond
| | * | | Doc: Updated QImageReader::supportedImageFormat() to include SVGGeir Vattekar2009-05-061-0/+1
| | | | | | | | | | | | | | | | | | | | Task-number: 252415
| * | | | Fix crash in QWebView when application has a style sheetMarkus Goetz2009-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task: 252796 Rev-By: Tor Arne
generated by cgit v0.12 at 2024-10-24 16:29:10 (GMT)