| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
otherwise PeekNamedPipe() may block in threaded environments.
Reviewed-by: thiago
(cherry picked from commit 4948f4b188c6aa40e628d74d6d6fce747ee535bd)
|
|
|
|
|
|
|
|
|
|
|
| |
We didn't actually check the depth of the target window before
calling the qt_x11_drawImage() fu, that will only work with
depths >= 24.
Task-number: 255311
Reviewed-by: Samuel
BT: yes
(cherry picked from commit d29da4699a2887cdf0836ff39652524d015431c0)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
events."
This reverts commit 7314c07a3e443b1d5349b419a03db8d41ca43f7e.
As reported by Eike, this patch caused several problems for Qt Creator.
Potentially it may cause problems for other (external) applications as well.
An alternative fix (scheduled for 4.5.x) needs to be found for tasks
254456 and 254460.
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit a45ba34ead80d7e19e62eff571d094c9417fd876)
|
|
|
|
|
|
|
|
|
|
|
|
| |
There were several problems with antialiased text in 16 bit mode
under Windows. No gamma correction was done, yet we prepared the
cached glyphs for gamma correction. The mask format we rendered
the glyphs into was also set to the desktop depth, which implied
that information was lost and the text looked rather odd.
Reviewed-by: Samuel
BT: yes
(cherry picked from commit 35bdd8942716c716113e5b795186ca76199e8d96)
|
|
|
|
|
|
|
| |
We need to set alpha to the right value when copying pixmaps.
Reviewed-by: Donald <qt-info@nokia.com>
(cherry picked from commit f7338759ef86deba18b27ee72b3afcf40f3a5aaf)
|
|
|
|
|
|
|
| |
We were saying that it connected to accepted it all these cases, but it
actually is doing some nice magic that makes sense assuming you document
it.
(cherry picked from commit df5c557e7777c8844ac866d730346178ad33a0a6)
|
|
|
|
|
|
|
|
|
| |
No progress bars on the mac show text and it would be bad if we allowed
it. There's nothing stopping people from connecting the valueChanged()
signal to a slot and have a real label layed out correctly that actually
updates with the amount of time it takes to complete, etc. This is more
what they do on Mac OS X if they decide to show a label.
(cherry picked from commit c755c1d3c6fe60a9018308e1ce13bae6821bc214)
|
|
|
|
|
|
|
|
|
|
|
|
| |
QMotifStyle
Same fix as in e9a7e43031d7c1ee712e43be682c4e2c183759c4 but with motif
Reported by https://bugs.kde.org/show_bug.cgi?id=193911
Task-number: 255138
Reviewed-by: jbache
(cherry picked from commit cbe3119db5380c41d44d4e936c7da4889c02f147)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was quite a bug and it showed to some issues that I hadn't taken
into account when doing the initial port to Cocoa. The issue was that we
weren't "merging" items into the application menu if an item had already
been associated with it. Which seems OK for applications that create one
window with one menubar, but breaks down horrible when you have multiple
windows with each having their own menubar. The result is that items in
the application menu potentially go to the wrong window (and the
potential crash). Since there can only ever be one "Quit", "About", or
"Preferences" menu item in Cocoa, we need to make sure that we keep
these items in sync whenever we switch the menubar or remove actions
that are being deleted. That's what we do here.
FWIW, QActions with "ApplicationSpecificRole" for their menu role have
potential to cause memory leaks or other bugs if abused. If you are a
happy open source hacker who wants a thankless job, solving them would
get you lots of goodwill in my book.
Task-number: 255038
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 826b2ec2067e725561db2892dd432c01f1d36bc7)
|
|
|
|
|
|
|
|
|
|
|
|
| |
The blend functions assume the width / height of the images being
blended to be greater than 0. A width of 0 caused the first iteration of
a duff's device memcpy (QT_MEMCPY_USHORT) to be executed, thus blending
8 pixels instead of none.
BT: yes
Task-number: 255014
Reviewed-by: Trond
(cherry picked from commit 91f5c7314afdfd43c867266fc1bc418e0f70bac7)
|
|
|
|
|
| |
Reviewed-by: Kavindra Palaraja
(cherry picked from commit 716e2105dce4487baa32a4e11b69f1d394515a86)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
both visible and invisible widgets.
This is a quick hack to avoid a crash in Qt when setting a focus on a
visible widget that has invisible parent. Proper fix was committed
into master 1a7da7096bbda17197738061902f4489af234bc0, see it's
description for more details.
Task-number: 254563
Reviewed-by: Thierry Bastian
(cherry picked from commit a5b11b9031f9a2a97b65e9a6134244249845491a)
|
|
|
|
|
|
|
|
|
|
|
| |
in atomic operations, we declare Interlock... functions in the namespace
That can confuse the compiler because they are also declared in another
header outside the namespace.
Same problem in clucene where we include windows.h from within the NS.
Task-number: 254214
Reviewed-by: ogoffart
(cherry picked from commit 7bc17b5b9ff9f2e3e04f36fec8ccbb546d9b7a31)
|
|
|
|
|
|
|
|
|
|
|
|
| |
QFont has a feature that you can pass a comma-separated list and it will
walk through the list and match the font that it hits first. There's a
nice static function that X11 and Windows uses, but the Mac was using an
older copied version of it. This old version didn't handle quoting which
is what happens in the style sheet. So, using the same code makes
everything work well. As a bonus, Creator looks correct again.
Reviewed-by: Simon Hausmann
(cherry picked from commit ad46e77420449ede2cb6c1ea2a810a2614520db9)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
On Mac, a widget with a NoFocus policy could still get focus
(if only temporarily) as the result of a native focus event.
In particular, a line edit with a completer should
not lose focus (if only for a brief moment) as a result of the
completer popup being shown. This will for example cause an
item delegate to think that the user has navigated away from
the cell and delete the line edit as a result. This will in turn
cause the completer to access a null pointer.
Reviewed-by: Richard Moe Gustavsen
Task-number: 254456 and 254460
(cherry picked from commit 7314c07a3e443b1d5349b419a03db8d41ca43f7e)
|
|
|
|
|
|
|
|
|
| |
DirectFB and Qt treats these things rather differently so the mapping
just doesn't work very well. Only use DirectFB for SourceOver stuff
(which is the default mode anyway)
Reviewed-by: Donald <qt-info@nokia.com>
(cherry picked from commit 5f1ec2a20d13b9ca9bae1b7b40692925dcd99051)
|
|
|
|
|
|
|
|
|
|
| |
Previously we allowed RGB32 but forced fallbacks for all drawing
operations. It turns out blitting operations doesn't work right either
so we'll rather just disallow this format altogether. See also
36ae58e7a6a888d3ae7bd162d59daada550bbfb1
Reviewed-by: Donald <qt-info@nokia.com>
(cherry picked from commit 36bc35c451b6123b0e237430343a80db8a600b24)
|
|
|
|
| |
(cherry picked from commit 28305c37a1874be6919c316be03fff2aaf3d94cb)
|
|
|
|
|
|
|
|
|
| |
The new glyph cache may return null images for e.g. space characters.
Task-number: 253468
Reviewed-by: Samuel
BT: yes
(cherry picked from commit 13815a0768236982a025833497d3e2a2f3b6acf6)
|
|
|
|
|
|
| |
Task-number: 254549
Reviewed-by: TrustMe
(cherry picked from commit f67bc13bc8e2d2c76d7d9f12abb1dbda85abe337)
|
|
|
|
|
|
|
|
|
|
| |
We were adding two times in the QActionPrivate list the entry for
the current QGraphicsWidget if the action was existing before.
Task-number:KDE
Reviewed-by:bnilsen
BT:yes
(cherry picked from commit 4a82680736ace8abb46e6fb5e085e8622f154b2d)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
An optimization was made to the sorting of QFileDialog to sort only
the current root (meaning what the user see). This avoided slowness
when the model was big with lots of leafs. The problem here is
for the treeview, the root is always the same, we expands only
nodes. In that case, a recursive sorting is needed to ensure that
all expanded nodes are correctly sorted (and filtered). This will
be slower that's why i use an hidden flag in the d pointer to
deactivate the recursive sort for the QFileDialog.
Task-number:254701
Reviewed-by:olivier
BT:yes
(cherry picked from commit 8e4300e2866fd28881853509df6ff054e13f841b)
|
|
|
|
|
|
|
|
|
|
|
| |
Make use of setInformativeText in qmessagebox for aboutQt dialog for
now. Proper fix might be to add scrollable widget to the dialog, or
split the about info into several pieces, though it cannot be done in a
patch release.
Task-number: 254464
Reviewed-by: Trenton Schulz
(cherry picked from commit abed949f0de16c94a146a965a13b38493cde6671)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was already fix. But there was still a frame if there was a
stylesheet on the applicaiton.
The reason is that the frame's constructor call the style for some
hints. And later the combobox will query the style again for the frame
hint, before the view get polished.
The problem is that the StyleSheetStyle will fill the css cache with
wrong information on the first call.
This is not visible if there is no stylesheet as in the constructor, the
widget style is still the default application stylesheet if there is no
global applicaiton stylesheet.
Task-number: 254589
Reviewed-by: jbache
BT:
(cherry picked from commit d0bc0a26f8ac4c2f02819c262b8aa7c3dd1cad3b)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use a union instead of an unsafe cast when swapping the bytes in
the QDataStream streaming operators. The old seems to cause problems
with Link Time Code Generation optimizations with the MSVC compilers.
Task-number: 247708
Reviewed-by: Samuel
Reviewed-by: Thiago
BT: yes
(cherry picked from commit 2c1b11f2192fd48da01a1093a7cb4a848de43c8a)
|
|
|
|
|
|
|
|
|
| |
The problem was that we don't clear the selection model if the previous
selection was valid.
Task-number:251341
Reviewed-by:jasplin
(cherry picked from commit 8bf5a6986db852525582713cc2f2a760df4fdc60)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Reworked the 85f98acaa3a38079071bea711e43c9a86edec1f6 fix, since
it broke glyph positioning in the GL engine under Windows.
Instead of changing the glyph cache margin, which impacts where
the glyph is positioned, we just make the image the glyph is drawn
into 4 pixels bigger in width/heigth.
The margin in QImageTextureGlyphCache needs to be reworked..
Task-number: 254450
Reviewed-by: Eskil
(cherry picked from commit 871b730da203cef773e159960532888522f16a0b)
|
|
|
|
|
|
|
|
|
|
|
| |
Adding docs to toHtml() and toPlainText()
Task-number: 253088
Rev-by: Ariya Hidayat
Rev-by: David Boddie
(cherry picked from commit 54f92419b23b425e32ad573db17f608a67936df1)
|
|
|
|
|
|
|
|
|
|
|
| |
When creating a UI based on double types we only assigned the
control pointer in certain cases. This would crash because the
tooltip did not check for the pointer, but the real issue was that
we didnt assign the control in the first place.
Task-number: 249710
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 3037e466ebf21aa4a47a722a1e2ff497690cbef5)
|
|
|
|
|
| |
Task-number: 245501
(cherry picked from commit 57df8bc3ddd2bc5aaf5c25cf3e311fe56ad50ffb)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
the model initially
This was caused by two different bug:
- In the QSortFilterProxyModel, we need to re-sort when setting the
source model change the sorting column (happen when setting a model
initially)
- In the treeview, we need to activate the sorting even if there is no
column yet (because the initial model is empty
Task-number: 254234
Reviewed-by: Thierry
BT:
(cherry picked from commit 2a390bb481a2433a239a9198e463c9337a26db59)
|
|
|
|
|
| |
Task-number: 246789
(cherry picked from commit e7a607f0f1f7837a26bf95248504497b0534e357)
|
|
|
|
|
|
|
|
|
|
| |
Before adding a / to the path one should check if it doesn't end with
one already. Otherwise one might get paths like //My Documents on
WinCE causing the native call to crash the filesystem service on that
system.
Reviewed-by: alexis
(cherry picked from commit 5839b16a73c36ff7636c13f841d26e6a5e0c5435)
|
|
|
|
|
|
|
|
|
|
| |
If a QCursor with a predefined shape is declared static, it could be
destroyed after the application dtor has already cleaned up QCursor
memory.
Task-number: 254467
Reviewed-by: Rhys Weatherley
(cherry picked from commit 682b854872c26d7408d79131217825fb8ddace6a)
|
|
|
|
|
|
|
|
|
|
|
|
| |
to the socket connection. (Reviewed - see below.)
Also included corrections to the description of how to send SocketError
and SocketState values via signals. (Trust me - as part of an earlier
revision of the custom types documentation.)
Task-number: 222907
Reviewed-by: Andy Shaw
(cherry picked from commit a4ca38bab521e1f0095b9c90c4623ca9d41d219b)
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit 8b34bd541c6aa201c4d872210228bce8217a5e03)
|
|
|
|
|
|
|
|
| |
QKeyEvent::standardKey() function.
Task-number: 254074
Reviewed-by: Trust Me
(cherry picked from commit 152d5fb2d97432d92b6b84e6e81c0236d278ac5d)
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit b94416a8fe3fae0e9ab01dea9d5a78a21c4affc0)
|
|
|
|
|
|
| |
This broke again. I Need to get a way to automate this, I'll discuss
with QA.
(cherry picked from commit 3868c7dacde57c3e929ad72b9c9c42f8ddf4dc62)
|
|
|
|
|
| |
Reviewed-by: mauricek
(cherry picked from commit 305ce9ea67c11826d91c032ead55edfd5e15462f)
|
|
|
|
|
|
|
|
|
|
|
| |
On XP and Vista where tabs use taboverlap, the currently
dragged would loose the outline. We need to compensate for the
taboverlap when creating the draggable widget, otherwise the
outline will be clipped.
Task-number: 254453
Reviewed-by: nrc
(cherry picked from commit 0f0fc963a7f1691038ee36a27bb63ff3165eefba)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Its the context menu handling code... again.
Problem is, that during execution of translateMouseEvent, the widget
is closed and a modal message box is shown. After that, there's no
widget at globalPos and thus, alienWidget is null.
This patch just adds a null check for alienWidget.
Task-number: 254425
Reviewed-by: mauricek
BT: yes
(cherry picked from commit 3d560a498803fadfec9163d7a9695aee60cca8d4)
|
|
|
|
|
|
|
|
|
|
|
| |
Adding details to the documentation of custom storage format and related functions.
Task-number: 207865
Rev-by: David Boddie
Rev-by: Marius Storm-Olsen
(cherry picked from commit 46bb023374dfd8684cefbe1d1c4ffc37f64f1239)
|
|
|
|
|
|
|
|
|
|
|
|
| |
There was some strangeness happening here with parents, but the main
problem was the fact that wheel was getting sent to the focusframe and
not to the widget below. However, the focusframe has the "transparent
for mouse events" flag set and wheel events probably should be
transparent as well.
Task-number: 253539
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit e77f2e595d9b9a6f078f37894733c52bbcfeb695)
|
|
|
|
|
| |
Task-number: 252488
(cherry picked from commit 230357435d35a5b379c697723302108dd114585d)
|
|
|
|
|
|
|
|
|
|
|
| |
If creating a native QFontDialog and delete it, the native dialog
will still show. And worse, it will call the deleted QDialog
counterpart. This fix will clean up (and close the native dialog)
when the QDialog is deleted.
Task-number: 254397
Reviewed-by: Trenton Schulz
(cherry picked from commit 58253fafc6d3c0a535833e674d8930a46138c25f)
|
|
|
|
|
| |
Task-number: 252489
(cherry picked from commit 44d992ca150d9448cb7b9114b2bc489b441c7b76)
|
|
|
|
|
| |
Task-number: 252491
(cherry picked from commit e5615b9cf4c981bb8d0fec48eacd6c11c124a3b0)
|
|
|
|
|
| |
Task-number: 252493
(cherry picked from commit 878ccb0645e7f1416daeddd6acdc37fea16b5e25)
|
|
|
|
|
|
|
|
|
|
| |
compilation breakage introduced in 6c1d7e57.
The fix in fc7a43cce did fix the failure, but created another one
because qhostinfo_win.cpp also had a copy of qt_sockaddr_in6
Reviewed-by: Jason McDonald
(cherry picked from commit a5104ef77f71b068228ffe6d7c64845889c18c81)
|