Oswald Buddenhagen [Wed, 20 Apr 2011 17:47:49 +0000 (19:47 +0200)]
don't ignore create_prl for static plugins
Task-number: QTBUG-18436
Reviewed-by: joerg
(cherry picked from commit
2ca4ce848c63c9fa0a48c0f9f4e7fdbc90463bf1)
Oswald Buddenhagen [Wed, 20 Apr 2011 14:28:58 +0000 (16:28 +0200)]
make QLibraryInfo return clean paths
as a side effect, don't use QDir for path resolution - it doesn't buy us
anything.
Task-number: QTBUG-1371
Reviewed-by: joerg
(cherry picked from commit
9cd62e4f7b23894a672297f6eebda64cdbd53cb0)
Oswald Buddenhagen [Wed, 20 Apr 2011 14:27:55 +0000 (16:27 +0200)]
make relative paths in qt.conf work inside qmake
Task-number: QTBUG-11602
Reviewed-by: joerg
(cherry picked from commit
e6bb6ba76942d98e4b50a7fd32bf44e211f2fa5e)
Shane Kearns [Thu, 5 May 2011 15:32:11 +0000 (16:32 +0100)]
Sockets: Fix potential null pointer usages
QAbstractSocketEngine::createSocketEngine can return 0 as well as throw.
In two cases the pointer was being used before the null check, in a 3rd
case the null check was missing.
Reviewed-by: Markus Goetz
(cherry picked from commit
19edac88af53eea7f733cabbaee77f9b725b7ea9)
Markus Goetz [Thu, 5 May 2011 13:44:00 +0000 (15:44 +0200)]
QNAM: Re-order checks in migrateBackend()
Do the easy checks first, will avoid a crash in the HTTP code
if request is serviced from the cache.
Task-number: QTBUG-18770
Reviewed-by: Peter Hartmann
(cherry picked from commit
d03a28a289cf0665290e6ea0375b31cbb2d6649e)
Miikka Heikkinen [Thu, 5 May 2011 11:10:51 +0000 (14:10 +0300)]
Fix initial main window dimensions for "fullscreen with softkeys" case
The application main window defaults to fullscreen size when initially
constructed, even if softkeys are specified for it, as the screen
furniture is constructed later in show_sys. This resulted in the main
window being partially under softkeys.
Fixed by invoking handleClientAreaChange() explicitly in show_sys in
fullscreen with softkeys case.
Task-number: QTBUG-19043
Reviewed-by: Sami Merila
(cherry picked from commit
e8fc93973a41f193665baa5fdc26cba951bd692f)
Shane Kearns [Wed, 4 May 2011 16:41:22 +0000 (17:41 +0100)]
Fix spelling mistake
Reviewed-by: Trust Me
(cherry picked from commit
b166c30d8d0834518337ded44d2ebfe097ee312f)
Bjørn Erik Nilsen [Mon, 2 May 2011 10:39:45 +0000 (12:39 +0200)]
Fixes crash in QWidget::effectiveWinId.
Widgets are left in a transitional (and incosistent) state while being
re-parented, which caused QWidget::effectiveWinId() to crash in certain
circumstances. See patch for more details.
Auto test included.
Reviewed-by: ogoffart
(cherry picked from commit
6db0153cd7e35e4a919a76ae2aadbf2d2510bfb7)
Shane Kearns [Wed, 20 Apr 2011 15:21:36 +0000 (16:21 +0100)]
Fix crash when QSocketNotifier used with an invalid descriptor
select code for open C file/socket descriptors was crashing in FD_SET
if a QSocketNotifier was created with an invalid descriptor.
Added two autotests to QSocketNotifier, one to check notifiers with
bogus socket descriptors don't crash, the other to check that notifiers
with posix socket descriptors do work. (symbian socket engine doesn't
use them so they are not implicitly tested)
Reviewed-by: mread
Task-Number: QTBUG-18138
(cherry picked from commit
8a9a6afcf02f089f932bc81431ab46a60af32134)
Shane Kearns [Wed, 13 Apr 2011 17:04:00 +0000 (18:04 +0100)]
Optimisation - buffer packet read in pendingDatagramSize
In Symbian, the OS function to get the size of a pending datagram also
includes the size of the packet header (which is different for IPv4 and
IPv6). We were reading the datagram with the "peek" flag set to
implement pendingDatagramSize, then reading again normally when the
client called read/readDatagram.
This change removes the "peek" flag, and buffers the datagram in the
socket engine, returning it and clearing the buffer when read or
readDatagram is called.
If there is no buffered data, the existing code path is followed - it
isn't mandatory to call pendingDatagramSize before reading from the
socket.
Reviewed-by: Markus Goetz
(cherry picked from commit
dd8de4c2437397748daba49569cbc7f89a8bfbee)
Shane Kearns [Tue, 12 Apr 2011 17:01:49 +0000 (18:01 +0100)]
Remove warnings when disabling notifications on a closed socket
The generic layer calls setReadNotificationEnabled(false) on sockets
after they are closed. This no longer causes a warning from the symbian
socket engine. A warning will only be emitted if trying to enable
notifications on a closed socket.
Task-number: QTBUG-18713
Reviewed-by: Markus Goetz
(cherry picked from commit
0aa780235c24ed724fcf6a9095a6467e34b9346e)
Shane Kearns [Tue, 12 Apr 2011 16:58:12 +0000 (17:58 +0100)]
Fix some warnings in symbian network tests
Ignore warning when the test intentionally sets an invalid socket descriptor.
Make sure to set content type on all http post tests in tst_qnetworkreply.
Run test with enough capabilities to avoid platsec errors when accessing
certificate store.
Reviewed-By: Markus Goetz
(cherry picked from commit
9632fdefa9012ca11cd1345d66bafd6f417de88e)
Qt Continuous Integration System [Wed, 11 May 2011 13:47:33 +0000 (23:47 +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 tst_QVariant::invalidColor
Move QTextCursor::MoveStyle to Qt namespace
Add some QRawFont related low level functions to avoid extra copying
Jiang Jiang [Wed, 11 May 2011 13:21:14 +0000 (15:21 +0200)]
Fix tst_QVariant::invalidColor
Since
a423ff5474b89028eeca95b254f5184311c8223b, the warning message is
no longer produced.
Reviewed-by: Samuel Rødal
(cherry picked from commit
8a5e82732be3aac37d14ef85c6974add46c6b65f)
Jiang Jiang [Wed, 11 May 2011 10:13:01 +0000 (12:13 +0200)]
Move QTextCursor::MoveStyle to Qt namespace
We cannot use QTextCursor::MoveStyle enums in QTextLine because
QTextCursor is not a QObject, while referring to that enum in
Q_PROPERTY requires it to be. That's why we need to move the
enums in Qt namespace.
Reviewed-by: David Boddie
(cherry picked from commit
5eba82b752e85a5d6cb3a893214ed2646d75f362)
Jiang Jiang [Tue, 10 May 2011 11:30:33 +0000 (13:30 +0200)]
Add some QRawFont related low level functions to avoid extra copying
Added functions:
- QRawFont::glyphIndexesForChars(const QChar *chars, int numChars,
quint32 *glyphIndexes, int *numGlyphs) const
- QRawFont::advancesForGlyphIndexes(const quint32 *glyphIndexes,
QPointF *advances, int numGlyphs) const
Reviewed-by: Eskil
(cherry picked from commit
965af9eb2932efae5d736df54c3859460017b6a5)
Qt Continuous Integration System [Wed, 11 May 2011 13:20:45 +0000 (23:20 +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 GLES2 include path for applications when not using the dash shell
Paul Olav Tvete [Wed, 11 May 2011 10:32:46 +0000 (12:32 +0200)]
Fix GLES2 include path for applications when not using the dash shell
Backslash escapes normally requires "-e" option to echo
Reviewed-by: Jørgen
(cherry picked from commit
68f37a29f911fce5bcdd285b1fc1bc6d4868d78e)
Qt Continuous Integration System [Wed, 11 May 2011 12:30:28 +0000 (22:30 +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 to commit
7fce0a73cc9b099c4ca67b3bc2e8bbe3060230c6.
Kim Motoyoshi Kalland [Wed, 11 May 2011 12:24:45 +0000 (14:24 +0200)]
Qt Continuous Integration System [Wed, 11 May 2011 11:47:11 +0000 (21:47 +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:
tests: fixed or disabled qtbase tests with circular dependencies
Rohan McGovern [Wed, 11 May 2011 09:57:01 +0000 (19:57 +1000)]
tests: fixed or disabled qtbase tests with circular dependencies
tst_lancelot did QT+=svg, but didn't actually use QtSvg.
qlocalsocket/lackey uses QtScript, which is not available when compiling
qtbase.
Change-Id: Ic3cc5a6f74a58ee8f2fdc48b9c852d9551b85f68
Qt Continuous Integration System [Wed, 11 May 2011 10:41:00 +0000 (20:41 +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:
Check if OES_texture_npot is present on OpenGL ES 2.
Kim Motoyoshi Kalland [Wed, 11 May 2011 08:53:00 +0000 (10:53 +0200)]
Check if OES_texture_npot is present on OpenGL ES 2.
Unless the OES_texture_npot extension is present, non-power-
of-two textures have some restrictions on OpenGL ES 2.
Reviewed-by: Samuel
Qt Continuous Integration System [Wed, 11 May 2011 08:18:18 +0000 (18:18 +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:
Fix a bug in syncqt.
Liang Qi [Wed, 11 May 2011 08:05:43 +0000 (10:05 +0200)]
Fix a bug in syncqt.
Move the generation of version header file before the sync of header
files.
Reviewed-by: TrustMe
Qt Continuous Integration System [Wed, 11 May 2011 07:11:28 +0000 (17:11 +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:
tests: fix private header inclusion in qtbase autotests
tests: disable tests in qtbase which depend on qtsvg
tests: make benchmarks compile or disable those which don't compile
tests: remove references to benchmark directories which don't exist
tests: enable compilation of autotests for qtbase by default
tests: make tst_qrawfont compile for QGlyphs -> QGlyphRun API change
tests: mark some tests as using private API
Rohan McGovern [Wed, 11 May 2011 04:02:54 +0000 (14:02 +1000)]
tests: fix private header inclusion in qtbase autotests
Any test which needs private headers from some Qt module must do:
QT += modulename-private
Reviewed-by: Jason McDonald
Change-Id: I6924a577a960e4990f4379b02bca4822d8248fb4
Rohan McGovern [Wed, 11 May 2011 04:02:41 +0000 (14:02 +1000)]
tests: disable tests in qtbase which depend on qtsvg
Reviewed-by: Jason McDonald
Change-Id: I2416d34b5c262e20ee18f7121e8745327d5614f8
Rohan McGovern [Wed, 11 May 2011 04:00:53 +0000 (14:00 +1000)]
tests: make benchmarks compile or disable those which don't compile
Reviewed-by: Jason McDonald
Change-Id: Idc9fa4722b59f9b75d5e4a91bbfd0ae068d29b3d
Rohan McGovern [Wed, 11 May 2011 03:04:08 +0000 (13:04 +1000)]
tests: remove references to benchmark directories which don't exist
Reviewed-by: Jason McDonald
Change-Id: I14d0981c9f962c4eb048ca426a8ba19aa7ea66de
Rohan McGovern [Tue, 10 May 2011 23:21:51 +0000 (09:21 +1000)]
tests: enable compilation of autotests for qtbase by default
Tests are now treated like examples and demos: compiled by default,
unless you configured with `-nomake tests'. (They are still not
installed by default, however.)
Reviewed-by: Jason McDonald
Change-Id: Ifc56f6763bb2aafe6fe57b684751f99ec82ea26f
Rohan McGovern [Tue, 10 May 2011 23:53:54 +0000 (09:53 +1000)]
tests: make tst_qrawfont compile for QGlyphs -> QGlyphRun API change
Broken by
051ef6f294e8cbfa1e30e99e7fd4cf5fb38393f4
Reviewed-by: Jason McDonald
Change-Id: Ia8589aba1bfb71d000d8fad455d90e704ba28972
Rohan McGovern [Wed, 11 May 2011 00:05:36 +0000 (10:05 +1000)]
tests: mark some tests as using private API
These autotests are all using private symbols, available only when Qt is
configured with -developer-build. So, gracefully disable them when
the private symbols are not available.
Reviewed-by: Jason McDonald
Change-Id: Iafd1c7af486feeee810110bc021e75984827f78a
Qt Continuous Integration System [Tue, 10 May 2011 16:07:56 +0000 (02:07 +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:
Prevent crash in wayland mimedata in case there is no offer.
Laszlo Agocs [Tue, 10 May 2011 16:03:43 +0000 (18:03 +0200)]
Prevent crash in wayland mimedata in case there is no offer.
Qt Continuous Integration System [Tue, 10 May 2011 14:10:15 +0000 (00:10 +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:
Add QT_xxx_VERSION macros for each library in qtbase
Qt Continuous Integration System [Tue, 10 May 2011 13:49:29 +0000 (23:49 +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:
Prevent having Status undefined in xlib platform plug-in.
Laszlo Agocs [Tue, 10 May 2011 13:42:01 +0000 (15:42 +0200)]
Prevent having Status undefined in xlib platform plug-in.
Commit
4b75ceea08815c096ec35a077c5c1e3bfca0e5ed changed
qcoreapplication_p.h to include qsettings.h, which undefines Status.
This breaks the xlib platform plug-in (and its includes).
Liang Qi [Tue, 10 May 2011 13:15:15 +0000 (15:15 +0200)]
Add QT_xxx_VERSION macros for each library in qtbase
Provide version info for each library like QTCORE_VERSION and etc.
Task-number: QTMODULARIZATION-44
Reviewed-by: axis
Qt Continuous Integration System [Tue, 10 May 2011 11:43:23 +0000 (21:43 +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: (142 commits)
ifdef out mac/no_coreservices path more cleanly
fix build on symbian
Allow different text for undo actions and items in QUndoView
Allow using not only prefixes for undo command text
QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH_MAX case
Massively update the hurd-g++ mkspec.
Do not allow multiple threads to acquire a QMutex
Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget.
don't crash in QProcessEnvironment::systemEnvironment()
HTTP backend: do not load resources from cache that must be revalidated
Compile fix for QLocale on Symbian.
Added Kazakh language to the QLocale mapping table on Symbian.
Added support for QLocale::uiLanguages on Symbian.
Fix drawing text in item view:
Add enablers for Symbian App Booster
Don't rely on uninitialized data
Don't realloc user-provided buffer
qmake: Introduce new template type
Make autotest more resilient against network timeout (cherry picked from commit
50be38737507f5c23b4d050e635a200024164a13)
Do not filter adhoc clients (cherry picked from commit
4fe5307af44a76b99cc8c70aa330180c1985eabc)
...
Qt Continuous Integration System [Tue, 10 May 2011 11:21:45 +0000 (21:21 +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:
Compile on Mac
Olivier Goffart [Tue, 10 May 2011 11:15:10 +0000 (13:15 +0200)]
Merge remote-tracking branch 'staging/master'
Eskil Abrahamsen Blomfeldt [Tue, 10 May 2011 11:06:57 +0000 (13:06 +0200)]
Compile on Mac
Missing API update in Q_WS_MAC block
Reviewed-by: Jiang Jiang
(cherry picked from commit
4b95d9939db75d7bd55db4bbbf2d67af459f7eb5)
Oswald Buddenhagen [Mon, 9 May 2011 15:44:48 +0000 (17:44 +0200)]
ifdef out mac/no_coreservices path more cleanly
the symbian path was also dead
(cherry picked from commit
76ac26383922b4c452592a9175e7f3b9b3fd2513)
Oswald Buddenhagen [Mon, 9 May 2011 15:42:53 +0000 (17:42 +0200)]
fix build on symbian
provide dummy implementation of QProcessEnvironment::systemEnvironment()
(cherry picked from commit
e4920a4b4bc454ad309324a62db0e9257bba7367)
Alexander Potashev [Mon, 9 May 2011 08:39:18 +0000 (10:39 +0200)]
Allow different text for undo actions and items in QUndoView
Now the texts used for undo actions and for items in QUndoView can
be set separately. This introduces an extended format of text that
can be passed to QUndoCommand::setText or QUndoCommand constructor.
The action text can now contain two strings separated by a "\n". The
first string (that goes before "\n") is then returned by
QUndoCommand::text() and used as name of item in QUndoView.
The second string (that goes after "\n") is returned by
QUndoCommand::actionText() and used when the text properties of the
undo and redo actions are updated.
If the text passed to QUndoCommand does not contain "\n", everything
works as before, and both QUndoCommand::text() and
QUndoCommand::actionText() return the same string.
Even though action text in English usually does not need different forms
for undo actions and QUndoView item, translators can employ this new
command text format, for example to adjust the grammatical case used in
command text to match the context of "Undo %1"/"Redo %1".
Merge-request: 2610
Reviewed-by: ossi
(cherry picked from commit
9b784789c75d59b27530bbf1d12676cc44f64f46)
Alexander Potashev [Mon, 9 May 2011 08:35:29 +0000 (10:35 +0200)]
Allow using not only prefixes for undo command text
Functions QUndo{Group,Stack}::create{Undo,Redo}Action() now use action
text templates "Undo %1" and "Redo %1" if no custom prefix was provided.
This makes more flexible translations possible. The surrounding text
(like "Undo" and "Redo") can now be suffixed to the command name as
German and Korean languages require ("%1 rueckgaengig machen" for German).
Also, now the default action text (when no command can be undone) can be
translated differently from the prefix. For example, it can be
translated as "Undo action", not just "Undo".
When a non-empty prefix is passed to QUndo*****::create****Action(),
those functions work as before, and the features described above become
unavailable.
Task-number: QTBUG-14442
Merge-request: 1212
Reviewed-by: ossi
(cherry picked from commit
213c25ad24e4f3b0a44f82f23d34746cd294f8d6)
Pino Toscano [Thu, 5 May 2011 17:19:28 +0000 (19:19 +0200)]
QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH_MAX case
... in the same way as done in the other code path.
This makes qmake/QtCore compile again on glibc systems without PATH_MAX (e.g. GNU/Hurd).
Merge-request: 1218
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
c8812fe6e642520532d65744caefcea790d59de8)
Pino Toscano [Thu, 5 May 2011 17:18:23 +0000 (19:18 +0200)]
Massively update the hurd-g++ mkspec.
Bring it to the same level as linux-g++:
- copy the defines from common/linux.conf
- use the common gcc/g++ .conf files
- keep the trick of linking the pthread library everywhere
- leave out the wayland variables, which are not useful for Hurd
Merge-request: 1219
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
027605f67f73c8021c1ae604adad298599785a79)
Bradley T. Hughes [Thu, 5 May 2011 15:03:54 +0000 (17:03 +0200)]
Do not allow multiple threads to acquire a QMutex
After the mutex optimizations on Mac, we did not handle the case where
semaphore_wait() could return KERN_ABORTED. Under heavy contention, this
happens, and when running in release mode, the assert in qmutex.cpp is not
executed. The code silently allows multiple threads to continue as if it
had acquired the mutex exclusively.
Fix this by checking for KERN_ABORTED from semaphore_wait(), and retry the
wait. We do not handle KERN_ABORTED for timed waits, simply return false and
let the code doing the tryLock() handle it how it deems best.
Reviewed-by: joao
(cherry picked from commit
b54af0a9d6406356616889826e31925d2fa05718)
Robin Burchell [Thu, 5 May 2011 08:49:59 +0000 (10:49 +0200)]
Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget.
This case may be triggered in the (admittedly slightly abnormal) case where a
user wishes to embed the calendar widget in a layout or, for whatever reason, do
something else that will change its ownership.
We work around this by detecting when it is deleted and recreating the widget.
This will also have a positive side effect if setCalendarWidget() is called with
a widget which is then subsequently deleted, returning the default widget
instead of a pointer to (now deleted) memory.
Reviewed-by: Denis Dzyubenko
Merge-request: 2568
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
(cherry picked from commit
124ec3200f8453142717fcfe7a4aa0a55164aaa6)
Oswald Buddenhagen [Wed, 4 May 2011 20:06:36 +0000 (22:06 +0200)]
don't crash in QProcessEnvironment::systemEnvironment()
as the implementations moved to platform-specific files, the
QSharedDataPointer<QProcessEnvironmentPrivate>::detach() specialization
needs to go to the private header.
Reviewed-by: thiago
(cherry picked from commit
c79246683a5033f605acd59d1c37d68381383a06)
Peter Hartmann [Wed, 4 May 2011 11:47:06 +0000 (13:47 +0200)]
HTTP backend: do not load resources from cache that must be revalidated
The header field "Cache-Control: must-revalidate" is a strict
requirement for loading the resource from the server, and not reading it
from the cache without revalidating first. With this patch, PreferCache
will load such from the network instead of loading them from the cache,
and AlwaysCache will throw a ContentNotFound error.
Reviewed-by: Markus Goetz
Task-number: QTBUG-18983
(cherry picked from commit
0e449f38894b1bd2dbb2f14206a011424679f063)
Denis Dzyubenko [Wed, 4 May 2011 11:07:54 +0000 (13:07 +0200)]
Compile fix for QLocale on Symbian.
The previous change added new ELangEnglish_India that doesn't
necesserally present in all SDKs.
Reviewed-by: trustme
(cherry picked from commit
154ab1cb4c4cdf34f21fc93b078f91cc79048bd4)
Denis Dzyubenko [Tue, 3 May 2011 14:22:43 +0000 (16:22 +0200)]
Added Kazakh language to the QLocale mapping table on Symbian.
Reviewed-by: trustme
(cherry picked from commit
c6808af66d45541546b30c8e6de155b9812b4ef9)
Denis Dzyubenko [Tue, 3 May 2011 14:18:42 +0000 (16:18 +0200)]
Added support for QLocale::uiLanguages on Symbian.
Extended the mapping table that matches symbian device languages to a
locale name and language code.
Task-number: QTBUG-7329
Reviewed-by: trustme
(cherry picked from commit
93233fc811920002d5b5b8272d9b5b8d5d3e2b98)
Olivier Goffart [Tue, 3 May 2011 17:36:26 +0000 (19:36 +0200)]
Fix drawing text in item view:
Put back code that was removed by mistake in
e8019cf8feb402303e6d253f5ca58bebfda42679
Task-number: QTBUG-18998
(cherry picked from commit
bbbd4b8f3949b58d4fd21854241cb46cbc024a80)
Simon Frost [Tue, 3 May 2011 17:29:56 +0000 (18:29 +0100)]
Add enablers for Symbian App Booster
To use the Symbian App Booster, a registration file (matching the
filename of the executable, eg helloworld.applite) must be copied to the
import folder within QtAppBooster's private directory. The appropriate
library (qdeclarativebooster) must also be linked against. With this
change, the required actions are carried out by adding
"CONFIG += symbian_appbooster" to the application's .pro file.
Task-number: QT-4892
Reviewed-by: Miikka Heikkinen
(cherry picked from commit
ae128aef03d246c9f89bed015092b1c5a925bcbc)
João Abecasis [Mon, 2 May 2011 11:49:36 +0000 (13:49 +0200)]
Don't rely on uninitialized data
HB_GetCharAttributes used to require a zero-initialized array for
attributes, as it selectively sets relevant bits for each character. We
ease that requirement by always initializing the attributes buffer
explicitly with memset.
Task-number: QT-4911
Reviewed-by: Ritt Konstantin
(cherry picked from commit
4cb9db404224c55859713c282aa90409e375c372)
João Abecasis [Mon, 2 May 2011 11:46:40 +0000 (13:46 +0200)]
Don't realloc user-provided buffer
When QTextBoundaryFinder doesn't own the buffer, don't realloc it and
get a new one instead.
Reviewed-by: Ritt Konstantin
(cherry picked from commit
320f172c851a4720299297c8b3b757eb1202c568)
Christian Kandeler [Tue, 3 May 2011 13:30:28 +0000 (15:30 +0200)]
qmake: Introduce new template type
The template type "aux" is intended for projects that do not require building anything, but may need to install stuff (e.g. applications with QML entry point).
Reviewed-by: Joerg Bornemann
(cherry picked from commit
56443421cb5e537e60abd7ced42c9ebf587683fe)
aavit [Tue, 3 May 2011 11:32:23 +0000 (13:32 +0200)]
Make autotest more resilient against network timeout
(cherry picked from commit
50be38737507f5c23b4d050e635a200024164a13)
aavit [Wed, 27 Apr 2011 11:01:47 +0000 (13:01 +0200)]
Do not filter adhoc clients
(cherry picked from commit
4fe5307af44a76b99cc8c70aa330180c1985eabc)
aavit [Wed, 27 Apr 2011 10:37:19 +0000 (12:37 +0200)]
Lancelot: Add configurable client filtering to baseline server
(cherry picked from commit
d499f7ca995e40f7a75f913ff0f07d9a73fa3559)
aavit [Mon, 11 Apr 2011 13:34:06 +0000 (15:34 +0200)]
Improve error reporting on failure to connect to baseline server
(cherry picked from commit
9d75ff6fa8f8844ff6599b68618821cd8c501757)
Samuel Rødal [Tue, 3 May 2011 10:36:08 +0000 (12:36 +0200)]
Fixed bug in X11 backend when creating translucent windows.
We forgot to send the ParentAboutToChange event, which meant QGLWidget
didn't destroy the old EGL surface. This could cause two EGL surfaces to
be created for the same QGLWidget, which leads to undefined behaviour on
some platforms.
(cherry picked from commit
5a834d7141cc7d29d022911ccec16e628d94acf1)
Olivier Goffart [Tue, 3 May 2011 09:53:34 +0000 (11:53 +0200)]
Fix the tst_QPluginLoader::loadCorruptElf on 64 bit
The error message do not match
Reviewed-by: Arvid Ephraim Picciani
(cherry picked from commit
383f57dd2669b71fd14cf9b6b56213423a3d2d01)
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)