Janne Anttila [Tue, 3 May 2011 08:38:18 +0000 (11:38 +0300)]
Clarified sendCustomRequest documentation to include HTTPS
Reviewed-By: mgoetz
(cherry picked from commit
16b8c940dac02ec77e6ff9fe4150c32db1811e74)
Olivier Goffart [Tue, 3 May 2011 08:12:30 +0000 (10:12 +0200)]
Oswald Buddenhagen [Mon, 2 May 2011 14:20:15 +0000 (16:20 +0200)]
no environment on WinCE
(cherry picked from commit
62e73a463cb7035192acdce6538c5b0248e643d4)
Oswald Buddenhagen [Mon, 2 May 2011 13:40:13 +0000 (15:40 +0200)]
fix Widestring vs. Ansi mixup
(cherry picked from commit
4dcb4a41022085aa82f25f7e0a2ce9e92510f4ae)
Oswald Buddenhagen [Mon, 2 May 2011 13:37:33 +0000 (15:37 +0200)]
fix potential crash in QProcessEnvironment::systemEnvironment() on windows
GetEnvironmentStrings() can theoretically return null
(cherry picked from commit
443608952d7df9a5146317be992320ba232d2cf9)
Armin Berres [Mon, 2 May 2011 13:17:39 +0000 (15:17 +0200)]
Only cleanup share widget if it has been created.
Without this change a not yet created share widget is created
once qt_destroy_gl_share_widget() is called. As creating the
widget also triggers a call to qt_cleanup_gl_share_widget() once
QApplication is destroyed a QApplication created afterwards
cannot use a share widget anymore.
This functionality is needed for Harmattan.
Merge-request: 2609
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
(cherry picked from commit
8680d831fb7066feae07690a4a6bc8e908a84e5a)
Liang Qi [Thu, 28 Apr 2011 07:35:39 +0000 (09:35 +0200)]
Fix the build of configure.exe.
qlocale functions were splitted in severl files, just add them back.
Task-number: QTBUG-18932
Reviewed-by: TrustMe
(cherry picked from commit
3782dc6d92210e9ae5fb7ee27cc7cd78dee79ebf)
Liang Qi [Tue, 26 Apr 2011 12:18:00 +0000 (14:18 +0200)]
Update the source file of configure.exe to enable QtConcurrent for Symbian
(cherry picked from commit
8769c84663943fda853f5aa248fa95391594347e)
Liang Qi [Tue, 26 Apr 2011 12:01:18 +0000 (14:01 +0200)]
Get rid of "typename, typename" for TEMPLATE_TEMPLATE_PARAMETERS.
Because Qt doesn't support that feature before.
(cherry picked from commit
c12ed14fb38ae77be194e19a27545190aded830b)
Olivier Goffart [Wed, 20 Apr 2011 14:13:03 +0000 (16:13 +0200)]
Compile with msvc
msvc tries to instenties the return type of overloads that are not chosen by overload resolution
(cherry picked from commit
7307d712e10783b57c4c95c8390a9455b69f473a)
Olivier Goffart [Wed, 20 Apr 2011 13:43:53 +0000 (15:43 +0200)]
compile with windows
MSVC doesn't pick up the right template partial specialisation.
(cherry picked from commit
0188f5ee18d00ae18e65a03c712d3f701e84fa80)
Olivier Goffart [Tue, 19 Apr 2011 13:58:09 +0000 (15:58 +0200)]
get rid of the DisableIfSame hack
By changing the order of the parametters, in a way it is unlikely to clash
(cherry picked from commit
e9d198b5928e1adf678796c098113bc307ef53f5)
Liang Qi [Tue, 19 Apr 2011 05:47:33 +0000 (07:47 +0200)]
Rewrite the interfaces of QtConcurrent.
At least make RVCT 2.2 work.
Task-number: QTBUG-5182
Task-number: QTBUG-9070
Reviewed-by: Olivier Goffart
Reviewed-by: joao
(cherry picked from commit
0ba0c374fe055623381e3795daa6743c5c995bbc)
mae [Mon, 2 May 2011 10:45:43 +0000 (12:45 +0200)]
Fix namespace issue with the global static
(cherry picked from commit
c99be6bf73dce10fc706764b72a8dacc1c6589a0)
Matthew Cattell [Mon, 2 May 2011 09:26:05 +0000 (11:26 +0200)]
Fixed bug in QPdfEngine::addImage causing mono images to be made 32 bit
Regression from 4.5 causing performance and size degradation.
Task-number: QTBUG-18997
Reviewed-by: Samuel
(cherry picked from commit
18122b473ecbd85ba953f70743b1756358bf7c0c)
mae [Mon, 2 May 2011 09:56:03 +0000 (11:56 +0200)]
Fix regression with QSettings patch
The plugin loader is used without QCoreApplication.
This fixes
31ef8fa6abc2ea23c6f0a996b36494d88aafb0b5
(cherry picked from commit
988871dabf3c949ffc71d126131281a3ae641ebf)
Jani Hautakangas [Mon, 2 May 2011 09:47:34 +0000 (12:47 +0300)]
Fix trailing whitespaces
Reviewed-by: TRUSTME
(cherry picked from commit
d4fd21f746b536eaddbdd7a07f1d717ef18278e7)
Jani Hautakangas [Mon, 2 May 2011 09:22:24 +0000 (12:22 +0300)]
Fix for native child widget performance issue.
Flushing native child widgets in VG and GL window
surfaces caused performance downgrade because unnecessary
swapBuffers calls. On Symbian we must not support flushing
native child widgets in VG and GL window surfaces because
it causes GPU memory overhead and performance issues. Symbian
graphics architecture allows us to render native child widgets
to TLW EGL surface correctly in most of the cases.
Task-number: QTMOBILITY-1570
Reviewed-by: Samuel Rødal
(cherry picked from commit
6a92de7c89764848f7a85b1aa412a07bedc72b1a)
Oswald Buddenhagen [Mon, 2 May 2011 09:06:27 +0000 (11:06 +0200)]
fix build on symbian
Error: #793: explicit specialization of class "QTypeInfo<QProcessEnvironmentPrivate::Key>" must precede its first use
just un-nest QProcessEnvironmentPrivate::{Key,Value}
Reviewed-by: thiago
(cherry picked from commit
167044693cc1d16684a5732b05e3926d0af61960)
Oswald Buddenhagen [Mon, 2 May 2011 07:38:40 +0000 (09:38 +0200)]
fix build on mac
environ needs to be declared properly
(cherry picked from commit
aae6ef391d2ee2fa5b91c834ea65f14fd61e5af6)
Oswald Buddenhagen [Thu, 21 Apr 2011 19:34:59 +0000 (21:34 +0200)]
make QProcessEnvironment on Unix cache converted values
values are converted between byte arrays and qstrings on demand.
this makes it feasible to use the class as a generic environment container
with fast reading and writing access.
Reviewed-by: thiago
Reviewed-by: dt
(cherry picked from commit
7aa4ecdedba60ac4cbc07a774ae9d834677002e9)
Oswald Buddenhagen [Thu, 21 Apr 2011 19:30:34 +0000 (21:30 +0200)]
make QProcessEnvironment::systemEnvironment() encoding-safe
on unix, don't do the roundtrip over unicode.
on windows, use the WinAPI unicode environment instead of the 8-bit CRT
environment.
Reviewed-by: thiago
Reviewed-by: dt
(cherry picked from commit
60194ad0ea68d7c82b4729119d122dcfeb909842)
Oswald Buddenhagen [Thu, 28 Apr 2011 08:53:14 +0000 (10:53 +0200)]
make QProcessEnvironment on Unix cache converted variable names
the converted keys also cache their hash, as they are used only for the
purpose of looking up in a qhash.
Reviewed-by: thiago
Reviewed-by: dt
(cherry picked from commit
18f1613aa8ece72d24ac10e28f06e3db1d8ce400)
Oswald Buddenhagen [Thu, 21 Apr 2011 17:04:02 +0000 (19:04 +0200)]
move key/value converters to the private class
this will enable them to access other members later
Reviewed-by: thiago
Reviewed-by: dt
(cherry picked from commit
a2d70d71c8c7652ded41d5d603672c3927df44e6)
Oswald Buddenhagen [Thu, 21 Apr 2011 16:32:36 +0000 (18:32 +0200)]
make QProcessEnvironment on Windows preserve variable name case
while windows itself does not care which case the variable names are in,
they may be passed to unix tools which *do* care.
note that this uses true case folding for string comparisons while
windows uses uppercasing. this means that "ess" and "eß" will be
considered the same by us, while not by windows. this is not expected to
have real-world impact, particularly because non-ascii variable names
are not used much.
Task-number: QTCREATORBUG-3110
Reviewed-by: thiago
Reviewed-by: dt
(cherry picked from commit
f3db5603871928ebed43a085a496397e65952b39)
Oswald Buddenhagen [Thu, 21 Apr 2011 15:50:40 +0000 (17:50 +0200)]
split QProcessEnvironmentPrivate::Unit into Key and Value
Reviewed-by: thiago
Reviewed-by: dt
(cherry picked from commit
11a79c65ea992be0e2ede7dc8f60660c9190291f)
Oswald Buddenhagen [Thu, 21 Apr 2011 15:30:13 +0000 (17:30 +0200)]
remove unused functions
Reviewed-by: thiago
Reviewed-by: dt
(cherry picked from commit
e989a4d375b279b3ea61139cb07596e0e4b79e28)
Oswald Buddenhagen [Thu, 21 Apr 2011 15:31:06 +0000 (17:31 +0200)]
minor optimization: use QList::reserve()
Reviewed-by: thiago
Reviewed-by: dt
(cherry picked from commit
6a53f17c7039f1a5405912a4a645572e215410bb)
Oswald Buddenhagen [Thu, 21 Apr 2011 15:22:13 +0000 (17:22 +0200)]
use the Hash typedef
Reviewed-by: thiago
Reviewed-by: dt
(cherry picked from commit
10fd0d3e5c88c7b0265db3acdd75cb3d6f35ee63)
mae [Fri, 29 Apr 2011 09:44:43 +0000 (11:44 +0200)]
Reduce open and stat system calls for QSettings
The patch moves the global static QSettings object
from QLibrary to QCoreApplication and reduces a
few stat and open calls.
Without the patch, a large Trolltech.conf was
pushed out of the unused settings cache during
startup, meaning Trolltech.conf was parsed
more than once.
Reviewed-by: Liang Qi
(cherry picked from commit
31ef8fa6abc2ea23c6f0a996b36494d88aafb0b5)
Jan-Arve Sæther [Thu, 28 Apr 2011 11:23:42 +0000 (13:23 +0200)]
Add missing license headers
(cherry picked from commit
d5ee1bc752dc8aed717776a80e9e15972dd98065)
Samuel Rødal [Thu, 28 Apr 2011 10:56:35 +0000 (12:56 +0200)]
Fixed off-by-one in radial gradient color table index computation.
Clamp to GRADIENT_COLOR_TABLE-1, not GRADIENT_COLOR_TABLE-2. Fixes
visible error in gradients.qps
Reviewed-by: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
(cherry picked from commit
af9d20680c91f587f4791aa68f3a8b03d3a42be0)
Thorbjørn Lindeijer [Thu, 28 Apr 2011 09:10:24 +0000 (11:10 +0200)]
Revert "Added QStringRef::toLatin1 and QStringRef::toUtf8"
This reverts commit
feabda665de62a0f6a82d831b45926697f30b45b.
They were already added by Denis Dzyubenko in commit
2916b074.
(cherry picked from commit
ffe0a2ec7c1f4412792a977401bdc4dbf6c76acd)
Olivier Goffart [Wed, 27 Apr 2011 16:37:28 +0000 (18:37 +0200)]
Fixes warnings about unused variables
Reviewed-by: Samuel
(cherry picked from commit
28061caa38d94de85db9aec743d1efba33c1e46f)
Olivier Goffart [Wed, 27 Apr 2011 16:35:42 +0000 (18:35 +0200)]
Fixes warnings about unused variables
Reviewed-by: jbache
(cherry picked from commit
e8019cf8feb402303e6d253f5ca58bebfda42679)
Olivier Goffart [Wed, 27 Apr 2011 16:33:54 +0000 (18:33 +0200)]
Fixes warnings about unused variables
Reviewed-by: Peter Hartmann
(cherry picked from commit
61c6d66b7efd8de4a83b021e7c4ef2b1a803ece2)
Olivier Goffart [Wed, 27 Apr 2011 16:29:27 +0000 (18:29 +0200)]
Fixes warnings
In QString, it would comlain that:
assuming signed overflow does not occur when assuming that (X - c) > X is always false
Changing to unsigned comparison fix the warning
Others are about unused variables
Reviewed-by: Thiago
(cherry picked from commit
5e5485809e8c6f8339bb9f19ad71ed623a8b23c7)
Olivier Goffart [Wed, 27 Apr 2011 15:02:35 +0000 (17:02 +0200)]
Fixes warnings about unused variables
Reviewed-by: Samuel
(cherry picked from commit
ddd253e14318af45e5c56df736028b88257068c4)
Thorbjørn Lindeijer [Wed, 27 Apr 2011 13:53:28 +0000 (15:53 +0200)]
Added QStringRef::toLatin1 and QStringRef::toUtf8
These helper functions make it convenient to avoid making an unnecessary
copy of the string before converting it to a QByteArray. The current
most obvious way to do this would be:
// QStringRef text
QByteArray latin1 = text.toString().toLatin1();
Though the copy can also be avoided by doing:
const QString textData =
QString::fromRawData(text.unicode(), text.size());
QByteArray latin1 = textData.toLatin1();
Now the faster method can be achieved using the new obvious way:
QByteArray latin1 = text.toLatin1();
Reviewed-by: Thiago Macieira
Reviewed-by: Robin Burchell
(cherry picked from commit
feabda665de62a0f6a82d831b45926697f30b45b)
Laszlo Agocs [Wed, 27 Apr 2011 13:18:58 +0000 (15:18 +0200)]
Make translucent windows working properly with OpenVG.
The OpenVG engine correctly uses vgClear() to fill the surface with
transparent pixels whenever the window has the WA_TranslucentBackground
attribute enabled. However both scissoring and masking affects
the operation of vgClear(). Drawing artifacts were previously
visible due this, simply because scissoring was left enabled by
the VG paint engine, and the filling with transparent pixels
happens in the window surface's beginPaint() that is called
between the paint engine's end() (for the previous paint) and
begin() (for the next paint).
Task-number: QT-4907
Reviewed-by: Jani Hautakangas
(cherry picked from commit
4a1ae3d1b4e8e032b1c978fcc7e1812e37e1f047)
Frederik Gladhorn [Fri, 22 Apr 2011 14:39:00 +0000 (16:39 +0200)]
Fix warning (unused variable) in QAccessibility test.
Reviewed-by: Morten Sorvig
(cherry picked from commit
c3ebd1d38826739cb989e65770d2a22b9a39dcc4)
Frederik Gladhorn [Fri, 22 Apr 2011 13:56:48 +0000 (15:56 +0200)]
Add accessible events as defined by IAccessible2.
Additional events from:
http://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/_accessible_event_i_d_8idl.html
Reviewed-by: Morten Sorvig
(cherry picked from commit
6bd74d66b418cad30ed5a448e657a7a5097eed4a)
Frederik Gladhorn [Fri, 22 Apr 2011 13:21:35 +0000 (15:21 +0200)]
Return name and allow actions for invisible accessible items.
There is no reason not to report the name or allow actions
when a widget is invisible.
Reviewed-by: Morten Sorvig
(cherry picked from commit
b88b2cb05c56a4c936a073ccf53c9fb3ad50d5d8)
Jens Georg [Wed, 13 Apr 2011 08:14:46 +0000 (10:14 +0200)]
Add test for ISODate change in QDateTime::toString
Merge-request: 1149
Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
(cherry picked from commit
d9e0c2ea4d64b8fdfb31b28e71373735be38101b)
Jens Georg [Wed, 13 Apr 2011 08:14:44 +0000 (10:14 +0200)]
Update documentation of QDateTime::toString
Merge-request: 1149
Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
(cherry picked from commit
3d4149afe62b4fc5d519a2a155b8f8c32e7e95c4)
Jens Georg [Wed, 13 Apr 2011 08:14:43 +0000 (10:14 +0200)]
Fix QDateTime::toString for Qt::ISODate
Fixes QTBUG-18290 and the "missing Z" from QTBUG-9698
Merge-request: 1149
Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
(cherry picked from commit
8f95a19d330480bd86650c3d2e4e147d3bca5789)
Miikka Heikkinen [Wed, 27 Apr 2011 10:58:50 +0000 (13:58 +0300)]
Fix BlendBench::unalignedBlendArgb32 test case
The test case freed the wrong pointer, causing crash in Symbian devices.
Task-number: QTBUG-17489
Reviewed-by: Janne Koskinen
(cherry picked from commit
02bb8e4c5f4584f3c0a7ed16bcba20c7f43456cd)
Frederik Gladhorn [Wed, 27 Apr 2011 11:03:09 +0000 (13:03 +0200)]
Skip child count test on Intel compiler.
For some reason this test is sometimes giving false results
with intel compilers.
The child count is most likely style dependent.
For now ignore it in the test.
Reviewed-by: Thierry
(cherry picked from commit
0ddecd383c91afb18ce2776eed5608bb1a0c2129)
Laszlo Agocs [Wed, 27 Apr 2011 08:05:25 +0000 (10:05 +0200)]
Specify swap behavior preserved bit in openvg engine.
Unlike OpenGL, the EGL_SWAP_BEHAVIOR_PRESERVED_BIT was not set for
the EGL configuration used with OpenVG. Yet the preserved swap was
enabled still, which, according to the EGL spec, should fail. To
make sure it still works with other EGL implementations, the bit
is now set in the configuration.
Reviewed-by: Jani Hautakangas
(cherry picked from commit
710aa7f8fbd72ee303c3348aa3aaf12d6984964d)
Emmanuel BOURGERIE [Wed, 27 Apr 2011 04:04:02 +0000 (14:04 +1000)]
Fixed QTBUG-11935 : "With MySQL version > 50000 the QMYSQLDriver::
tables() returns tables in all databases on the server"
This bugfix has been rewritten to match contributors advise.
Change-Id: I3a9cf900ff7eae47c9ffdbcf34bcb1b4396d9837
Merge-request: 1010
Reviewed-by: Charles Yin <charles.yin@nokia.com>
(cherry picked from commit
c0ca29efdeb442a6b88ccadff409e3f7ef828ce8)
Emmanuel BOURGERIE [Wed, 27 Apr 2011 04:04:00 +0000 (14:04 +1000)]
Fixed QTBUG-11935
Change-Id: Ia7bdb0ceecf2892f6be73d1816764a2bab6275f1
Merge-request: 1010
Reviewed-by: Charles Yin <charles.yin@nokia.com>
(cherry picked from commit
a18f36048aa23fb088527c26274e49ce626ddf4d)
Samuel Rødal [Tue, 26 Apr 2011 15:20:11 +0000 (17:20 +0200)]
Removed warning from QPixmap::handle().
With the new fromX11Pixmap function there are valid use-cases where
checking the handle() is useful also with the raster graphicssystem.
Reviewed-by: Thiago Macieira
(cherry picked from commit
1124f41253edd0e03704db72b0e1b6b4b518bd0f)
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)