| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Move the creation code to the top of QNAM::createRequest()
to avoid setting up a QNetworkSession when it is not needed.
Reviewed-by: ogoffart
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Thiago Macieira
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '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.
|
| | |\ |
|
| | |\ \ |
|
| | | |\ \ |
|
| | |/ / /
| | | | |
| | | | |
| | | | | |
Reviewed-by: Alan Alpert
|
| | |\ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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.
|
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | | |
Removed implicit QtGui linking from qsymbianbearer plugin as it
is not needed.
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
...
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Prefix isLikelyToBeNfs with a "q", even though it's only
autotest-exported.
|
| | |\ \ \ \
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
...
|
| | | | | | |
|
| | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
...
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
check the global network proxy for 0 before dereferencing
Reviewed-by: Robert Griebl
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Exported the isLikelyToBeNfs() function to skip the fileInfo Test on NFS.
Otherwise the Test will fail, because the FileSystemTimes are not synchronized.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This is needed to run all autotests in a specified style by default.
Reviewed By: Harald Fernengel
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Make the code friendlier and rename the enum value to
DE_MEEGO_COMPOSITOR
Reviewed-by: Robert Griebl
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
DE_MAEMO6 is set when the rootwindow is MCompositor
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix opening a network session multiple times in succession.
Fix synchronous dispatch in ICD in non-main threads.
Russian translation update
QNAM HTTP: Download last chunk properly when readBufferSize() limited
Prevent access to non-existent memory in QGL2PEXVertexArray
Prevent excessive seeks in xbm detection
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Don't try to open the network session if there is already an in progress
open request.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
ICD DBus signals always come in via the main thread. During synchronous
dispatch these signals were not being emitted when expected because no
event loop is running in the destination thread. Fixed by added a call
to QCoreApplication::sendPostedEvents(object, QEvent::MetaCall) in the
synchronous dispatch loop.
Task-number: QTBUG-15004
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-13431
Task-number: QTBUG-6276
Reviewed-by: ogoffart
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
QGL2PEXVertexArray::addClosingLine() uses using QDataBuffer::add() to
add a QPointF at the end, with a const reference to another value in
the same array. As add() resizes and possibly relocates the buffer, an
already-released memory location may be accessed.
This change copies the value into a temporary variable before resizing
the array.
Task-number: QTBUG-14944
Reviewed-by: Samuel
|
| | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
When auto-detecting an image type, the xbm handler would read
the entire file just to figure out that it's not an xbm. This patch
limits the read to maximum 4k and also breaks if line length >= 299.
Task-number: QT-4021
Reviewed-by: Robert Griebl
|
| |\ \ \ \ \ \
| | | |_|_|_|/
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
Doc: Correcting character escape bug
Doc: Clarified the lifetime of the session bus connection.
Doc: Added a snippet showing the default BorderImage tiling behavior.
Doc: using pointer member variables and language change
Doc: Added more instructions to help with device file permissions.
Doc: Mentioned default values for the BorderImage tile modes.
Document the difference between +0.0 and -0.0 for QPointF and QSizeF.
|
| | |\ \ \ \ \
| | | |_|_|_|/
| | |/| | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Thiago Macieira
|
| | | | | | | |
|
| | |\ \ \ \ \ |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Robert Griebl
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
For some unknown reasons (read: missed git checkout -f), few code line
changes which were NOT part of fix for QTBUG-14331 crept into the
commit. These are now removed with this fix.
Task-number: QTBUG-14331
Reviewed-by: Janne Anttila
|
| | |_|_|/ / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Enable wordwrapping for QInputDialog in Symbian to allow longer texts to
be displayed without cutting them off. Fixes issue with javascript
prompt not showing long texts.
Task-number: QT-4008
Reviewed-by: Sami Merila
|
| |\ \ \ \ \ \
| | |_|_|/ / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
The lastCenterPoint should be equal to centerPoint for new gestures.
PinchGesture: lastRotationAngle should start at 0.
tst_qnetworkreply: Add testcase for unknown authentication method
QNAM: Reset authenticator state properly between requests
msvc: enable unreferenced code elimination in release with debuginfo builds
exclude headers in builddir from -copy option
more elegant treatment of qconfig.h special case
simplify recursive symlinking
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Zeno Albisser
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Zeno Albisser
|
| | | |_|/ /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reset authenticator and fix operator=(...) of QAuthenticator.
Task-number: QTBUG-6792
Reviewed-by: ogoffart
|
| |\ \ \ \ \
| | | |_|/ /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
qdoc: Added next and previous links to top of pages.
Doc: style tuning
Doc: fixing style - tool buttons to bold.
Doc: updating the template to support search feature better.
Doc: Fixing columns to display all elements in lists - css3
Doc: fixing bugs in style
Doc: fixing style for search display and slim fit menus
Doc: Fixing bug in sorting script for search results.
Doc: Fixed basic language.
Doc: Added Windows Vista to the trademark list.
Doc: Updated the Java trademark information.
Doc: Moved QFileSystemModel example code to the class documentation.
Doc: Corrected the name property as it was incorrectly declared.
|
| | |\ \ \ \
| | | | |_|/
| | | |/| | |
|
| | |\ \ \ \ |
|
| | |\ \ \ \ \
| | | |_|_|_|/
| | |/| | | | |
|
| | |\ \ \ \ \ |
|