| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
QFont::setStretch() would previously have no effect on Mac OS X/Cocoa.
Task-number: QTBUG-10585
Reviewed-by: Eskil
Done-by: Andy
(cherry picked from commit 8cbf269e14b372ee3174c2706dd0cc4df37eef1a)
|
|
|
|
|
|
| |
Reviewed-By: ogoffart
Task-Number: QTBUG-10806
(cherry picked from commit 28b894f65c5aba01d5ee80c20f617478faaee7e7)
|
|
|
|
|
|
|
|
| |
Replace needlessly expensive cache key generation
Task-number: QTBUG-9850
Reviewed-by: Trond
(cherry picked from commit ad6dafee9be288bcef6b2c4b318b234d2995abff)
|
|
|
|
|
|
|
|
| |
warning: format not a string literal and no format arguments
Task-number: QTBUG-8967
Reviewed-by: Gabriel
(cherry picked from commit 814f7d3d607edacca091273302297b6b2674424f)
|
|
|
|
|
|
|
|
|
|
| |
It could happen that a dock area could be too wide. The problem
was that we didn't really care whether or not the tab bar was visible.
We would always take its minimum sizehint into account.
Task-Number: QTBUG-10391
Reviewed-By: gabi
(cherry picked from commit 8f53bf1b99d32caaebe8cbd1d9bd3a7381821988)
|
|
|
|
|
|
|
|
|
|
| |
The default QObject constructor was not called, meaning the vista helper
was never registered as a child of the QWizard (and therefore never
deleted when the QWizard was destructed).
Task-number: QTBUG-10203
Reviewed-by: olivier
(cherry picked from commit 6bc32600d2367e78ddc39dd93694e01d4d75958d)
|
|
|
|
|
|
|
|
|
|
| |
If the rect argument is null, well we should not do the scrolling with
an null rectangle but rather with the boundingRect like the documentation
says.
Task-number:QTBUG-10400
Reviewed-by:janarve
(cherry picked from commit 44144cf60e978f7d5d70aec49d114d57832a78c3)
|
|
|
|
|
|
|
|
|
|
|
| |
Sliders that draw groove decorations did not invert appearance
correctly in vertical or rtl cases. With this fix we will
flip the rectangles of the respective decorations and tell
gtk if we are using an rtl widget or not.
Task-number: QTBUG-8986
Reviewed-yb: thorbjorn
(cherry picked from commit d52cc1ded5f30a6da0d11b9c3f7de66b2d3e9ee9)
|
|
|
|
|
|
|
|
|
| |
Pushing this to 4.7 as it is an easy fix and highly noticable
in the latest official release of Ubuntu.
Task-number: QTBUG-10396
Reviewed-by: thorbjorn
(cherry picked from commit 5c1fe0fc017e116b2643d2b8278f7fca6fec10a1)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
http://bugreports.qt.nokia.com/browse/QTBUG-9618
QtWebKit currently fails the following test:
LayoutTests/http/tests/xmlhttprequest/cookies.html
This is because QNetworkCookieJar::cookiesForUrl returns secure
cookies even when the connection is not secure.
A 'secure' cookie is set by response headers from a http server as follows:
'Set-Cookie: cookie-name=value; secure'
Correct QNetworkCookieJar::cookiesForUrl to ignore secure cookies when the
url in the request is not 'https:'.
Task-number: QTBUG-9618
Merge-request: 2372
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry picked from commit 483fdd017d9998c6d7f4a035ca615e15fbc97e6a)
|
|
|
|
|
|
|
|
|
| |
It could return wrong values because we were not always checking
the right cols/rows.
Reviewed-By: gabi
Task-Number: QTBUG-10169
(cherry picked from commit 8bde410a6d0b1510d182a365d769db182b1c07dd)
|
|
|
|
|
|
|
|
|
|
|
|
| |
The problem occured if you told the dialog to not show name filter
details, then tried to select a filter specifying those details.
The patch makes sure that we accept a filter as found in the
drop down list if it matches the specified filter with or
without details
Task-number: QTBUG-8439
Reviewed-by: msorvig
(cherry picked from commit 09c6d182a70f25626e12a739a9b7c3db937f47ce)
|
|
|
|
|
|
|
|
|
|
|
| |
Only the leftmost tab was being correctly laid out after the move due
to a mistake in QTabBarPrivate::layoutTab().
Auto-test included.
Reviewed-by: Thierry
Task-number: QTBUG-10052
(cherry picked from commit 4743831d128dfad4ac9fbafa6e7544dbe7fb7ed2)
|
|
|
|
|
|
|
|
|
| |
The cursor was reset even when it had not been previously saved.
Autotest included.
Task-number: QTBUG-7438
Reviewed-by: bnilsen
(cherry picked from commit ad0c6b17cde4a3ce0041d1a54b96ccb5a6792520)
|
|
|
|
|
|
| |
Task-number: QTBUG-10022
Reviewed-by: Trond
(cherry picked from commit 13732b74e07fe10e95f2601f6cf2d0be78467eaa)
|
|
|
|
|
|
|
|
|
|
|
| |
We were scrolling horizontally even though the widget already fit the
visible area horizontally. And conversely for vertical scrolling.
Improves commit f1e92b2fdf6b6fd8aca0d05176c647dd68e21baa.
Reviewed-by: Thierry
Task-number: QTBUG-9425
(cherry picked from commit fa175f7c09e6e664f347ac9804b1a7db1d997ef2)
|
|
|
|
|
|
| |
Reviewed-by: Eskil
Task: http://bugreports.qt.nokia.com/browse/QTBUG-7596
(cherry picked from commit aab30e9a3ec78c3a9b2998feeef275e973ef0ff2)
|
|
|
|
|
|
| |
Reviewed-by: Morten Sorvig
Task-number: QTBUG-6384
(cherry picked from commit 3aee7881eaa45d4cbc1d0a353772cbf44638dadc)
|
|
|
|
|
|
|
|
|
| |
It could happen (with MDI widgets) that the first actions would not be
visible.
Task-number: QTBUG-9560
Reviewed-by: gabi
(cherry picked from commit 864ace14e12cedd8e8f78841249e5309eb0a0795)
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since the introduction of transform properties in QGraphicsItem,
QGraphicsItem::transform() is no longer enough to get the correct
transform of an item.
No auto-test as it involves mouse dragging.
Reviewed-by: Yoann
Task-number: QTBUG-9295
(cherry picked from commit 253b87180e0a6c5db0feaaed7e321139c4ff1643)
|
|
|
|
|
|
|
|
|
|
|
| |
Improved/fixed canRead(). Added svgz support. Implemented ClipRect,
ScaledClipRect and BackgroundColor support. Avoid data copy when reading
from memory. Improved support reading from sequential devices. Added svg
and svgz files to the qimagereader autotests.
Task-number: QTBUG-8227 and QTBUG-9053
Reviewed-by: Kim
(cherry picked from commit 2fe059c863377befdcf65084a07a7f4841beef0d)
|
|
|
|
|
|
|
|
|
| |
We are now checking that the QAction is not related
to the About or Quit button on Mac OS X
Task-number: QTBUG-7540
Reviewed-by: Morten Sorvig
(cherry picked from commit c19cb39ddbfd93802bfe61ecaa4f737a1bd1c1bb)
|
|
|
|
|
| |
Task-number: QTBUG-8478
(cherry picked from commit b7f48eee301e973fcfae08dfd8997538b6dbe251)
|
|
|
|
|
|
|
|
|
|
|
| |
... according to the online MSDN documentation.
Hid the cachedFd member in private data under WinCE, since it's never
used there.
Task-number: QTBUG-9085
Reviewed-by: Zeno Albisser
(cherry picked from commit 7986ab58b9a5d0828291c857d3ce86bfa1af4e6e)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Starting in 1216161584b730576c24fb128131838be1826b37, we started
processing NTFS junctions as symbolic link.
This reverts isSymlink() behavior back to former behavior and processes
only symbolic junctions. The code path there worked just fine for
directory symbolic links but lead to multiple issues for volume mount
point junctions due to incompleteness.
Task-number: QTBUG-7036, QTBUG-7384
Merge-request: 493
Reviewed-by: João Abecasis <joao@trolltech.com>
(cherry picked from commit b4996ab8e3a26d45ee55593da281e4b798c04dd2)
|
|
|
|
|
|
|
|
|
| |
We should not ignore WM_xBUTTONUP messages after WM_xBUTTONDBLCLK. Treat
these messages like WM_xBUTTONDOWN messages.
Task-number: QTBUG-7172
Reviewed-by: Thierry
(cherry picked from commit 3fbedcd085b3e89e3646bf49264001ee216c5852)
|
|
|
|
|
|
|
| |
we need to define WIN32_LEAN_AND_MEAN to include both windows.h
and winsock2.h
(http://msdn.microsoft.com/en-us/library/ms737629(VS.85).aspx)
(cherry picked from commit 5d65e3c264332262fb09b8fe6f08d284c088a61d)
|
|
|
|
|
|
|
|
|
| |
We can't rely on the exposed rect since the item can be outside the view
so we need to regenerate the complete pixmap.
Task-number:QTBUG-8750
Reviewed-by:sroedal
(cherry picked from commit fcb738161efc965e91c3d528c31ac77d3a05ac64)
|
|
|
|
|
|
|
|
|
|
| |
On X11 when creating a widget that has a parent, there is no reason to create a
native window handle right away since we don't know yet if the window is going
to be ever shown.
Task-number: QTBUG-9215
Reviewed-by: Bradley T. Hughes
(cherry picked from commit 1d506981bcc3d2b8aad67989fd7946a0ad826856)
|
|
|
|
|
|
|
|
|
|
| |
This assert was checking that the parent widget for the print dialog
was already created. That's useless since we immediately after call
winId().
Task-number: QTBUG-8684
Reviewed-by: gabi
(cherry picked from commit 6d6df0e2b63f0103ec1f19b4b856b106e295d618)
|
|
|
|
|
|
|
|
|
|
|
|
| |
When QCocoaView receives a keyDown or keyUp event, we translate it to QKeyEvent
and deliver it to qt widgets, propagating if necessary. However if none of Qt
widgets accepted the event we should propagate it back to cocoa - to get a beep
from it, or for example if Qt widget is embedded into a native widget.
Task-number: related to QTBUG-6444
Task-number: QTCREATORBUG-698
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 90dfb5e5d8fc8cb841b0762cd88aa4b996c38312)
|
|
|
|
|
|
|
|
|
|
| |
When a key event is delivered to widgets, we should accept the event if the
widget reacted to it in any way - if either the current item has changed or if
the widget scrolled.
Task-number: QTBUG-6444
Reviewed-by: Prasanth
(cherry picked from commit 77230f7ec9e78ec2d57629ea934ceb1d59eb391e)
|
|
|
|
|
|
|
|
| |
This could happen if a section was moved andthen hidden
Task-number: QTBUG-8650
Reviewed-by: Andy Shaw
(cherry picked from commit f9b0efc17962df74a67d81daca5814af93a5fb97)
|
|
|
|
|
|
|
|
|
| |
The problem is that the font changes after the creation of the
buttons and we were setting a fixed size to the datails button.
Task-number: QTBUG-8381
Reviewed-by: gabi
(cherry picked from commit ee379340fcc5ebf8625906f42540c0fb3577f9ac)
|
|
|
|
|
|
| |
Task-number: QTBUG-8270
Reviewed-by: gabi
(cherry picked from commit b912cac358a0a84f72f727767772caad22062a45)
|
|
|
|
|
| |
Reviewed-by: Peter Hartmann
(cherry picked from commit dd6c5cad88a56fb3a342fe9d4fc3b113ffe3fd53)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There is the problem that Qt displays half width character
(e.g. alphabet) as full width. This is reported in #QTBUG-1726.
This occurs in the following fonts.
- Monospace font
- Selif font
- IPA font (Ver.0301)
- NSimSun
In Cario and fontconfig, the FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH
is specified as flag of FT_Load_Glyph function to solve this problem.
According to the document of freetype, this flag exists to support
buggy CJK fonts.
So this flag is specified as default flag of QFontEngineFT.
Merge-request: 2319
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
(cherry picked from commit f18e95849be93b86ff014147086fa538993abc21)
|
|
|
|
|
|
| |
Task-number: QTBUG-8264
Reviewed-by: Trond
(cherry picked from commit fb27eba721b41cb1b8557ffff663f9747a3922db)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When updating the QTreeViewItem::total field in layout(), we used to
call QTreeViewPrivate::viewIndex() to get the parent item, which is
O(n). We have now introduced 'parentItem' in QTreeViewItem wich makes
this O(1), with a small penality when inserting and removing elements
in QTreeViewPrivate::viewItems.
The QTreeViewPrivate::checkViewItems() is left inside the code for
further debugging.
Reviewed-by: Olivier
Task-number: QTBUG-8885
(cherry picked from commit 7baaea978200c82fdf65e3934cfa373edeca6524)
|
|
|
|
|
|
|
|
|
|
| |
Without clipping, the stroker could consume a huge amount of
memory when scaling up cosmetic, dashed strokes. I also made
QDashStroker clip more aggressively.
Task-number: QTBUG-7832
Reviewed-by: Samuel
(cherry picked from commit ee6c26115959f46621f5a45f3fbe4a49989fd095)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts part of commit e008504b5ec34975e34adf3b1a2b7170d0e4dd38.
The original commit aimed to round up all fractional numbers for the
font to "improve appearance". Rounding up the last advance of a set
of advances in a glyph layout, however, breaks text layout completely,
since the layout of text will be different depending on how many text
lines is used to represent it (since the last glyph in each line will
have a higher advance than the others.) This was e.g. visible in
Qt Creator when turning on whitespace visualization, as all spaces
then created a format change, thus a new text line in the text layout,
and hence an increase of X pixels in the positioning of the text after
the space, where 0.0 < X < 1.0. I see no negative results of removing
the rounding, but if there are any problems, it has to be fixed in the
usage of the advances not in the advances themselves.
Task-number: QTCREATORBUG-381, QTBUG-8791
Reviewed-by: mae
(cherry picked from commit ef9e7168a8ed3e8149204cf6c604a38db35245c0)
|
|
|
|
|
|
|
|
|
|
|
| |
Ideally, we should write a BOM after seek(0) if setGenerateByteOrderMark
has been called, but we don't store that information. This commit is an
improvement for the default case when generateByteOrderMark is false, and
also when seeking to any other position than 0.
Task-number: QTBUG-6295
Reviewed-by: Olivier
(cherry picked from commit 7837de27309c958dc5a5985afc55492ec3054ee0)
|
|
|
|
|
|
|
|
| |
That is required for the Locals & Watchers view in Creator.
Task-number: QTBUG-7115
Reviewed-by: Thierry
(cherry picked from commit 3b58b103bfa2e2b9bb12a042cbba36fb0a1baf9f)
|
|
|
|
|
|
|
|
|
|
| |
This commit fixes an auto-test failure after fixing QTBUG-8733.
The calculated element bounds should now be much tighter and
respect the width of non-cosmetic pens.
Task-number: QTBUG-8733
Reviewed-by: Trond
(cherry picked from commit ea9f2aeba6f18d19d6a82b3a829373ec032af14f)
|
|
|
|
|
|
|
|
|
|
| |
The vector-effect property is not inherited by default, so it
must be set on each item with a stroke. It is not sufficient
to set it on G nodes.
Task-number: QTBUG-8733
Reviewed-by: Trond
(cherry picked from commit 7b500ed543bb86429ef6fdb82b103784d6cc6a0c)
|
|
|
|
|
|
|
|
|
| |
We now terminate the application as long as Qt
says we can. If not, then we cancel the
termination.
Task-number: QTBUG-6296
Reviewed-by: Morten Sorvig(cherry picked from commit 12308db7663679e42c87aa72c564ec3f9f1a457f)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The obvious fix is to use the previsously computed 'section' as paramatter.
(It is even faster)
But one might wonder why logicalIndexAt() does not return the same result
before and after flipSortIndicator(). The reason is that while being
sorted, in _q_layoutChanged, all the hidden section where unhidden and hidden
again. Leaving some pending computation.
Task-number: QTBUG-7833
Reviewed-by: Gabriel
(cherry picked from commit 188c2ef11e92d04dcf334309c85a7f1b14945aaa)
|
|
|
|
|
|
|
|
|
|
| |
Instead, we were returning 0, even if this index did not belong to the
match.
Task-number: QTBUG-7049
Reviewed-by: Volker Hilsheimer
Reviewed-by: Olivier Goffart
(cherry picked from commit dadb99ea2c59d7d0f7a83134b7df5aaaaf80a995)
|
|
|
|
| |
(cherry picked from commit 533bf9e4b7bda99c589f14fb308fa75231196703)
|
|
|
|
|
|
|
| |
GL widgets and native controls have paintonscreen set and bypasses
backingstore. They can thus not rely on the windowsurface flushing
but must be repainted via normal means
(cherry picked from commit ac99b3e243b331d26815b80aab97cdaf0ed06b0f)
|