Gabriel de Dietrich [Tue, 26 Apr 2011 14:20:39 +0000 (16:20 +0200)]
Removing the "resetInternalData" slot in QAbstractProxyModel
This reverts commits
0916a68056154ecb60e4ea2c79726ab2e49b1532 and
6f1384fcbeea993d5be47590c696de60215b7608.
This effectively reverts most of MR 694.
Reviewed-by: Olivier
(cherry picked from commit
06e104b9c305d3db0dd1848e6e633ee3888fd1de)
Thiago Macieira [Tue, 26 Apr 2011 13:28:34 +0000 (15:28 +0200)]
Fix warnings on unused parameters and variables
(cherry picked from commit
940f16babab76b328b7c9bfdb5435102c689b76b)
Laszlo Agocs [Tue, 26 Apr 2011 14:01:08 +0000 (16:01 +0200)]
Added autotest for threaded text rendering.
Task-number: QTBUG-18516
Reviewed-by: TRUSTME
(cherry picked from commit
903d4dc2196df2775255c24c707bfeb571992bb7)
mae [Tue, 26 Apr 2011 13:41:21 +0000 (15:41 +0200)]
Fix insert and scroll to bottom case
When using QtextCursor::insert() with a large text followed by setting
the vertical scrollbar to its maximum value (scroll to bottom),
QPlainTextEdit would not behave properly if a document size
change was triggered by the insertion due to line wrapping.
This was visible in Qt Creator.
Auto test included.
Reviewed-by: con
(cherry picked from commit
5d144faf3c524ab557b88f69c4b755e20237e846)
Laszlo Agocs [Tue, 26 Apr 2011 13:35:51 +0000 (15:35 +0200)]
Make text rendering working outside the gui thread on Symbian.
It was previously not possible to render text (QPainter::drawText)
in a secondary thread on Symbian, it always resulted in some
kind of panic. This patch corrects it. For S60 5.0 and earlier
the behavior is not changed, threaded text rendering is only
supported on Symbian^3 and newer. This also means
QFontDatabase::supportsThreadedFontRendering() will return
true from now on, but only on Symbian^3 and higher.
Task-number: QTBUG-18516
Reviewed-by: mread
(cherry picked from commit
0c62e02b80570bf8b92eff7acceb9018df61c89e)
Frederik Gladhorn [Tue, 21 Sep 2010 10:33:30 +0000 (12:33 +0200)]
Typos in internal api docs.
(cherry picked from commit
81f79b80337a4ef967fdd2b0773f0523c1ce9261)
Gabriel de Dietrich [Thu, 21 Apr 2011 11:25:23 +0000 (13:25 +0200)]
Fix tst_QTableWidget::task219380_removeLastRow
Again, dure to the fix to QTBUG-18551.
Reviewed-by: Olivier
(cherry picked from commit
1e4d824462b44315944a27ec328f7e400a67c96c)
Thierry Bastian [Thu, 14 Apr 2011 07:48:58 +0000 (09:48 +0200)]
Revert "Fixed a crash in QListView"
This caused regressions in the QListView
This reverts commit
5b3872b2d7523d44ba454a76613e7a3fa45387f7.
(cherry picked from commit
0edbaca5e7b718bb9bbbeaccc9e322b525b4327e)
Thierry Bastian [Tue, 19 Apr 2011 13:47:23 +0000 (15:47 +0200)]
Fixed a crash on Windows XP with mingw in threaded-code
The thread callback doesn't align the stack on 16-bytes on WinXP.
That causes a crash when we call SSE code. So now we tell the
compiler to force that alignment of the stack.
Task: QTBUG-18631
Reviewed-By: Olivier
(cherry picked from commit
364ce5b7f5379499562b4f4f5a68da7ba068fe1e)
mread [Tue, 19 Apr 2011 12:12:24 +0000 (13:12 +0100)]
Symbian's QElapsedTimer::restart() fixed to return ms rather than us
Symbian's QElapsedTimer::restart() had accidently been changed to
return a microsecond count rather than milliseconds, when the elapsed
timer resolution was increased. This fixes it back to milliseconds.
Reviewed-by: Shane Kearns
(cherry picked from commit
39202973e3fb7ff37033290b29efa1b9edc674fb)
Samuel Rødal [Tue, 19 Apr 2011 09:45:29 +0000 (11:45 +0200)]
Skip linearGradientSymmetry test on QWS.
QWS defines GRADIENT_STOPTABLE_SIZE to be 256, which is not enough
resolution for this test to pass.
Reviewed-by: Eskil Abrahamsen Blomfeldt
(cherry picked from commit
0201d5f5a8c95bd4f6b94726ed0db2b83cd3efc7)
Laszlo Agocs [Mon, 18 Apr 2011 15:05:38 +0000 (17:05 +0200)]
Create a cleanup stack for each new thread on Symbian.
The native thread implementation in Qt 4.8 did not call
CTrapCleanup::New() which resulted in E32USER-CBASE 69 panics
in applications when they tried to use the cleanup stack in
a thread's run() function. In 4.7 this was working because
OpenC's pthread implementation created a CTrapCleanup automatically.
Now we do it also in the native Symbian thread implementation.
Trask-number: QTBUG-18822
Reviewed-by: Murray Read
(cherry picked from commit
41aa023ef6019ac9745b780c953f48b8bbc42a42)
Miikka Heikkinen [Mon, 18 Apr 2011 12:40:26 +0000 (15:40 +0300)]
Do not modify window size for fullscreen windows in setGeometry_sys
Minimum sizes of widgets can cause windows to expand beyond screen
limits in QWidgetPrivate::setGeometry_sys. Normally this is not
noticeable as the window size is forced in various places to the
clientRect, but there are certain sequences where the size set in
setGeometry_sys is the final one, resulting in too large windows.
Removed the modification of window size in setGeometry_sys
for fullscreen windows for which the correct size is already requested.
Task-number: QTBUG-18749
Reviewed-by: Sami Merila
(cherry picked from commit
da8f333cfe17a53d475208efa36fa369a9ee4638)
Samuel Rødal [Mon, 18 Apr 2011 08:31:05 +0000 (10:31 +0200)]
Made linearGradientSymmetry test pass on qreal=float platforms.
We need to loosen the requirements a bit when qreal is float... Just
skip the two failing test cases for now.
Reviewed-by: Eskil Abrahamsen Blomfeldt
(cherry picked from commit
3c659eb590aecbcdb40cb498901e757e780fa892)
Gabriel de Dietrich [Fri, 15 Apr 2011 10:04:05 +0000 (12:04 +0200)]
Totally kill MR 916
... the hard way.
Reviewed-by: Trust me
(cherry picked from commit
443d5b17619002cd6bb428198c453271a01accab)
Samuel Rødal [Fri, 15 Apr 2011 07:12:07 +0000 (09:12 +0200)]
Another attempt at fixing the MSVC2005 build.
Apparently direct casting is illegal there too, even though they don't
have the cast operators.
Reviewed-by: Kim
(cherry picked from commit
45c60ceac3d5a401543d7d56a44d1f9227464431)
Samuel Rødal [Thu, 14 Apr 2011 16:00:42 +0000 (18:00 +0200)]
Compile fix in qdrawhelper_sse2.cpp for MSVC 2005.
(cherry picked from commit
7f921ea08c296e7451a44a1dae15350ae183ea20)
Gabriel de Dietrich [Thu, 14 Apr 2011 12:58:25 +0000 (14:58 +0200)]
Reverting merge request 916
Revert "Introduce menubar plugin system"
This reverts commits
56c3de426d97ab7c8fb..
f7b60fffb673b182e63
(cherry picked from commit
c6514537a8568050f5812a2b55fcf47a3ec2fce1)
Gabriel de Dietrich [Thu, 14 Apr 2011 12:50:33 +0000 (14:50 +0200)]
Reverting merge request 916
Revert "Build fix on QMenuBar"
This reverts commit
ea585d567bf0970c57e31846da044295d80774ba.
(cherry picked from commit
68542b72f53f52df43063677e24994463872e81b)
Tomi Vihria [Thu, 14 Apr 2011 12:39:08 +0000 (15:39 +0300)]
Fixed Qt UDA creation for Symbian
Added a dummy Qt sis file and fixed paths in bld.inf.
Otherwise build would fail when FF_QT_IN_UDA is defined.
Dummy Qt sis file needs to replaced with a real one
when actual UDA image is created.
Task-number: QT-4888
Reviewed-by: Guoqing Zhang
(cherry picked from commit
6dcb0028e44cba2a00c2fb867fb1757ad5b1a254)
Samuel Rødal [Thu, 14 Apr 2011 12:33:02 +0000 (14:33 +0200)]
Compile fix in qdrawhelper_sse2.cpp.
(cherry picked from commit
7cc4ffce36c24596630ca83cd6418869d6383670)
Thierry Bastian [Thu, 14 Apr 2011 12:12:56 +0000 (14:12 +0200)]
Build fix on QMenuBar
Reviewed-By: gabi
Merge-Request: 916
(cherry picked from commit
ea585d567bf0970c57e31846da044295d80774ba)
Jan-Arve Sæther [Fri, 1 Apr 2011 12:50:18 +0000 (14:50 +0200)]
Benchmark for layout hierarchies
(cherry picked from commit
cb503a3f4901c0b017374f099b0de8c0c4c50648)
Jan-Arve Sæther [Fri, 18 Mar 2011 15:33:31 +0000 (16:33 +0100)]
Manual test for layout flickering
(cherry picked from commit
fae8bb9f583b416bf47208561c38e0b102f8578c)
Jan-Arve Sæther [Tue, 15 Feb 2011 12:40:32 +0000 (13:40 +0100)]
Do not call setSizePolicy from ctor, it might call a virtual function
More specifically, it might very well call updateGeometry()
Reviewed-by: Frederik Gladhorn
(cherry picked from commit
febdcef08f22310cbd70ec13b315f70ff8e41e83)
Thierry Bastian [Thu, 14 Apr 2011 09:26:34 +0000 (11:26 +0200)]
Fix copyright and a few codestyle mistakes
Reviewed-By: Trust-Me
Merge-Request: 916
(cherry picked from commit
56c3de426d97ab7c8fbb3f5766e1872d6f2e91e9)
Tomi Vihria [Thu, 14 Apr 2011 08:19:24 +0000 (11:19 +0300)]
Enablers for the Qt eclipsing in Symbian
Remove file listing from the stub package file to ease maintenance,
generate stub sis from it and export it to the correct location to
be included into ROM.
Task-number: QT-4817
Reviewed-by: Guoqing Zhang
(cherry picked from commit
00b18457d5efb9224f3b066bab9e9f601fbcf543)
Aurélien Gâteau [Thu, 14 Apr 2011 08:00:36 +0000 (10:00 +0200)]
Renamed QAbstractMenuBarImpl to QAbstractMenuBarInterface
Merge-request: 916
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
(cherry picked from commit
3d188ffae259584c4351c5fa766a49da9b189112)
Aurélien Gâteau [Thu, 14 Apr 2011 08:00:33 +0000 (10:00 +0200)]
Make ctor and dtor of QAbstractMenuBarImpl inline
This way the class does not need to be exported
Merge-request: 916
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
(cherry picked from commit
a624a4011adca00d7334462c4d33f574c465110a)
Aurélien Gâteau [Thu, 14 Apr 2011 08:00:30 +0000 (10:00 +0200)]
QAbstractMenuBarImpl::allowSetVisible => setVisible
This makes it possible to alter the behavior of QMenuBar::setVisible().
It seems to be needed for the Mac menubar.
Merge-request: 916
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
(cherry picked from commit
bafeffd7b8b2c40761369ba496ee655dff6cf2a5)
Aurélien Gâteau [Thu, 14 Apr 2011 08:00:27 +0000 (10:00 +0200)]
Introduce menubar plugin system
Merge-request: 916
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
(cherry picked from commit
be0d346052d69693c2780e62401f3c0d4b0d89d4)
Aurélien Gâteau [Thu, 14 Apr 2011 08:00:24 +0000 (10:00 +0200)]
Introduce QAbstractMenuBarImpl
Merge-request: 916
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
(cherry picked from commit
0432a6b79d35ac7db909a81793417107ebfb668f)
Aurelien Gateau [Thu, 14 Apr 2011 08:00:21 +0000 (10:00 +0200)]
Hide Q<Platform>MenuAction
This will help abstracting the platform specific parts of QMenuBarPrivate in a
common interface.
Merge-request: 916
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
(cherry picked from commit
c664954295c0605c73f7e69deb9f6130c5f5fb05)
Aurélien Gâteau [Thu, 14 Apr 2011 08:00:18 +0000 (10:00 +0200)]
Fix warning about initialization order
Merge-request: 916
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
(cherry picked from commit
f7b60fffb673b182e633545bffd1d310337aca50)
Samuel Rødal [Wed, 13 Apr 2011 08:16:43 +0000 (10:16 +0200)]
Added support for six-parameter radial gradients.
The extended radial gradients conform to the radial gradient
specification in HTML 5 canvas.
Task-number: QTBUG-14075
Reviewed-by: Andreas Kling
(cherry picked from commit
da55c1ea92474e989e5582b02815936bbf584405)
Miikka Heikkinen [Wed, 13 Apr 2011 08:58:40 +0000 (11:58 +0300)]
Improve logic to find default certificates in createpackage script
Original implementation assumed createpackage script was always run
from under Qt source tree bin directory, which is not always the case
as on some platforms the Qt tools can be found from under EPOCROOT.
Fixed it so that if the default directory for default certificates
can't be found in the expected location, createpackage will attempt to
query qmake in the same directory as the createpackage script for the
location of the Qt source tree (QT_INSTALL_PREFIX) and look for default
certificates directory from under there.
Task-number: QTBUG-18684
Reviewed-by: Janne Koskinen
(cherry picked from commit
01477af79d8114b3f8993c3967892538a599dfa6)
Samuel Rødal [Wed, 13 Apr 2011 08:15:06 +0000 (10:15 +0200)]
Improved gradient table generation performance for two-stop gradients.
Two stops is a fairly common case so we gain quite a bit by special
casing it. Improves performance by 10 % in parcycle benchmark, and
by 90 % in a synthetic benchmark.
Reviewed-by: Andreas Kling
(cherry picked from commit
5b74a70ac630073582be56f8a0539624a1080185)
Samuel Rødal [Fri, 17 Sep 2010 19:53:43 +0000 (21:53 +0200)]
Optimized radial gradient fetch using SSE 2.
On an i7 this improves performance by 22 % in parcycle, 107 % in default
svgviewer example, and 283 % in a synthetic radial gradient benchmark.
Reviewed-by: Andreas Kling
(cherry picked from commit
26bd3dccdee8c6a8f1cf9d254a2a6be7d403aa8d)
Samuel Rødal [Sat, 18 Sep 2010 09:04:29 +0000 (11:04 +0200)]
Improved qt_gradient_clamp for reflect spreads.
Using GRADIENT_STOPTABLE_SIZE * 2 as the modulo gives more correct
behaviour, and also improves performance slightly.
Reviewed-by: Benjamin Poulain
(cherry picked from commit
44dd7ef86a3970694a4f8fd9516575c0533a336e)
Samuel Rødal [Wed, 13 Apr 2011 07:47:56 +0000 (09:47 +0200)]
Prepared for SIMD implementation of radial gradients.
Made the radial gradient fetch func into a template to be able to
optimize the inner loop using SIMD instructions.
Reviewed-by: Benjamin Poulain
(cherry picked from commit
f16c261348193b4c03f796db4e1e3a5db09267a2)
Miikka Heikkinen [Tue, 12 Apr 2011 12:23:33 +0000 (15:23 +0300)]
Fix "make sis" for projects that have empty OBJECTS_DIR
Temp directory for packagaging got created to system root if
OBJECTS_DIR was empty. Fixed it to use '.' instead in those cases.
Reviewed-by: Janne Koskinen
(cherry picked from commit
930db5826ff2c02d54f2851494000c5fab97da54)
Jonathan Liu [Tue, 12 Apr 2011 11:55:46 +0000 (13:55 +0200)]
Fix incorrect rendering of checked menu items on Windows Classic
Modify rendering of checked menu items when using Windows Classic
style to be more native looking.
Changes:
* Checked menu items with no icon are not drawn sunken
* Disabled checked menu items with an icon have a plain background
instead of a checkerboard pattern same as when enabled
* Check mark is drawn with highlighted text color when selected to
match text
* Fix check mark offset for disabled unselected checked menu item
as the entire check mark was drawn shifted (1, 1)
* Fix color of check mark shadow for disabled unselected checked
menu item as it was same color as the check mark when it should
be a light color
Task-number: QTBUG-15098
Merge-request: 2513
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
(cherry picked from commit
e89a2b72050dd782da16ff24bc2eb84dc36ed6a5)
Guoqing Zhang [Tue, 12 Apr 2011 07:45:43 +0000 (10:45 +0300)]
Fix OpenGL build break on Symbian
Task-number: QT-4871
Reviewed-by: Dmitry Trofimov
(cherry picked from commit
f3092b91a7a2e9e34dfe7eefb3c6b0ed8c3c3786)
Pierre Rossi [Mon, 10 Jan 2011 17:46:19 +0000 (18:46 +0100)]
Fix a bug with menu overflowing from a lower resolution second screen.
The menu needs to take into account the screen geometry of the screen
it's about to be shown on (not the last screen it was shown on) when
updating its actions rects
Task-number: QTBUG-2748
Reviewed-by: Thierry
(cherry picked from commit
b10265efba544b1e4820f45b86354d442f6abf26)
Pierre Rossi [Thu, 6 Jan 2011 21:09:48 +0000 (22:09 +0100)]
Calculate the submenu position after emitting aboutToShow()
The rationale behind this is that if the submenu gets populated in a slot
connected to aboutToShow(), we'll have to do it again anyway.
Task-number: QTBUG-14739
Reviewed-by: Thierry
(cherry picked from commit
0848b860b9251e76b9319f65554f932ab68e33cc)
Thierry Bastian [Mon, 11 Apr 2011 14:52:59 +0000 (16:52 +0200)]
Fixed a crash in QListView
The problem was that QAbstractScrollArea calls layoutChildren on resize
but the QListView requires that updateGeometries is called before.
Task: QTBUG-18558
Reviewed-By: Pierre
(cherry picked from commit
5b3872b2d7523d44ba454a76613e7a3fa45387f7)
David Boddie [Mon, 11 Apr 2011 13:44:03 +0000 (15:44 +0200)]
Doc: Fixed reference to a name in a table.
Task-number: QTBUG-18679
(cherry picked from commit
a769192ef0393afa07c08a1672b45604fdf64be1)
Jens Bache-Wiig [Wed, 6 Apr 2011 12:35:36 +0000 (14:35 +0200)]
Fix progressbar animation on Vista
This fixes two issues.
- The indeterminate animation was sometimes incorrectly disabled
when value was 0
- The progress animation was incorrectly stopped when progress
bars were disabled
Task-number: QTBUG-10957
Reviewed-by: richard
(cherry picked from commit
05e46b93ccb2334ec3722cf1205058f778d11458)
Pierre Rossi [Tue, 5 Apr 2011 14:30:58 +0000 (16:30 +0200)]
Fix autotest breakage in QTableWidget
Reviewed-by: gabi
(cherry picked from commit
76a2a3278107d2713e6d999cf82db4e134c3d034)
Jonathan Liu [Tue, 5 Apr 2011 09:20:06 +0000 (11:20 +0200)]
QTabWidget/Win: do not add content margin when documentMode enabled
QTabWidget has 2 pixel bottom and right content margin. This removes the
margin to maximize the area available for content and improve
consistency with other Qt styles when documentMode is enabled.
Task-number: QTBUG-15769
Merge-request: 957
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
(cherry picked from commit
23dd5cb45547de167f5c2e78554e9c3013e59998)
Pierre Rossi [Mon, 4 Apr 2011 13:58:42 +0000 (15:58 +0200)]
QTableView: prevent QTableView from hanging when removing rows.
The problem was introduced in
cd2afafb where we removed some code that
was meant to adjust the header's offset upon row removal.
The problem with this is that visualIndexAt() is likely to return -1 in
QHeaderView::paintEvent, which in turn will lead to calling paintSection
for each and every section.
Task-number: QTBUG-18551
Reviewed-by: Thierry
(cherry picked from commit
d814e378987348ce2123d083b01ea6fb6c3e6bbf)
Jonathan Liu [Mon, 27 Dec 2010 00:59:40 +0000 (11:59 +1100)]
QFileSystemModel: Handle QDir::NoDot and QDir::NoDotDot for setFilter
Add support for QDir::NoDot and QDir::NoDotDot for setFilter in
QFileSystemModel.
Task-number: QTBUG-14760
Reviewed-by: Frederik
(cherry picked from commit
b60d82fd56897b1a1d3cc730172f71c27a497ede)
Frederik Gladhorn [Mon, 4 Apr 2011 09:50:31 +0000 (11:50 +0200)]
Remove Qt3ism: setToggleButton - setCheckable
Reviewed-by: Jan-Arve
(cherry picked from commit
d8941c0c0e3e3019a2048ae470e4e46111a2cfcf)
Frederik Gladhorn [Fri, 1 Apr 2011 10:12:32 +0000 (12:12 +0200)]
Don't crash when requesting text.
Sometimes during initialization the QAccessibleItemRow will
still be in an invalid state.
Reviewed-by: Jan-Arve
(cherry picked from commit
90b4cf4b1aa0f70a62118e200e76dc1dc57985cc)
Frederik Gladhorn [Fri, 1 Apr 2011 10:10:13 +0000 (12:10 +0200)]
Let QAccessibleButton::text return something even when not visible.
Buttons would not report their text when hidden, which is inconsistent.
Reviewed-by: Jan-Arve
(cherry picked from commit
1897ca20a343121422b354a7910814ddd37abd17)
Jan-Arve Sæther [Mon, 28 Mar 2011 07:58:28 +0000 (09:58 +0200)]
Fixed regression where AT client did not always announce stuff properly.
This fixes a regression that was created by
75e478abdf336bbdc1b00e2ca4f5293d5455a0cb.
That broke accessibility on 64 bit windows, since lParam can both be
0x00000000fffffffc and 0xfffffffffffffffc.
However, MSDN explicitly says that lParam should be casted to a DWORD,
which would result in (an unsigned) 0xfffffffc in both cases. This can
then be compared to OBJID_CLIENT (defined to ((LONG)0xFFFFFFFC).
Reviewed-by: Prasanth Ullattil
(cherry picked from commit
504941bc50234c225f162192491815bc4d6c38cf)
Jens Bache-Wiig [Mon, 28 Mar 2011 16:52:50 +0000 (18:52 +0200)]
Don't use inactive borders for spinbox on Mac
This was probably caused by the fact that the only spinbox
visible in the main control panel has an inactive frame border.
In XCode 4, however the spin buttons are generally attached
to an active lineedit frame, so we change the default for 4.8.
Reviewed-by: gabriel
(cherry picked from commit
6c9d808c5726893e9aa673ca8b0cbebae67f641c)
Frederik Gladhorn [Fri, 25 Mar 2011 09:41:32 +0000 (10:41 +0100)]
Fix autotest.
I changed a string by accident.
(cherry picked from commit
77cbbe9e47c62047ff88973d8158c42dc30fbd00)
Richard Moe Gustavsen [Thu, 24 Mar 2011 09:41:36 +0000 (10:41 +0100)]
Cocoa: respect QT_NO_EXCEPTION in color dialog
If the macro is set, we should not use cocoa exceptions either, as
this causes compile failures
Rev-By: jbache
(cherry picked from commit
cdb5729d8e1ffc4a00b52d6d4bbee34a9820a193)
Frederik Gladhorn [Fri, 18 Mar 2011 16:41:01 +0000 (17:41 +0100)]
Make navigation in TabWidgets consistent.
navigate would not return the right index in the parent if the current
widget was not the visible one.
Reviewed-by: Jan-Arve
(cherry picked from commit
fdeeaa9d61efea9cca783a1d4098ae505df24390)
Frederik Gladhorn [Mon, 14 Mar 2011 17:57:27 +0000 (18:57 +0100)]
Fix text for checkable buttons, unit tests.
Return Check/Uncheck for checkable buttons.
Partially revive the buttons unit test.
Reviewed-by: Jan-Arve
(cherry picked from commit
6040eeebfb1ab3be3906295c373033cd5b5d9dc3)
Frederik Gladhorn [Thu, 17 Feb 2011 14:37:43 +0000 (15:37 +0100)]
Window and Application fixes for accessibility.
Return app name instead of window title for root accessibility object.
Return Window as accessible type for the main window.
Reviewed-by: Jan-Arve
(cherry picked from commit
9a5b0d7a579572cd7e7faf869ab1a6684800f592)
Frederik Gladhorn [Thu, 17 Feb 2011 18:56:30 +0000 (19:56 +0100)]
Call QAccessible::updateAccessibility when changing accessible name.
Reviewed-by: Jan-Arve
(cherry picked from commit
e783275cfb71e7325472b3aea54e109a7a854bf7)
Frederik Gladhorn [Tue, 22 Mar 2011 13:32:02 +0000 (14:32 +0100)]
Unit test for characterRect in Accessible TextInterface.
(cherry picked from commit
8888cef411ce1d1fc898970429e951f9ef623b0e)
José Millán Soto [Sun, 20 Mar 2011 18:19:32 +0000 (19:19 +0100)]
QAccessibleTextEdit: Using x coordinate for calculate character width
Merge-request: 1148
Task-number: QTBUG-18233
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
(cherry picked from commit
6cd51aeec11e7a70ba560c350274d5a4bd43c9b9)
Stephen Kelly [Sun, 12 Dec 2010 21:11:23 +0000 (22:11 +0100)]
Use the virtual API to clear a selection.
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Merge-request: 980
(cherry picked from commit
e3cd651d92a9e550fe52360d1be6ae41d0f2ab85)
Qt Continuous Integration System [Tue, 10 May 2011 10:26:33 +0000 (20:26 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Rename QGlyphs -> QGlyphRun
Eskil Abrahamsen Blomfeldt [Tue, 10 May 2011 07:43:00 +0000 (09:43 +0200)]
Rename QGlyphs -> QGlyphRun
API clean-up for QGlyphRun:
1. QGlyphs -> QGlyphRun
2. QGlyphRun's font()/setFont() -> rawFont()/setRawFont()
3. QPainter::drawGlyphs() -> drawGlyphRun()
4. QTextLayout and QTextFragment's glyphs() -> glyphRuns()
Reviewed-by: Jiang Jiang
(cherry picked from commit
84ef364302728b68d2d29ea9c4ccbec32c7bb115)
Qt Continuous Integration System [Tue, 10 May 2011 10:07:16 +0000 (20:07 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging:
Respect capacity in QVector::append().
Qt Continuous Integration System [Tue, 10 May 2011 09:50:02 +0000 (19:50 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Add internal documentation for QUnifiedToolbarSurface.
Fix the autotest condition.
Change the repaint() call to an update().
Fix the update() autotest for raster.
Change the repaint() to an update().
Set the default graphics system to raster.
Revert "Switch the default graphics system to raster on Mac."
Fix an race condition in the auto test.
Fix an race condition in the auto test.
Fix a race condition when the main window is being destructed.
Switch the default graphics system to raster on Mac.
Fabien Freling [Fri, 6 May 2011 11:31:43 +0000 (13:31 +0200)]
Add internal documentation for QUnifiedToolbarSurface.
This document is aimed for developers. This is why
it is directly written in the header file. This is
not part of the public API.
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit
891b6ac7236d21b69bdb54b00051422cee004059)
Fabien Freling [Tue, 3 May 2011 12:29:36 +0000 (14:29 +0200)]
Fix the autotest condition.
The previous preprocessor directive was aimed to
exclude Mac OS X.
With the raster engine, the behavior is unified
and we don't need to have a separate path for
Mac OS X/Cocoa.
The new condition excludes only Mac OS X with a
graphics system other than raster or Carbon.
Reviewed-by: Jiang Jiang
(cherry picked from commit
2c6af885d959f90b801c74dc5d389a720dc9fd1d)
Fabien Freling [Tue, 3 May 2011 12:28:56 +0000 (14:28 +0200)]
Change the repaint() call to an update().
In show_sys(), if we directly call repaint() this
will triggers too many UpdateRequest events.
This fixes the qwidget autotest
"compatibilityChildInsertedEvents".
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit
747962e6ec20a59b7e2ed67c5cd685258f199a86)
Fabien Freling [Mon, 2 May 2011 08:52:25 +0000 (10:52 +0200)]
Fix the update() autotest for raster.
With the CoreGraphics engine, we expect the test
to fail with update(), but with the raster
engine the behavior is the same across platforms.
Hence we don't need a special case for Mac OS X
with the raster engine.
Reviewed-by: Samuel Rødal
(cherry picked from commit
75d2387fbf005b022437855ab6433790372639f8)
Fabien Freling [Fri, 29 Apr 2011 10:26:08 +0000 (12:26 +0200)]
Change the repaint() to an update().
Forcing to repaint might cause a recursive
repaint. Since there is no apparent reason to
directly repaint, we just call update().
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit
244fedd484b022881b906b1bc794d5af19d02843)
Fabien Freling [Tue, 26 Apr 2011 10:34:00 +0000 (12:34 +0200)]
Set the default graphics system to raster.
This change is specific to Mac OS X/Cocoa.
Reviewed-by: Lars Knoll
(cherry picked from commit
2c2026df66f237b7313397dd74f6bc3212b94596)
Fabien Freling [Mon, 18 Apr 2011 09:49:57 +0000 (11:49 +0200)]
Revert "Switch the default graphics system to raster on Mac."
This reverts commit
a5d40fd3814ab7c8e865912c03a918bfd5994998.
We have to fix the regressions due to the raster engine before putting
it by default.
(cherry picked from commit
3197fe2af911673c6291db0102e90a0d7f6ae926)
Fabien Freling [Fri, 15 Apr 2011 13:05:03 +0000 (15:05 +0200)]
Fix an race condition in the auto test.
Deleting the page in the wizard without removing it
first leads to a crash when the wizard tries to
access a deleted page.
Reviewed-by: Samuel Rødal
(cherry picked from commit
4024a08239c3e69bb2e0ca045ccbdf3fc900f675)
Fabien Freling [Thu, 14 Apr 2011 17:12:59 +0000 (19:12 +0200)]
Fix an race condition in the auto test.
Deleting the page in the wizard without removing it
first leads to a crash when the wizard tries to
access a deleted page.
Reviewed-by: jasplin
(cherry picked from commit
3bff1637cd49617d334c1be63c20e008fac93be1)
Fabien Freling [Tue, 12 Apr 2011 14:23:57 +0000 (16:23 +0200)]
Fix a race condition when the main window is being destructed.
During the destructor of QWidget, we delete the
layout. If the layout is not set to 0 afterwards,
a check on the layout might turn true, but any access
will end with a segfault.
Reviewed-by: João Abecasis
(cherry picked from commit
abc5a632942c23496d75c49b3b0b4a674cdafdf8)
Liang Qi [Tue, 10 May 2011 09:38:53 +0000 (11:38 +0200)]
Respect capacity in QVector::append().
Fix a bug in QVector::append(), it should use the capacity for new size,
when it is implicit shared and capacity is bigger than the new size.
Autotest included.
Task-number: QTBUG-11763
Reviewed-by: joao
Reviewed-by: Olivier Goffart
Fabien Freling [Mon, 11 Apr 2011 10:56:56 +0000 (12:56 +0200)]
Switch the default graphics system to raster on Mac.
Reviewed-by: Lars Knoll
(cherry picked from commit
a5d40fd3814ab7c8e865912c03a918bfd5994998)
Qt Continuous Integration System [Tue, 10 May 2011 09:19:12 +0000 (19:19 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Fixed detection of QtBase directory.
axis [Tue, 10 May 2011 08:30:30 +0000 (10:30 +0200)]
Fixed detection of QtBase directory.
The old check would fail for an installed copy of Qt. Instead, base
the check on using QTDIR if it present, otherwise use the parent of
the bin directory, and then check that "mkspecs" is present.
Reviewed-by: Olivier Goffart
Qt Continuous Integration System [Tue, 10 May 2011 08:17:06 +0000 (18:17 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Remove const from QPlatformClipboard::mimeData().
Laszlo Agocs [Tue, 10 May 2011 08:09:44 +0000 (10:09 +0200)]
Remove const from QPlatformClipboard::mimeData().
Most implementations will anyway do non-const operations in there, the
change avoids the need for const_cast or mutable.
Qt Continuous Integration System [Tue, 10 May 2011 07:54:22 +0000 (17:54 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Retrieve the actual data in the Wayland clipboard only when requested.
Qt Continuous Integration System [Tue, 10 May 2011 07:24:49 +0000 (17:24 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Fix QDefaultAnimationDriver
Laszlo Agocs [Tue, 10 May 2011 07:17:27 +0000 (09:17 +0200)]
Retrieve the actual data in the Wayland clipboard only when requested.
Alan Alpert [Tue, 10 May 2011 03:43:58 +0000 (13:43 +1000)]
Fix QDefaultAnimationDriver
Animation drivers were changed to used signals instead of virtual
functions, but the default animation driver was left behind.
Reviewed-by: Michael Brasser
Qt Continuous Integration System [Mon, 9 May 2011 15:16:35 +0000 (01:16 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Turned on private headers for some plugins.
Jonni Rainisto [Mon, 9 May 2011 14:55:33 +0000 (16:55 +0200)]
Turned on private headers for some plugins.
Reviewed-by: axis
Qt Continuous Integration System [Mon, 9 May 2011 11:54:18 +0000 (21:54 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging:
Skip test on MacOS due to problems with corewlan plugin
Fix QNetworkConfigurationManager usage outside main thread first
Update QTBUG-17223 for Qt 4.8
fix tst_qnetworkreply::httpProxyCommands autotest
Send User-Agent from the network request in http proxy CONNECT command
Add autotests for configuration dependent network proxies
Fix QNetworkReplyImpl error handling
Enable per network configuration proxy settings in QNetworkAccessManager
Allow a network configuration to be included in a proxy query
Fix error handling in write for socks socket engine
Shane Kearns [Thu, 5 May 2011 12:53:17 +0000 (13:53 +0100)]
Skip test on MacOS due to problems with corewlan plugin
Reviewed-by: Cristiano di Flora
Shane Kearns [Wed, 4 May 2011 12:02:57 +0000 (13:02 +0100)]
Fix QNetworkConfigurationManager usage outside main thread first
QNetworkConfigurationManager creates the engines loaded from plugins
as objects in the main thread.
If a QNetworkConfigurationManager instance is created in a worker thread
without any instance previously existing in the main thread, then it
is uninitialised until the main thread has run.
This causes allConfigurations() to return an empty list if called
immediately after instantiation, for example.
This fix initialises the plugins using blocking queued connections,
which causes the worker thread to block until the initialisation function
has been called in the context of the main thread.
Deadlock is possible if the main thread is for some reason waiting on the
worker thread, but it will not deadlock on QNetworkConfigurationManager's
mutex.
If this is a problem for an application, it should use
QNetworkConfigurationManager from the main thread first to preload the
plugins.
Task-number: QTBUG-18795
Task-number: QTBUG-18799
Reviewed-by: Cristiano Di Flora
Shane Kearns [Thu, 5 May 2011 15:03:14 +0000 (16:03 +0100)]
Update QTBUG-17223 for Qt 4.8
In Qt 4.7, http network requests are assigned to http connection
channels before connecting the channel.
In Qt 4.8, channels are connected "blind" as this gives a performance
improvement in certain circumstances.
On the assumption that User-Agent should be the same for all the
requests being sent to the server in a given burst, we use the first
queued request to set the user agent for a http proxy.
Task-number: QTBUG-17223
Reviewed-by: Markus Goetz
Reviewed-by: Martin Petersson
Shane Kearns [Thu, 5 May 2011 14:31:49 +0000 (15:31 +0100)]
fix tst_qnetworkreply::httpProxyCommands autotest
Due to architecture changes in Qt 4.8, clearing the proxy before the
request is complete causes the http connection to not use any proxy.
The issue is that the proxy isn't resolved until after the bearer has
been started (which is correct in the general case, as system proxy
is unknown until that time).
Also increased the test's timeout from 1 second to 15, as starting a
bearer can be slow.
Reviewed-by: Markus Goetz
Shane Kearns [Wed, 4 May 2011 16:27:36 +0000 (17:27 +0100)]
Send User-Agent from the network request in http proxy CONNECT command
Some proxies can discriminate based on the User-Agent when sent a
CONNECT command for establishing a HTTPS connection.
With this change, if the User-Agent header is set in the QNetworkRequest
then it will be passed to the http socket engine for use in the connect
command sent to the proxy.
As before, "Mozilla/5.0" will be used by default when no user agent
has been set.
Task-number: QTBUG-17223
Reviewed-by: Markus Goetz
Shane Kearns [Mon, 18 Apr 2011 14:46:19 +0000 (15:46 +0100)]
Add autotests for configuration dependent network proxies
1. test that systemProxyForQuery returns something for all configs
2. test that QNetworkAccessManager uses the settings for the
configuration it was started with.
Task-number: QTBUG-18618
Reviewed-by: Peter Hartmann
Shane Kearns [Mon, 18 Apr 2011 14:30:39 +0000 (15:30 +0100)]
Fix QNetworkReplyImpl error handling
The backend was never started when compiled without bearer management,
now it is.
Now emits the error signal in case of startup errors which would leave
the state machine hanging. Previously it just printed a warning.
Reviewed-by: Peter Hartmann