| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |
|
| | | |
|
| |\ \
| | |/
| |/|
| | | |
kinetic-declarativeui
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/kernel/qcocoaview_mac_p.h
src/gui/widgets/qmainwindow.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Include info on the primary surface pixelformat.
Reviewed-by: TrustMe
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We're just printout out the integer value anyway.
Reviewed-by: TrustMe
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Needed for fallback warnings
Reviewed-by: TrustMe
|
| | | |\ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task: 252796
Rev-By: Tor Arne
|
| | | |/
| | | |
| | | |
| | | | |
Reviewed-by: David Boddie <dboddie@trolltech.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | |\ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | |/
| | | |
| | | |
| | | | |
Task-number: 248336
|
| | | |\ |
|
| | | | |\ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | |/
| | | | |
| | | | |
| | | | | |
Reviewed-by: Kavindra Palaraja <kavindra.palaraja@nokia.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This fix ensures that the current tab is visible after calling
setTabButton() on a scrolled tab bar.
Reviewed-by: bnilsen
Task-number: 252472
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Explained why you cannot use QTextStream::atEnd with stdin.
Task-number:251171
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This is still not a perfect solution since it breaks 245347 again
Task-number: 252319
Reviewed-by: Maurice
|
| | | | | |
|
| | | |/
| | | |
| | | |
| | | | |
Task-number: 252287
|
| | | |\ |
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: 252298
Reviewed-by: Peter Hartmann
|
| | | |/
| | | |
| | | |
| | | | |
Task-number: 244858
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QTextCursor::operator=
Task-number: 247955
|
| | | |\ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Don't use aliased coordinate delta for image drawing.
Related to change fde7475bcf9c10522a8170e6eb8fb9a8fadc21cd.
Task-number: 251561
Reviewed-by: Trond
|
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: 252415
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task: 252796
Rev-By: Tor Arne
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When QT_LOCALSOCKET_TCP is defined we cannot call setEnabled on the
socket notifier.
Reviewed-by: ossi
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Exclude chromium files from the import.
Reviewed-by: Trust me
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We are now moving focus to the XEmbed focus proxy when we accept a
client and when we get window activation. Window activation did that
before, but only when we were the active container, thus had focus in.
Now we do it always.
Due to race conditions with the window manager, the time stamt we used
for XSetInputFocus was the same as that of the window manager. This
broke it from time to time in Metacity and Xfce but always in KWin.
With other tested window manager we didn't have this issue.
Following Owen Tayler's advice (one of the authors of the XEmbed
specification) we now use CurrentTime and not qt_x11Data->time
when moving the input focus as there is no explicit user interaction
involved.
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The problem was that we were not always storing the modelindex in
column 0 for each QTreeViewItem. That was causing inconsistencies.
Now it is always the case. It allowed to remove some calls to
QModelIndex::sibling.
Task-number: 239271
Reviewed-by: ogoffart
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
this makes it much less arcane and buggy, specifically it resolves the
internal thread-unsafety.
Reviewed-by: thiago
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If the label's sizeHint is bigger than its minimumSizeHint, the field
may be resized smaller than its minimum size.
This also fix another problem where the field would 'jump' from one
sizehint to the others.
(This can happen if labels can word-wrap for example)
Reviewed-by: Michael Goddard
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
A few tests use printf, which means they interfere with the XML test
logging. Blacklist them for the XML test.
Note that these tests happened to pass under the old test logger
implementation. That was because the test logger always printed XML
tags on a single line, and the printf calls contained no special XML
characters. The test logs generated were technically valid XML but
contained extraneous text.
|