summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-11-091188-66970/+60694
|\
| * DFB: Make sure QPixmap::hasAlpha is respectedAnders Bakken2010-11-081-7/+27
| | | | | | | | | | | | | | | | | | An IDirectFBSurface can have an alpha channel for an opaque QPixmap. This change will make sure we don't blend unless QPixmap::hasAlpha returns true. Merge-request: 913 Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-0820-104/+85
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix build on mingw Fix some painting issues in QDirectFBPaintEngine QNAM: Do not need QNetworkSession in AlwaysCache load mode Don't crash if QScriptClass property getter returns an invalid value QNAM: Remove dead waitForUpstreamBytesWritten() code QNAM: Remove dead waitForDownstreamReadyRead() code fix memleak in test
| | * fix build on mingwKonstantin Ritt2010-11-083-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > data.cpp:2: error: 'ushort' does not name a type > data.cpp:1133: error: 'ushort' does not name a type and lot of > data.cpp:1276: error: too many initializers for 'StringCollection' when the issue with ushort is fixed (by including qglobal.h, for example) a bunch of some new build errors occurs: > data.cpp:4: error: 'stringCollectionData' was declared 'extern' and later 'static' > data.h:54: error: previous declaration of 'stringCollectionData' > data.cpp:1131: error: redefinition of 'struct StringCollection' > data.h:48: error: previous definition of 'struct StringCollection' > data.cpp:1136: error: invalid type in declaration before '=' token > data.cpp:1136: error: conflicting declaration 'int stringCollection []' > data.h:55: error: 'stringCollection' has a previous declaration as 'StringCollection stringCollection [] > data.cpp:1279: error: 'stringCollectionCount' was declared 'extern' and later 'static' > data.h:56: error: previous declaration of 'stringCollectionCount' Merge-request: 910 Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com>
| | * Fix some painting issues in QDirectFBPaintEngineAnders Bakken2010-11-081-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired/rewrite of Denis Oliver Kropp's merge request (http://qt.gitorious.org/qt/qt/merge_requests/874) When blitting premultiplied source surfaces one has to set DSBLIT_SRC_PREMULTIPLY. This also reverts the erroneous 6acbf6dce98903310023284e27a65c19f9a829bc Merge-request: 903 Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * QNAM: Do not need QNetworkSession in AlwaysCache load modeMarkus Goetz2010-11-082-12/+21
| | | | | | | | | | | | | | | | | | | | | Move the creation code to the top of QNAM::createRequest() to avoid setting up a QNetworkSession when it is not needed. Reviewed-by: ogoffart
| | * Don't crash if QScriptClass property getter returns an invalid valueKent Hansen2010-11-082-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible that a class claims to have a property of a given name (i.e. queryProperty() returns true), but returns an invalid value for that property. In that case we should silently convert the value to undefined, otherwise the value may wreak havoc in JS. This is a regression from Qt 4.5 (pre-JavaScriptCore-based), which had this check. Task-number: QTBUG-15079 Reviewed-by: Jedrzej Nowacki
| | * QNAM: Remove dead waitForUpstreamBytesWritten() codeMarkus Goetz2010-11-082-7/+0
| | |
| | * QNAM: Remove dead waitForDownstreamReadyRead() codeMarkus Goetz2010-11-0811-61/+0
| | | | | | | | | | | | Reviewed-by: Thiago Macieira
| | * fix memleak in testHarald Fernengel2010-11-081-0/+1
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-087-168/+507
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: Doc: Updated the configuration file to use the Qt 4.7 style sheets. Doc: Added more hints for building Qt for Symbian on Linux. Doc: reintroducing QML elements table temporarily Doc: adding html clasnames to the next and previous links qdoc: Remove leading QML: text from certain node names. Doc: Attempt to document content handling in Flickable. Doc: Removed note about some Qt classes working without an application.
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-061-2/+3
| | |\ \
| | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-0564-438/+2678
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-0519-324/+525
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-0417-320/+419
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-11-042-7/+6
| | | |\ \ \ \ \
| | | | * | | | | Doc: adding html clasnames to the next and previous linksMorten Engvoldsen2010-11-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | * | | | | | Doc: reintroducing QML elements table temporarilyMorten Engvoldsen2010-11-041-2/+104
| | | | | | | | |
| | * | | | | | | Doc: Updated the configuration file to use the Qt 4.7 style sheets.David Boddie2010-11-051-34/+219
| | | | | | | | |
| | * | | | | | | Doc: Added more hints for building Qt for Symbian on Linux.David Boddie2010-11-042-113/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial-review-and-suggestions-by: axis
| | * | | | | | | qdoc: Remove leading QML: text from certain node names.David Boddie2010-11-041-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Smith
| | * | | | | | | Doc: Attempt to document content handling in Flickable.David Boddie2010-11-041-11/+10
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Reviewed-by: Alan Alpert
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-0410-31/+69
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Doc: Removed note about some Qt classes working without an application.David Boddie2010-11-041-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QString example turned out to be a poor one because it requires an application instance in cases where text codecs need to be set up for the user's locale.
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-081-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Task-number: QTBUG-15059
| | * | | | | Task-number: QTBUG-15059juhvu2010-11-081-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Removed implicit QtGui linking from qsymbianbearer plugin as it is not needed.
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-051-2/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Hide the cursor in the tested text edit
| | * | | | Hide the cursor in the tested text editHarald Fernengel2010-11-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hiding the cursor will make the image comparison more robust. This fixes the sporadic test fail we saw on some machines - every time the blinking cursor was visible, the test failed. Reviewed-by: Robert Griebl
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-051-0/+81
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: tst_qnetworkreply: New HTTP test with AuthenticationReuseAttribute tst_qnetworkreply: One more HTTP test using setReadBufferSize()
| | * | | | tst_qnetworkreply: New HTTP test with AuthenticationReuseAttributeMarkus Goetz2010-11-051-0/+29
| | | | | |
| | * | | | tst_qnetworkreply: One more HTTP test using setReadBufferSize()Markus Goetz2010-11-051-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13431
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-0546-221/+623
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (56 commits) Give the toplevel widget a layout fix tests when using Qt in a namespace Fix tst_symbols auto test trivial: fix build Fix crash fix isLikelyToBeNfs usage Export isLikelyToBeNfs only if we have an internal build Fixed QGraphicsView autotest to use a dummy toplevel widget Fixed QMdiArea autotest to use a dummy toplevel widget. Fixed QMenuBar autotest. Changed window activation order. Fixed QStyleSheetStyle autotest to use a dummy toplevel widget Fixed QPathCliper autotest, to skip a test when qreal != double Fixed QComboBox autotest to use a dummy toplevel widget Fixed QColumnView autotest. Added an QApplication::processEvents Fixed QAccessability autotest to use a dummy toplevel widget Fix QListWidget test Fix QGraphicsItems autotest Fixed QGraphicsScene autotest to use a dummy toplevel widget Fixed QGraphicsItem autotest to use a dummy toplevel widget Fixed QListView autotest to use a dummy toplevel widget ...
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-0446-221/+623
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (56 commits) Give the toplevel widget a layout fix tests when using Qt in a namespace Fix tst_symbols auto test trivial: fix build Fix crash fix isLikelyToBeNfs usage Export isLikelyToBeNfs only if we have an internal build Fixed QGraphicsView autotest to use a dummy toplevel widget Fixed QMdiArea autotest to use a dummy toplevel widget. Fixed QMenuBar autotest. Changed window activation order. Fixed QStyleSheetStyle autotest to use a dummy toplevel widget Fixed QPathCliper autotest, to skip a test when qreal != double Fixed QComboBox autotest to use a dummy toplevel widget Fixed QColumnView autotest. Added an QApplication::processEvents Fixed QAccessability autotest to use a dummy toplevel widget Fix QListWidget test Fix QGraphicsItems autotest Fixed QGraphicsScene autotest to use a dummy toplevel widget Fixed QGraphicsItem autotest to use a dummy toplevel widget Fixed QListView autotest to use a dummy toplevel widget ...
| | | * | | Give the toplevel widget a layoutHarald Fernengel2010-11-041-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the top-level will be large enough to view the text edit.
| | | * | | fix tests when using Qt in a namespaceHarald Fernengel2010-11-041-0/+2
| | | | | |
| | | * | | Fix tst_symbols auto testHarald Fernengel2010-11-043-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefix isLikelyToBeNfs with a "q", even though it's only autotest-exported.
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-0445-220/+613
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (53 commits) trivial: fix build Fix crash fix isLikelyToBeNfs usage Export isLikelyToBeNfs only if we have an internal build Fixed QGraphicsView autotest to use a dummy toplevel widget Fixed QMdiArea autotest to use a dummy toplevel widget. Fixed QMenuBar autotest. Changed window activation order. Fixed QStyleSheetStyle autotest to use a dummy toplevel widget Fixed QPathCliper autotest, to skip a test when qreal != double Fixed QComboBox autotest to use a dummy toplevel widget Fixed QColumnView autotest. Added an QApplication::processEvents Fixed QAccessability autotest to use a dummy toplevel widget Fix QListWidget test Fix QGraphicsItems autotest Fixed QGraphicsScene autotest to use a dummy toplevel widget Fixed QGraphicsItem autotest to use a dummy toplevel widget Fixed QListView autotest to use a dummy toplevel widget Fixed QMenu autotest to use a dummy toplevel widget Fixed QMenuBar autotest. Added mainwindow activation Fixed QString autotest when QT_QLOCALE_USES_FCVT is set ...
| | | | * | | trivial: fix buildHarald Fernengel2010-11-031-2/+2
| | | | | | |
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-0345-220/+613
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (52 commits) Fix crash fix isLikelyToBeNfs usage Export isLikelyToBeNfs only if we have an internal build Fixed QGraphicsView autotest to use a dummy toplevel widget Fixed QMdiArea autotest to use a dummy toplevel widget. Fixed QMenuBar autotest. Changed window activation order. Fixed QStyleSheetStyle autotest to use a dummy toplevel widget Fixed QPathCliper autotest, to skip a test when qreal != double Fixed QComboBox autotest to use a dummy toplevel widget Fixed QColumnView autotest. Added an QApplication::processEvents Fixed QAccessability autotest to use a dummy toplevel widget Fix QListWidget test Fix QGraphicsItems autotest Fixed QGraphicsScene autotest to use a dummy toplevel widget Fixed QGraphicsItem autotest to use a dummy toplevel widget Fixed QListView autotest to use a dummy toplevel widget Fixed QMenu autotest to use a dummy toplevel widget Fixed QMenuBar autotest. Added mainwindow activation Fixed QString autotest when QT_QLOCALE_USES_FCVT is set Fixed QButtonGroup autotest to run on Maemo ...
| | | | | * | | Fix crashHarald Fernengel2010-11-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check the global network proxy for 0 before dereferencing Reviewed-by: Robert Griebl
| | | | | * | | fix isLikelyToBeNfs usageHarald Fernengel2010-11-021-2/+4
| | | | | | | |
| | | | | * | | Export isLikelyToBeNfs only if we have an internal buildHarald Fernengel2010-11-021-4/+10
| | | | | | | |
| | | | | * | | Fixed QGraphicsView autotest to use a dummy toplevel widgetDominik Holland2010-11-021-46/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some conversion problems using qreal
| | | | | * | | Fixed QMdiArea autotest to use a dummy toplevel widget.Dominik Holland2010-11-021-4/+15
| | | | | | | |
| | | | | * | | Fixed QMenuBar autotest. Changed window activation order.Dominik Holland2010-11-021-1/+1
| | | | | | | |
| | | | | * | | Fixed QStyleSheetStyle autotest to use a dummy toplevel widgetDominik Holland2010-11-021-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -use platform quirks to skip tests
| | | | | * | | Fixed QPathCliper autotest, to skip a test when qreal != doubleDominik Holland2010-11-021-0/+3
| | | | | | | |
| | | | | * | | Fixed QComboBox autotest to use a dummy toplevel widgetDominik Holland2010-11-021-6/+8
| | | | | | | |
| | | | | * | | Fixed QColumnView autotest. Added an QApplication::processEventsDominik Holland2010-11-021-0/+2
| | | | | | | |
| | | | | * | | Fixed QAccessability autotest to use a dummy toplevel widgetDominik Holland2010-11-021-3/+5
| | | | | | | |
generated by cgit v0.12 at 2024-12-03 21:53:17 (GMT)