qt:qt.git
9 years agoMake the rules for redirects a bit stricter. v4.8.4
Richard Moore [Mon, 19 Nov 2012 20:48:39 +0000 (20:48 +0000)]
Make the rules for redirects a bit stricter.

Change-Id: I7a3cec664aa028202de3d3bda9f499e4deb2998d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
9 years agotests: Mark flaky tests as insignificant
Sergio Ahumada [Thu, 22 Nov 2012 21:31:31 +0000 (22:31 +0100)]
tests: Mark flaky tests as insignificant

Task-number: QTQAINFRA-574
Change-Id: I385818d81d2565285e9402c0b6d63938f9019081
Reviewed-by: Richard J. Moore <rich@kde.org>
9 years agoRevert "QtConcurrent: Fix for leak in QFuture"
Thiago Macieira [Sun, 18 Nov 2012 22:54:41 +0000 (23:54 +0100)]
Revert "QtConcurrent: Fix for leak in QFuture"

This reverts commit 28b06b3ebae3d411c74f09fa7de52bc290c47dc3

That commit contains new symbols added in a patch release of Qt. That is not permitted.

Change-Id: I1d36b50d4c26aa32072fd3f9c311a0e773527abd
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
9 years agoFix failing tst_QWidget_window::tst_showWithoutActivating() test.
Mitch Curtis [Mon, 12 Nov 2012 14:28:14 +0000 (15:28 +0100)]
Fix failing tst_QWidget_window::tst_showWithoutActivating() test.

Change-Id: I3d7acf98f12ff71a6cea803ff7af430c66b972b8
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
9 years agoFix regression introduced in QFileSystemEntry::path()
Andy Shaw [Thu, 27 Sep 2012 04:08:34 +0000 (06:08 +0200)]
Fix regression introduced in QFileSystemEntry::path()

When fd2eb070128ab6ef6b5c9343a0921f6b5a0bc041 was backported it
shouldn't have included the change to path() as this introduced
a behaviour change.  This reverts that part of the patch so it
is back to Qt 4.8.2 behavior.

Task-number: QTBUG-27356

Change-Id: I7c19dda473e7aa2c53baed961c3b0e0d322362fe
Reviewed-by: João Abecasis <joao@abecasis.name>
9 years agoFix compile issue with building with openssl and in a namespace
Andy Shaw [Fri, 16 Nov 2012 13:29:35 +0000 (14:29 +0100)]
Fix compile issue with building with openssl and in a namespace

Task-number: QTBUG-25207

Change-Id: I20ab722d3fcb74d90d9010c5c7c303f586e0d7c7
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoMake the qatomic classes work in ARMv5 OABI.
Tomasz Duda [Sat, 17 Nov 2012 18:45:21 +0000 (19:45 +0100)]
Make the qatomic classes work in ARMv5 OABI.

The function testAndSetOrdered is not atomic.
The context of a thread may be interrupted inside testAndSetOrdered
and then if another thread calls fetchAndStoreOrdered, _q_value may be
overwritten. After that _q_value will contain random value
depending on where testAndSetOrdered was interrupted.
It should not be possible for the atomic classes.

Since the commit 8a7b5aca7b6575013a4e4ee9b99808d25edf6fdf
introduced new implementation of QMutex for linux
the bug causes deadlock.

Change-Id: Ib9ffcf0e26d3be36a0e158fd12a363b97177dcbf
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoQString doesn't work with old ABI on ARM.
Tomasz Duda [Sat, 17 Nov 2012 17:56:16 +0000 (18:56 +0100)]
QString doesn't work with old ABI on ARM.

QString doesn't work on ARM platform with old ABI because QChar has
wrong size. Macro Q_PACKED was removed by commit
1ec8acd77b6c048f5a68887ac7750b0764ade598. Some projects still use
old ABI. It is better to check version of ABI during compiling.

Task-number: QTBUG-15784

Change-Id: I92180b864679e01363fa837260707b67674d0a26
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoFixed memory leak in assign operator of QGLBuffer
Vadim Zakondyrin [Sat, 17 Nov 2012 13:25:06 +0000 (20:25 +0700)]
Fixed memory leak in assign operator of QGLBuffer

Change-Id: I90b7e3f352fb7ceea7befabbab7d3b67213dd45f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
9 years agoBlackberry fixed crash when plugging in a secondary display.
Fabian Bumberger [Thu, 15 Nov 2012 11:16:23 +0000 (12:16 +0100)]
Blackberry fixed crash when plugging in a secondary display.

This bug is only in the Qt4 version of the plugin. In Qt5 attaching a screen works just fine.

Change-Id: I45ebc51c6da9999e7d2e4f453379fbc18dd6f857
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
9 years agoFix code convention docs
Alan Alpert [Wed, 7 Nov 2012 00:29:04 +0000 (16:29 -0800)]
Fix code convention docs

The previously specified convention prevents change handlers from
being created properly. Another convention is being suggested instead.

Task-number: QTBUG-27852
Change-Id: I32a3f6f6c01e628457b30479505b32f1c5bbc92c
Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
9 years agotest: Fix tst_qdeclarativexmlhttprequest failure on Windows.
Sergio Ahumada [Sat, 10 Nov 2012 22:46:31 +0000 (23:46 +0100)]
test: Fix tst_qdeclarativexmlhttprequest failure on Windows.

Disable line ending conversion for test data files so that they are
served as lf on all platforms.

Task-number: QTBUG-26703
Change-Id: Id5f5cdc2eeaf8acf92b9e2d903518c555f1741c1
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergey Hambardzumyan <sergey.hambardzumyan@digia.com>
9 years agoWhen clicking on a menu item which has a sub menu it should not close
Andy Shaw [Fri, 9 Nov 2012 08:43:03 +0000 (09:43 +0100)]
When clicking on a menu item which has a sub menu it should not close

If you clicked on a menu with a submenu then it should do nothing as
this is what the native behaviour is on Mac.

Task-number: QTBUG-10706
Change-Id: I7c8898b4b35a8189e1a8270d8a528eb56c81aed7
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
9 years agoOn 32bit applications it would not get out of the waiting state
Andy Shaw [Mon, 12 Nov 2012 09:41:14 +0000 (10:41 +0100)]
On 32bit applications it would not get out of the waiting state

Specifically for 32bit applications it would not get out of the waiting
state when using the Cocoa API, the QuickTime API works fine in this
respect so we can fallback to this instead.

Change-Id: I768009c1e90e8c67ed518288971f11c3e7a1c2ee
Reviewed-by: aavit <eirik.aavitsland@digia.com>
9 years agotest: Mark some tst_QGraphicsProxyWidget functions as XFAIL
Sergio Ahumada [Wed, 7 Nov 2012 23:58:20 +0000 (00:58 +0100)]
test: Mark some tst_QGraphicsProxyWidget functions as XFAIL

Task-number: QTBUG-27885
Change-Id: I5b54713724a7bbe1458f6ca13cb7e3a59a24e877
Reviewed-by: Sergey Hambardzumyan <sergey.hambardzumyan@digia.com>
9 years agoFix zero-duration animations running Backwards.
Andreas Aardal Hanssen [Tue, 13 Nov 2012 18:06:25 +0000 (19:06 +0100)]
Fix zero-duration animations running Backwards.

If you set the duration of any variant or property animation to 0,
its progress will be stuck at 1 (0..1), and its "end" value set on
the target object, after start() has been called. If you change the
direction of the animation to QAbstractAnimation::Backward, you
would expect the progress to be 0 after start. Instead it's still
1; the code seems to assume that if the duration is 0, the
progress must be 1 always.

The fix is that if the duration is 0, the direction is checked to
determine whether progress should be 0 (Backward) or 1 (Forward).

Task-number: QTBUG-27969
Change-Id: Ibeca084bbbce41df1dca7b7d96c15b6b54394996
(cherry-picked from qtbase/f3597af5adcd2275503e9e4bfb425549f9ab3ced)
Reviewed-by: Thierry Bastian <thierryb@filewave.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
9 years agoFix scrolldown arrow not showing on popup for QMenu
Miikka Heikkinen [Thu, 4 Oct 2012 13:09:02 +0000 (16:09 +0300)]
Fix scrolldown arrow not showing on popup for QMenu

Scrolldown arrow was not shown when a taller than screen QMenu was
opened because the check to draw it used the size that was already
adjusted to the screen.

Fixed by using the actual menu size in the check. Also fixed the case
where the menu was scrolled, closed, and reopened, in which case the
size hint would return incorrect cached value. This led to scrolldown
arrow not being shown in case the menu was previously fully scrolled
down.

Task-number: QTBUG-27445
Change-Id: Icd8d774071662a9317b3ac53cb05b31cadba96ff
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
(cherry picked from qt5/qtbase commit fe8eb057fa05433e96de21df34871647f421f962))

9 years agoWindows: Fixed handling of key events containing ctrl modifier
Oliver Wolff [Wed, 14 Nov 2012 12:06:15 +0000 (13:06 +0100)]
Windows: Fixed handling of key events containing ctrl modifier

QKeyEvent::key() returned the wrong value if the ctrl modifier was used
in that key event. That was due to the fact that ToUnicode might not
return the correct code for these events/keyboard states. While it works
for alt+shift+= (us layout) and gives '+' as unicode value it just
claims that it cannot translate the given state for ctrl+shift+=. So if
the control modifier is used and ToUnicode return 0 toKeyOrUnicode
should try again without the control modifier.

Task-number: QTBUG-10781
Change-Id: I771f7ed18bcce60d1c7c3f6157d169d4e80ddd60
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
9 years agoDon't use Cocoa code unconditionally
Andy Shaw [Mon, 12 Nov 2012 14:58:15 +0000 (15:58 +0100)]
Don't use Cocoa code unconditionally

The Cocoa code should only be used if QT_MAC_USE_COCOA is defined, this
was causing problems in Carbon with menus which are now resolved.

Task-number: QTBUG-27960

Change-Id: I60186d69a869def4b2f03f1b0fdde82208fcfbe5
Reviewed-by: Pasi Matilainen <pasi.matilainen@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
9 years agoFix syntax error on configure.exe source code.
Rafael Roquetto [Mon, 12 Nov 2012 21:34:37 +0000 (19:34 -0200)]
Fix syntax error on configure.exe source code.

Change-Id: I4859e5f02d84791f59652298f62abe8d2984af06
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
9 years agofix binding of bool type in mysql driver
Mark Brand [Tue, 30 Oct 2012 09:51:25 +0000 (10:51 +0100)]
fix binding of bool type in mysql driver

MYSQL_TYPE_TINY should be used for binding bool input value.
MYSQL_TYPE_LONG might be too big for bool, resulting in bools being
saved in the database as int 127. The problem was not specific to
the vendor's BOOL column type.

http://dev.mysql.com/doc/refman/5.0/en/numeric-type-overview.html
http://dev.mysql.com/doc/refman/5.0/en/c-api-prepared-statement-type-codes.html

Added generic autotest to make sure that binding bool works. All
drivers should pass this test.

Task-number: QTBUG-27763
Change-Id: I4e69f8e3b32fffb702ec9fa8a80ff5c50dea954b
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
(cherry picked from qt5/qtbase commit 593b8f7f0b35ddc424d8ccbd5df11fcf2442858e))

9 years agotest: Fix tst_QHostInfo test
Sergio Ahumada [Fri, 9 Nov 2012 00:24:32 +0000 (01:24 +0100)]
test: Fix tst_QHostInfo test

 Changed qt.nokia.com  -> qt-project.org
 Changed 87.238.50.178 -> 87.238.53.172

Task-number: QTQAINFRA-574
Change-Id: Ib85a03b15a13a066d3e095e5e2bc6060a9d093dd
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
9 years agotest: Mark tst_GuiAppLauncher::run() as XFAIL
Sergio Ahumada [Sat, 10 Nov 2012 20:54:55 +0000 (21:54 +0100)]
test: Mark tst_GuiAppLauncher::run() as XFAIL

Task-number: QTBUG-27938
Change-Id: I6cde6167ace521e88635593aaaebd8f372fec7b3
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergey Hambardzumyan <sergey.hambardzumyan@digia.com>
9 years agotest: Mark tst_ExceptionSafety_Objects::objects() as QSKIP
Sergio Ahumada [Sat, 10 Nov 2012 22:27:36 +0000 (23:27 +0100)]
test: Mark tst_ExceptionSafety_Objects::objects() as QSKIP

This test is crashing so marking it as QSKIP.

Task-number: QTBUG-18927
Change-Id: Iba6e6f556793747f09d2a8fa6af5c9169a53dfe9
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
9 years agotest: Mark tst_QMdiSubWindow::setOpaqueResizeAndMove as XFAIL
Sergio Ahumada [Fri, 2 Nov 2012 13:59:03 +0000 (14:59 +0100)]
test: Mark tst_QMdiSubWindow::setOpaqueResizeAndMove as XFAIL

Task-number: QTBUG-26803
Change-Id: I3d4b48353256f982cae8f6d19db98971e46cbdb6
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
9 years agotest: fix tst_QLocale::macDefaultLocale
Sergio Ahumada [Fri, 9 Nov 2012 16:49:22 +0000 (17:49 +0100)]
test: fix tst_QLocale::macDefaultLocale

1. There is a behaviour change for CFDateFormatterGetFormat() between
10.6 and later, QLocale::dateFormat(QLocale::LongFormat) will return
"MMMM d, yyyy" for 10.6 and "MMMM d, y" for 10.7, 10.8
2. Add a comment for toCurrencyString() test, need another system
settings

(back port from qtbase 65685fbd2a3a587e654807d9ce44708064afdfa2)
Task-number: QTBUG-27790
Change-Id: I668ff8882cf676d4420bf4dd66dc2cdd3b84fc18
Reviewed-by: Liang Qi <liang.qi@digia.com>
9 years agoUpdate Qlocale data with CLDR 2.0.0
Konstantin Ritt [Fri, 2 Nov 2012 07:12:10 +0000 (09:12 +0200)]
Update Qlocale data with CLDR 2.0.0

Change-Id: Ia5adad0b51a8db6e91ad60288eab67e506c19e47
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
9 years agoUpdate Qlocale data with CLDR 1.9.1
Konstantin Ritt [Fri, 2 Nov 2012 06:32:32 +0000 (08:32 +0200)]
Update Qlocale data with CLDR 1.9.1

this is the same data we have in Qt 5 right now.

Change-Id: Ic4cea4fdde2001432f33b0cb658508756cc9e8d3
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
9 years agoMinor fixes to the QLocale data parser/generator
Konstantin Ritt [Fri, 2 Nov 2012 06:16:11 +0000 (08:16 +0200)]
Minor fixes to the QLocale data parser/generator

Change-Id: Id4fd9caa7c9d91d92b6ba414d04ce870a366c1f7
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
9 years agoQtConcurrent: Fix for leak in QFuture
Orgad Shaneh [Sun, 4 Nov 2012 19:21:31 +0000 (21:21 +0200)]
QtConcurrent: Fix for leak in QFuture

To avoid leaking when converting a QFuture<T> to a QFuture<void> we need
to have a separate ref. counter for QFuture<T>. When the last QFuture<T>
goes out of scope, we need to clean out the result data.

backported from qt/qtbase commit 731ba8ed08f80644b403556638c7f6229e678ebe
Original commit by Christian Strømme

Task-number: QTBUG-27224
Change-Id: I0c6b525cf241b5c559a1bab4e0066cd4de556ea8
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
9 years agoFix for memory leak in ResultStore
Orgad Shaneh [Sun, 4 Nov 2012 19:20:53 +0000 (21:20 +0200)]
Fix for memory leak in ResultStore

In ResultStoreBase::addResults() it possible that the ResultItem we
create is invalid (filter-mode enabled). Since an invalid ResultItem
won't have any result data, we need to make sure that we don't allocate
any data for it.

Backported (with minor technical changes) from qt/qtbase commit
6039179373f7552c2a711b06a7d69b9ca9d2b175
Original commit by Christian Strømme

Task-number: QTBUG-27224
Change-Id: I5c941363c211d0414d461e7b1b0274c80f3d69b9
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
9 years agoUse slogger2 for logging on Blackberry instead of writing to stderr
Fabian Bumberger [Tue, 9 Oct 2012 16:03:31 +0000 (18:03 +0200)]
Use slogger2 for logging on Blackberry instead of writing to stderr

Backport from Qt5: c86ed49a7989adb3e2e3c42794e44609f12ce493

Change-Id: I09d84b08f7c90348b4104f7e52d76ee27a4837af
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Peter Hartmann <phartmann@rim.com>
9 years agoqpa: Fix rendering issue in blitter engine (negative scaling factors)
Julien Brianceau [Wed, 7 Nov 2012 15:35:34 +0000 (16:35 +0100)]
qpa: Fix rendering issue in blitter engine (negative scaling factors)

A 180° rotation results in a TxScale QTransform with negative scaling
factors (x=-1.0 y=-1.0). This is not properly handled by blitter paint
engine yet, so use software rendering fallback in this case.

This rendering issue can be seen when using "-webkit-transform" CSS
property in WebKit with DirectFB QPA platform.

cherry-picked from qt5/qtbase 07ea3cf0b3883979e84bd91a5dc6a7a126de3123

Change-Id: I0911fd1166a3968d0a1d6bcca47ce2b26866de44
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
9 years agoAccessibility: itemviews check for valid model.
Frederik Gladhorn [Fri, 19 Oct 2012 12:52:01 +0000 (14:52 +0200)]
Accessibility: itemviews check for valid model.

The problem is that isValid() should return true as
soon as we have a view widget.
That sadly means we need to verify that the model is still
valid whenever accessing it.

This is a backport of the Qt 5 patch
(I9237528abf2f5c75a73382525103307e9ca15f05)

Change-Id: I9237528abf2f5c75a73382525103307e9ca15f05
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
9 years agoFix GIF image decoding: do not zero transparent pixels
aavit [Wed, 7 Nov 2012 14:19:20 +0000 (15:19 +0100)]
Fix GIF image decoding: do not zero transparent pixels

For the special transparent color index, the decoder would skip
writing anything out (thus leaving the pixels at 0 rgba value).
Although correct for later frames, for the initial frame this would
loose the color information for such pixels (which one otherwise
could have made visible e.g. by converting then image to an
alpha-less image format).

Change-Id: I316cefce8f21797feedebfbf98296ad84eaa4b99
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
9 years agoHeaderView - call invalidateCachedSizeHint() on clear
Thorbjørn Lund Martsum [Mon, 5 Nov 2012 05:43:00 +0000 (06:43 +0100)]
HeaderView - call invalidateCachedSizeHint() on clear

This calls invalidateCachedSizeHint on clear, which is a logical
thing to do.

This is a backport of SHA aa2578a1006f17cff50ca39090bae2e1e090b59b

Task-number: QTBUG-22528

Change-Id: I725748b314fd9d09441d3bf34c4607a4cc7162ed
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
9 years agoQNX: Fix build with QNX SDP 6.5.
Sergio Martins [Fri, 2 Nov 2012 12:17:06 +0000 (12:17 +0000)]
QNX: Fix build with QNX SDP 6.5.

__EXT_LF64SRC isn't defined in this case.

This also makes it consistent with mkspecs/common/posix/qplatformdefs.h
which uses QT_USE_XOPEN_LFS_EXTENSIONS and QT_LARGEFILE_SUPPORT
to decide which type of stat struct to declare.

Backport of b8e7265a5055da754c8b4cb2fb97b9367e83791b

Change-Id: I04e990a2402aee347870c3578bf6f76b837b8e1e
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
9 years agoQWindowsVistaStyle: Restore altered brush origin.
Friedemann Kleint [Mon, 5 Nov 2012 09:31:52 +0000 (10:31 +0100)]
QWindowsVistaStyle: Restore altered brush origin.

The line to restore it was missing, and the leftover variable
caused a warning, which was removed in
abe5a0a432116963d22c4ef501a4dfd2393d66fb .

Task-number: QTBUG-27828

Change-Id: I00b8b89b07bec38a1660c3a9c61220b6d0d7eb48
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
(cherry picked from qtbase/96ebbad5f03d6db5fa81f284ccbdaf4b6259c27b)

9 years agoFix submenu navigation.
Friedemann Kleint [Tue, 30 Oct 2012 10:26:40 +0000 (11:26 +0100)]
Fix submenu navigation.

Bring back code that was removed
in Qt 4: 60324267fbb8a8554e62aaf9ef01360709292320 for QTBUG-7411 .

This code reselects the submenu action of a currently opened
popup when the mouse is moved to the submenu crossing other
actions. In addition, make sure it only triggers when
the reason is not keyboard selection.

Task-number: QTBUG-20094
Change-Id: Ibb73f83e86635083aad8b1e79fc0fdd512c65754
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
(cherry picked from qtbase/0a91c9df01ec8f0c4aef9ce6e5e9bc3804fb80c2)

9 years agoAdding PAC and exclusion list support to BlackBerry Qt proxy implementation.
Andrey Leonov [Fri, 26 Oct 2012 18:56:37 +0000 (14:56 -0400)]
Adding PAC and exclusion list support to BlackBerry Qt proxy implementation.

The additional proxy functionality is only available starting BPS API version 3.1.1.

(cherry picked from commit 4b71432987ca9ff059d04f0e5f567b8eb09717f9)

Change-Id: Ia59adf00a15e7b0a8fc124fcbb598c9c7c331358
Reviewed-by: Peter Hartmann <phartmann@rim.com>
9 years agorebuild configure
Oswald Buddenhagen [Mon, 5 Nov 2012 17:41:16 +0000 (18:41 +0100)]
rebuild configure

d7e922e6: QtNetwork: introduce configure switch to use system proxies by default
343f559b: Support other platform names on configure.exe

Change-Id: I2fc57d4ce36469bfe2b7c088375371d229bf8c7d
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
9 years agoQTranslator: Use resource memory instead of copying it
Thomas McGuire [Mon, 29 Oct 2012 15:48:17 +0000 (16:48 +0100)]
QTranslator: Use resource memory instead of copying it

Previously, translations in resource files were loaded through
QFile and the data was copied. Now, simply use the resource memory
in-place.

This is a backport of
qtbase commit 92d75077d686fcad26b5ad02a40c3987fb1fc82b

Change-Id: Id96c58e96db3bed669dd211011aaed880b9a0133
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
9 years agofix bug in QLocalSocket::waitForReadyRead on Windows
Joerg Bornemann [Fri, 2 Nov 2012 11:13:18 +0000 (12:13 +0100)]
fix bug in QLocalSocket::waitForReadyRead on Windows

We must not close the socket, if there's still data in the read buffer.
Also waitForReadyRead must return true, even if the pipe is broken after
we've read data.
QLocalSocket::readData will close the socket after the buffer has been
drained.

This fixes the flakiness of tst_QLocalSocket::threadedConnection.

In Qt5 large portions of this code has been rewritten and this fix does
not apply.

Task-number: QTBUG-27816
Task-number: QTQAINFRA-574
Change-Id: I467340d4dbab11056e6720b145a94a87156cb419
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
9 years agoCocoa: QPrintDialog does not show/closes down immediatly
Richard Moe Gustavsen [Thu, 25 Oct 2012 14:22:08 +0000 (16:22 +0200)]
Cocoa: QPrintDialog does not show/closes down immediatly

This happends if an event loop recursion ends before
the native print dialog gets executed (in the same scope).

The reason is that the event dispatcher gets interrupted as the
first recursion ends. And (because of the big difference between
how AppKit implements modal windows compared to Qt) this sets a flag
in the dispatcher that gets handled on the next callback to
QCocoaEventDispatcher::processPostedEvents. This will tell
the dispatcher to break out of the current modal session.
But since it cannot detect that an alien (native) session is now
running, it closes down that session by accident instead.

While code can be written in the event dispatcher to detect this
problem, it ends up more clean to just work around the problem
from the native dialogs instead. This to avoid making the
dispatcher more complex than it already is. Native dialogs is
a bit messy already, and the work-arounds needed should be
isolated inside those components, and not inside the dispatcher.

Change-Id: I8cb90b3a7a41b2122ae39e1af5eee0746505aa3a
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
9 years agox-compile with mingw: fix codec linker errors
Peter Kümmel [Thu, 18 Oct 2012 15:20:41 +0000 (17:20 +0200)]
x-compile with mingw: fix codec linker errors

Don't build codecs into Core when plugins are used.

Qt5 doesn't use plugins for the codecs any more
and they are part of Core. This change was considered
too drastic for Qt 4.8, so no backport is possible.

Task-number: QTBUG-27618
Change-Id: I01347645cedc6f4ecaf3158ea8336b0672ac9a46
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoQt 4 - QHeaderView - correct drop on manual QHeaderView sectionmove
Thorbjørn Lund Martsum [Fri, 2 Nov 2012 17:25:42 +0000 (18:25 +0100)]
Qt 4 - QHeaderView - correct drop on manual QHeaderView sectionmove

This fixes an error in the calculation of the exact drop position
when an user is moving a section in QHeaderView.

Before we compared a mouse-position local to the widget
(pos) with a summed length of sections (posThreshold).

However we need to consider/substract the headers offset to make
the posThreshold comparable to the local mouse position.

This is a backport of SHA d625535728154fc9ca576bf6472c6b5057a96f17

This solves e.g.
Task-number: QTBUG-14814

Change-Id: I8e2c820dc9018fb3d14b71f28aa317417c997a44
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
9 years agoDoc: Updated links in qt-webpages.qdoc to Digia equivalent.
Jerome Pasion [Tue, 30 Oct 2012 13:57:17 +0000 (14:57 +0100)]
Doc: Updated links in qt-webpages.qdoc to Digia equivalent.

Change-Id: I7b46898ae6ccc08d96095f1658f87c063aa6b487
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
9 years agoRemoved usage of pipe in Blackberry event dispatcher
Bernd Weimer [Wed, 31 Oct 2012 10:36:57 +0000 (11:36 +0100)]
Removed usage of pipe in Blackberry event dispatcher

Using a pipe for thread wake-ups is inefficient and can introduce significant
latency. Replaced the pipe by directly sending a BPS event.

Refactored the wake-up code in the private class of the UNIX event dispatcher.

Backport of 9dacccd0391219c97c01e89f0547ee002abb1e55

Change-Id: I222516f53afdd8daf845249cc33172399cfd6c21
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Jeff Kehres <jkehres@rim.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
9 years agoMove insignificant_test to correct project in qlocalsocket autotest.
Janne Anttila [Fri, 2 Nov 2012 07:21:47 +0000 (09:21 +0200)]
Move insignificant_test to correct project in qlocalsocket autotest.

Build 937 failed again to flaky tst_qlocalsocket autotest. Move
CONFIG+=insignificant_test to correct project to get CI more stable.

Change-Id: I46557ee0d1be9b9168a88595848a745d6140d7ef
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
9 years agoskip flaky tst_QLocalSocket::threadedConnection on Windows
Joerg Bornemann [Fri, 2 Nov 2012 08:44:32 +0000 (09:44 +0100)]
skip flaky tst_QLocalSocket::threadedConnection on Windows

Make sure that we run at least the non-flaky QLocalSocket
tests.

Task-number: QTBUG-27816
Task-number: QTQAINFRA-574

Change-Id: I38bb0111248ff71dc8679e81ca418f9e2f7b98e3
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
9 years agotst_qdeclarativepixmapcache: Remove CONFIG+=parallel_test and mark test as insignificant
Sergio Ahumada [Tue, 30 Oct 2012 17:15:17 +0000 (18:15 +0100)]
tst_qdeclarativepixmapcache: Remove CONFIG+=parallel_test and mark test as insignificant

Task-number: QTQAINFRA-574
Change-Id: Ib6df20784c12104a2f2a46ec4a7842e3af17271b
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Rohan McGovern <rohan@mcgovern.id.au>
9 years agotest: Mark tst_qhttpnetworkconnection as insignificant
Sergio Ahumada [Tue, 30 Oct 2012 17:39:21 +0000 (18:39 +0100)]
test: Mark tst_qhttpnetworkconnection as insignificant

Task-number: QTQAINFRA-574
Change-Id: I7d52efc8dc8a5a24d9269b12b48ea2d5583c3c6c
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Rohan McGovern <rohan@mcgovern.id.au>
9 years agoDoc: Updated links on the documentation's headers.
Jerome Pasion [Mon, 22 Oct 2012 12:42:42 +0000 (14:42 +0200)]
Doc: Updated links on the documentation's headers.

Change-Id: I4e13d27288ef50e7b9d04a12abbc299cb91a7501
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
9 years agoMac: Correct writingSystem check value for Chinese
Liang Qi [Thu, 1 Nov 2012 12:42:42 +0000 (13:42 +0100)]
Mac: Correct writingSystem check value for Chinese

For simplified and traditional Chinese.

Based on the Apple doc: Internationalization Programming Topics -
Language and Locale Designations.

(backport of commit edfb24009cf22a0f0277be5d595b48ef9af9c3bf from qt5/qtbase)

Task-number: QTBUG-27130
Change-Id: I08969bfba17b6a2589dca5da83b668bb2d8f3e31
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
9 years agoBlackberry bearer plugin: Only Report working interfaces as active
Peter Hartmann [Tue, 23 Oct 2012 10:42:20 +0000 (12:42 +0200)]
Blackberry bearer plugin: Only Report working interfaces as active

Some interfaces might be connected but not working (e.g. no IP address,
no gateway etc.)

In practice, this prevents the USB interface (among others) from
being reported as active and thus the QNetworkConfigurationManager
as being reported as online.
We only want Wifi and 3G etc. connections to be reported as online
when they are up.

(cherry picked from commit b9551c1b47277d58d86a82ce15501663257ed9a1)

Change-Id: Ia175d701280db44a08b9535803a94806a5d6f30f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
9 years agocorrect spelling in comment
Mark Brand [Wed, 24 Oct 2012 13:55:53 +0000 (15:55 +0200)]
correct spelling in comment

Change-Id: I6ffa96ac9cda0701c99f839804f400a167fcf9a7
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
(cherry picked from qt5/qtbase commit 9b710bc13b9f8d8cf163d14d1f6e741e7851b06e)
Reviewed-by: David Faure <david.faure@kdab.com>
9 years agoQtNetwork: introduce configure switch to use system proxies by default
Peter Hartmann [Tue, 23 Oct 2012 13:31:20 +0000 (15:31 +0200)]
QtNetwork: introduce configure switch to use system proxies by default

This option is opt-in (default: no). When configured with
"-system-proxies", Qt automatically picks up the system
proxies.

(backport of commit f7893223e84db86dcdd860c625663d7006fcdad6)

Change-Id: I95c3b17abee0691991a60a386052b4c2989f896c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoFix QDBusServer with more than one connection
Jan Arne Petersen [Mon, 15 Oct 2012 10:30:55 +0000 (13:30 +0300)]
Fix QDBusServer with more than one connection

Create a new QDBusConnectionPrivate for every new connection in
qDBusNewConnection instead of creating a single QDBusConnectionPrivate
in the QDBusServer constructor which gets assigned the latest connected
DBusConnection in qDBusNewConnection (and loses track on all previous
DBusConnections).

Also extend tst_QDBusConnection::registerObjectPeer() test with multiple
connections to the server.

Task-Number: QTBUG-24921
Change-Id: I4341e8d48d464f3fe0a314a6ab14f848545d65a0
(cherry picked from qtbase/a386194f9952683c0be5028f2b7f0ce9617fe404)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoUpdated and fixed win32-icc mkspec for ICC 12.1 or better
Alexey Ivanov [Sat, 29 Sep 2012 23:47:49 +0000 (03:47 +0400)]
Updated and fixed win32-icc mkspec for ICC 12.1 or better

Change-Id: I50653386b0abcb39bc50ea90b65201922460ee75
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
9 years agoFix a crash in QFileDialog when selecting an invalid name filter.
Friedemann Kleint [Fri, 26 Oct 2012 08:44:00 +0000 (10:44 +0200)]
Fix a crash in QFileDialog when selecting an invalid name filter.

When nameDetailsVisible is set to false and an invalid/empty
string is passed to selectNameFilter(), the regexp used to
strip the filter off the suffixes returns empty and a crash
occurs.

Change-Id: I926ea49514ff25a103977d8121fca1cf83d647f5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
(cherry picked from qtbase/d0aa81ee104107db1ce41a9bf0f91d4cb144f7de)

9 years agoFix debugger detection when running on Linux.
Friedemann Kleint [Thu, 25 Oct 2012 06:39:23 +0000 (08:39 +0200)]
Fix debugger detection when running on Linux.

Newer Linuxes have a symlink named 'exe' to the executable
and 'cmdline' is empty.

Task-number: QTBUG-27632
Change-Id: I45eb2186e2608e9600c4b6b27a033d8b1350deee
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoMake the examples test for QtDeclarative pass.
Friedemann Kleint [Fri, 5 Oct 2012 14:03:19 +0000 (16:03 +0200)]
Make the examples test for QtDeclarative pass.

- Fix check to indicate immediate errors, skip the loading
  state (using QTRY_VERIFY from shared/utils.h)
  and check for errors after loading again.
- Exclude all broken examples.
- Exclude shaders if import path is missing or OpenGL is
  not present.
- Exclude Mac .app folders
- Fix the DeclarativeViewer to check for the presence
  of the ImageMagick and ffmpeg executables only once,
  reducing test time.
- Do not check for ImageMagick by running its command
  line tool 'convert' on Windows, since Windows
  has a tool of the same name that converts file
  systems (!).
- Fix doc snippets to load correctly.

Task-number: QTQAINFRA-428
Change-Id: Icc0a983bc42857b41ab1d9e93336f8265bfbec36
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Christopher Adams <chris.adams@qinetic.com.au>
9 years agoFix mmap usage.
Jędrzej Nowacki [Mon, 22 Oct 2012 13:17:19 +0000 (15:17 +0200)]
Fix mmap usage.

Add missing MAP_NORESERVE and fix error checking.

Special thanks to Olivier JG for debugging the issue.

Task-number: QTBUG-27322
Change-Id: Ia9f4aa80415f0127318714912b524131a5b0f18a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
9 years agoFixing font database memoryleak
Karim Pinter [Tue, 25 Sep 2012 07:31:48 +0000 (10:31 +0300)]
Fixing font database memoryleak

There is one case when the QFontEngine* fe is loaded, then FcPattern*
match loaded from FcFontRenderPrepare is not deleted. Valgrind was
showing this problem, after the fix there is no memoryleak in Valgrind.

Change-Id: I8ef928fe8190a6d26f2e5275b85e08a7a8796a7b
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
9 years agoQNX: Remember information on whether a file is a link
Thomas McGuire [Mon, 29 Oct 2012 10:48:12 +0000 (11:48 +0100)]
QNX: Remember information on whether a file is a link

This avoids an additional call to lstat() When using QDir::entryList()
with the QDir::NoSymLinks flag.

This is a backport of
qtbase commit 03cd922e312428aca54892039da9ed79479cfa17

Change-Id: I5ef10c369ce6790c8d0de1346436f9ea7aaa4194
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
9 years agoQNX: Use extra information in dirent to avoid stat() calls
Thomas McGuire [Wed, 17 Oct 2012 10:29:33 +0000 (12:29 +0200)]
QNX: Use extra information in dirent to avoid stat() calls

This improves iterating over /usr/bin with QDirIterator by more
than half, from 36 to 13 milliseconds.

This is a backport of
qtbase commit 391d2e37f3b301097cd23fdaf99dc34ed6a114a5

Change-Id: I45e9159c82d1840f21dbab81fc39f140490549b7
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
9 years agoQHeaderView - fix minor bug in visualIndexAt
Thorbjørn Lund Martsum [Sun, 28 Oct 2012 05:55:55 +0000 (06:55 +0100)]
QHeaderView - fix minor bug in visualIndexAt

This fixes a minor bug in VisualIndex triggered when calling
resizeSection with size 0 (but not hideSection).

It is mostly cosmetics - but it is still a bug.

This is a backport of SHA 73a5bc2aac7638438dfde260a4246359a06e89ae

Change-Id: Ic3e1ce584d8befa501c670c085435248ebaa681b
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
9 years agoQHeaderView - length returns wrong value fix
Thorbjørn Lund Martsum [Sun, 28 Oct 2012 05:23:08 +0000 (06:23 +0100)]
QHeaderView - length returns wrong value fix

setSectionHidden called with (logindex, true) will
sometimes not do a (correct) call to
resizeSection(logicalIndex, 0) at once.

However it does execute d->doDelayedResizeSections().
Therefore the section is going to be hidden later.

However it is a problem that the length meanwhile is wrong.
(That is a value that is not the sum of the sections)

This is fixed by execute updates before returning the
length.

This is a backport of SHA 125016ad241125176e5bebab94eebcf50fac20bc

Task-number: QTBUG-14242

Change-Id: Ia1d2f6db3213792b250a6a37942b56554261cd3a
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
9 years agoQHeaderView - no big update work if updates are disabled
Thorbjørn Lund Martsum [Sat, 27 Oct 2012 18:31:34 +0000 (20:31 +0200)]
QHeaderView - no big update work if updates are disabled

This is not a major boost, but still a nice optimization
that can speed up hideSection and resizeSection with about 40%
if updates are disabled.

It is backport of SHA 3bb0c88de8894fc05ad1558b96ae05ceeff64b78
and a5201007f255a07f7ba07981745eeaec41a14a34

Change-Id: I33b83940003c391e5dae549353a6beb27928f92a
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
9 years agoCorrected licensing info and links point to Digia in qmessagebox
jutaipal [Mon, 29 Oct 2012 11:37:47 +0000 (04:37 -0700)]
Corrected licensing info and links point to Digia in qmessagebox

Change-Id: I1051b20c287cba927b668290c46749c27edbde21
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
9 years agoUpdate INSTALL file
Iikka Eklund [Mon, 29 Oct 2012 06:57:40 +0000 (08:57 +0200)]
Update INSTALL file

Update the url's in INSTALL file.

Change-Id: Id95b2f18a6afa7594e4ead2df449abd4f68cfd70
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
9 years agoUpdate README file
Iikka Eklund [Mon, 29 Oct 2012 07:23:38 +0000 (09:23 +0200)]
Update README file

Minor update into url's in README file. Updated also copyright.

Change-Id: Ida5c8a0446cdca848fbf84700c3858eda97cfe56
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
9 years agoBlackberry: Fixes QWindowSurface::grabWidget
Rafael Roquetto [Mon, 29 Oct 2012 20:09:18 +0000 (18:09 -0200)]
Blackberry: Fixes QWindowSurface::grabWidget

We are reading from the back buffer instead of
the front buffer when grabWidget is called.
This adds an override so that we query the front buffer
(the last rendered frame).

This change is not needed in Qt5 - the api there is different and grabWidget()
no longer exists.

Change-Id: I691ee589d56b60eab339de536b52fd90cee5ff85
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
9 years agoBlackberry: Fix for slowness of touch move events
Bernd Weimer [Fri, 19 Oct 2012 08:43:32 +0000 (10:43 +0200)]
Blackberry: Fix for slowness of touch move events

In the event dispatcher native events will be processed in a tight
loop to drain the queue. IO events and timers will be postponed.

Backported from c4b2d77f40a42a67480bb49aa63b0953c80c024a

Change-Id: Iaf408425000e7fd6fdbf0992bbf927d03a650581
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
9 years agoBlackBerry: Query dynamic buffer count at runtime
Rafael Roquetto [Wed, 24 Oct 2012 18:03:28 +0000 (16:03 -0200)]
BlackBerry: Query dynamic buffer count at runtime

While unlikely, there are cases in which QBBWindow::renderBuffer() is
called before the window buffers have been created. Without this check, the
program will abort on QBBBuffer constructor, since the value that will be
passed to it will be of an invalid buffer.

cherry-picked from qt5 c89dc4fdd2770ba3ad52303a2f4cb0c6403a2ecd

Change-Id: I1f1cde76a364480f3bc77eaaa59ca3cfba2eb618
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
9 years agoSupport other platform names on configure.exe
Rafael Roquetto [Tue, 16 Oct 2012 19:01:51 +0000 (16:01 -0300)]
Support other platform names on configure.exe

Added three new methods, which are meant to be used internally to
configureapp.cpp:
    - int platform(): returns an integer representing a platform
    - QString platformName(): returns the platform name string to be used when
      displaying the license agreement.
    - QString qpaPlatformName(): returns the value to be defined as
      QT_QPA_DEFAULT_PLATFORM_NAME.

Currently supported names are Windows, Windows CE, QNX, Blackberry, and
Symbian*.
Default platform name is "Windows".

* Symbian is not present on the original Qt5 patch. Symbian
is not supported on Qt5.

cherry-picked from qt5 b87c5cff24229b1bcc77ac68699f2f03acabc9e7

Change-Id: I6a97e00d59cce36804c857aa57c5754a2f6277db
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
9 years agoQNX: Use inotify on QNX systems that support it
Thomas McGuire [Thu, 25 Oct 2012 10:04:53 +0000 (12:04 +0200)]
QNX: Use inotify on QNX systems that support it

This is a backport of
qtbase commit fc0cbef59599174589a606838a9b55ba6a07ef06

Change-Id: I27ca7222ed0e622bdae405f0802ab29e22f4cbbf
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
9 years agoBlackberry: Fix QCoreApplication::applicationFilePath() performance.
Sergio Martins [Fri, 26 Oct 2012 08:41:23 +0000 (10:41 +0200)]
Blackberry: Fix QCoreApplication::applicationFilePath() performance.

Listing all files with QDir is slow.
Instead, use argv[0] for zygotized apps and _cmdname() for
non-zygotized.

Apps run through the terminal will fall in the zygotized case,
which is ok.

Note about zygotized apps:
  Zygotized apps don't have an executable, they live in a shared
  object file.

  These apps are run through a deamon that forks and dlopens()
  the shared object ( for performance reasons ).

  For this reason we can't use _cmdname(), since it just contains
  the the file path of the daemon.

  On the other hand, non-zygotized apps have a bogus argv[0]
  when run through the navigator ( command line is fine ).

Change-Id: I73d1cd742a70d1be36a8efe829671d6d7594a6fb
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
9 years agoQGLTextureGlyphCache: Fix text rendering artifacts on NVIDIA
Jonathan Liu [Fri, 26 Oct 2012 11:53:56 +0000 (22:53 +1100)]
QGLTextureGlyphCache: Fix text rendering artifacts on NVIDIA

Check GL_VENDOR to test whether using NVIDIA graphics. On Linux,
GL_VERSION and GL_VENDOR contains "NVIDIA". On Windows, only
GL_VENDOR contains "NVIDIA".

Task-number: QTBUG-27658
Change-Id: I5e74d07ecb9522d1a86ac2953415a51bbdbe8c49
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
(cherry picked from qtbase/8900bc778f326e6b22ecfceb0b0b64394f3510fb)

9 years agoFixed GCC 3.4 build with sse2 enabled.
Samuel Rødal [Wed, 17 Oct 2012 12:34:32 +0000 (14:34 +0200)]
Fixed GCC 3.4 build with sse2 enabled.

With minimal effort we can keep the GCC 3.4 build working.

Task-number: QTBUG-19803
Change-Id: I31611a27b97d5ac426ea857d8f1b656dc6f5377a
(cherry picked from commit 7d7f09650c3b3b2990f16ff4a6401a8c74e1f868)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agodon't set QT_BUILD_DIR as a side effect
Oswald Buddenhagen [Mon, 29 Oct 2012 09:30:33 +0000 (10:30 +0100)]
don't set QT_BUILD_DIR as a side effect

we would be setting QT_BUILD_DIR to $$[QT_INSTALL_DATA] as a fallback,
which would make qtPrepareTool() believe we were doing a qt build
despite actually trying to build something against an installed qt. this
would become apparent only when using a non-default directory layout, as
is the case in our mac packages.

Change-Id: I4f27e9427222ad3b9bb83fcc625bab19e00db9be
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
9 years agoFix Qt network autotests against updated autotest server.
Janne Anttila [Mon, 22 Oct 2012 08:59:24 +0000 (11:59 +0300)]
Fix Qt network autotests against updated autotest server.

There is an updated version of Cyrus server available in Ubuntu 10.04
repositories. Installing autotest server now with puppet configs,
results updated Cyrus server to be installed and "greetings" line it
provides is not compatible with Qt 4.8 autotests.

Use functions from qtbase, they don't require exact version of Cyrus.

Change-Id: I4fd2f14ca9d51a992c129d2fcd9a6cc85fa10a1b
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoFix tst_qhostinfo test case for Digia CI infra.
Janne Anttila [Mon, 22 Oct 2012 09:29:37 +0000 (12:29 +0300)]
Fix tst_qhostinfo test case for Digia CI infra.

Microsoft DNS server used in Digia hosted Qt-Project CI system,
returns 'Server failed' error for hostname ending with dot. Because
the purpose of this autotests is to test 'notfound' use case, it should
is ok to use also 'invalid.invalid' hostname in these DNS queries.
The similar chang in Qt5: https://codereview.qt-project.org/36871

In addition 62.70.27.69 IP address is not mapped to trolltech.com
anymore. Update test to use qt-project name and IP instead.

Change-Id: I11b0233109a6dc8b3de8e9783a287ce106436711
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agoFix tst_qhttp autotest after Digia acquisition of Qt business.
Janne Anttila [Mon, 22 Oct 2012 09:49:45 +0000 (12:49 +0300)]
Fix tst_qhttp autotest after Digia acquisition of Qt business.

The autotest expected that qt.nokia.com would respond with "200 OK",
but it currently responds with "301 Moved Permanently".
Changed test case to use qt-test-server instead of qt.nokia.com.
Because qt-test-server does not have developer subpage, changed PCT
test case to use simple.html instead.

Change-Id: I13430a1d79568a46085f53de49b50989a4fdc144
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoMark flaky tst_qlocalsocket autotest insignificant.
Janne Anttila [Thu, 25 Oct 2012 05:40:26 +0000 (08:40 +0300)]
Mark flaky tst_qlocalsocket autotest insignificant.

Change-Id: I415c57aaf3454a9a40adc1dc51977386bada163a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agotst_qaccessibility: narrow QEXPECT_FAIL in textEditTest
Rohan McGovern [Thu, 25 Oct 2012 22:05:58 +0000 (08:05 +1000)]
tst_qaccessibility: narrow QEXPECT_FAIL in textEditTest

tst_QAccessibility::textEditTest no longer fails on Ubuntu 10.04 in CI.
Restrict the QEXPECT_FAIL to only those platforms where it is known to
fail.

Task-number: QTBUG-26499
Change-Id: Ia12e81dbc0a94464c9916bedb4d29065781285c5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
9 years agoFixed crash on destruction of animating QDockWidget in a QMainWindow
Rohan McGovern [Mon, 22 Oct 2012 04:19:24 +0000 (14:19 +1000)]
Fixed crash on destruction of animating QDockWidget in a QMainWindow

It doesn't make sense to hold an unguarded pointer to a
QPropertyAnimation while assigning ownership of that animation to the
animated widget.

Destruction of the widget while the animation is in progress causes
the animation pointer to become dangling; then the widget is removed
from the containing QMainWindowLayout, which attempts to abort the
animation, dereferencing the invalid pointer.

The crash can be reproduced sometimes with
tst_QDockWidget::taskQTBUG_2940_resizeAfterUndocking (which is in
Qt4 only).

(cherry-picked from qtbase 33214af3784feacb2d5188bbf07da92f45f582f9)

Change-Id: Ia886f64fdb6720914a46bc7f32c71cf4fc81c28d
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
9 years agoFix tst_qsslsocket auto test build when OpenSSL is not available.
Janne Anttila [Fri, 26 Oct 2012 11:47:03 +0000 (14:47 +0300)]
Fix tst_qsslsocket auto test build when OpenSSL is not available.

This is needed to get Qt 4.8 CI passing. OpenSSL is apparently missing
from Digia hosted Windows CI machines. OpenSSL to CI Testers will be
installed later on to cover also these code paths.

Change-Id: I6a4e2b4b1fa6c56692f112f1c5fc47361cb1ea0c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
9 years agoMarking networkselftest, qthread and qxmlquery insignificant temporarily.
Janne Anttila [Sat, 27 Oct 2012 15:12:04 +0000 (18:12 +0300)]
Marking networkselftest, qthread and qxmlquery insignificant temporarily.

These tests failed on latest Digia hosted Qt 4.8 CI builds (919 and 921),
marking them temporarily insignificant to get CI passing.
See task: QTQAINFRA-574

tst_networkselftest failed  because there is no OpenSSL installed on CI
devices. This will be fixed as soon as I have access to VMs and they are
free from builds.

tst_qthread and tst_qxmlquery timed out after default 450 seconds,
I need to check how long these test take to complete in our environment
to increase timeouts or is it actually so that execution of these tests
freeze for some reason.

I'm marking these insignificant for all platform for now, since I don't
yet have test results from Macs. It might be that some of these tests fails
also there.

Change-Id: Ic6d7fb1b3c7951ff98c4fa84028450f0b2ba13fa
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
9 years agoMark qsharedmemory insignificant since it is flaky.
Janne Anttila [Mon, 29 Oct 2012 18:19:20 +0000 (20:19 +0200)]
Mark qsharedmemory insignificant since it is flaky.

To be resolved after 4.8 CI is passing.

Change-Id: Ic3def05f5cd538c19affea1dcec1f20df6cc1e3b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
9 years agoqpa: Fix drawPixmap rendering using CompositionMode_Source in DirectFB
Julien Brianceau [Tue, 23 Oct 2012 07:09:59 +0000 (09:09 +0200)]
qpa: Fix drawPixmap rendering using CompositionMode_Source in DirectFB

cherry-picked from qt5/qtbase d8c8057c03fc906f3bee0905246ca18351bd9e1b

Change-Id: I6728307150c75a8e01f498cf55320a2956aa07ad
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
9 years agoqmake: fix .pc install target dir separators on windows
J-P Nurmi [Tue, 9 Oct 2012 12:47:46 +0000 (14:47 +0200)]
qmake: fix .pc install target dir separators on windows

Task-number: QTBUG-26455
Change-Id: I578345b1676d0d2e812e0ab2e48468b4a8013ee9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from commit 3c05a0f3e7cad3ef4738eb11df4d427c8dbc13e8)

9 years agoQDeclarativeTypeLoader: Avoid stat() calls to . and ..
Thomas McGuire [Wed, 17 Oct 2012 14:52:04 +0000 (16:52 +0200)]
QDeclarativeTypeLoader: Avoid stat() calls to . and ..

Not needed in Qt5, QDirIterator is not used there, Qt5 contains
a completely new type cache.

Change-Id: Ifb97cfda0589210783bccc65ab27a546e0f1fca8
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
9 years agoBlackBerry: Change base font sizes from pixels to points
Kevin Krammer [Thu, 18 Oct 2012 09:46:48 +0000 (11:46 +0200)]
BlackBerry: Change base font sizes from pixels to points

Previously recommended fonts sizes in pixels do not work very well
on the new high resolution devices.

Current UX documentation recommends point size 8 for normal text
which works well on both types of devices.

Backport of qtbase 4d693b6cdf879a03f77f2a06ca0e1be5605c0fc0

Change-Id: I9507b77a5e814b33cf90e714ae62d64e468710b9
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
9 years agoUse the right properties when checking the frame's margins
Andy Shaw [Thu, 18 Oct 2012 13:34:26 +0000 (15:34 +0200)]
Use the right properties when checking the frame's margins

Changed it to check the Frame*Margin property instead of the
Block*Margin property as this was incorrect for a QTextFrameFormat.

Task-number: QTBUG-22173
Change-Id: I2c3066165fb592ed034874b1180593822859f933
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
(cherry picked from qtbase/d060620e6cd3c94e7e0ff809b21593b9c0da0be2)

9 years agoconfigure: state compiler explicitly when testing for supported flags
Peter Hartmann [Thu, 18 Oct 2012 14:40:33 +0000 (16:40 +0200)]
configure: state compiler explicitly when testing for supported flags

... so we can test those functions with host and cross compilers.
Additionally, make sure we check the host compiler for QMAKE_LFLAGS.

(backport of commit 1da978416d89b86d92087e8dc51bdb305b6ed58c)

Change-Id: Id3f5f55e3a9e6b3d0dc72f96aa136f64390d08a4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
9 years agoQNX: only enable NEON instructions for supported architectures (ARM)
Peter Hartmann [Wed, 17 Oct 2012 14:57:25 +0000 (16:57 +0200)]
QNX: only enable NEON instructions for supported architectures (ARM)

They are not there on x86.

This change is not needed for Qt5.

Task-number: QTBUG-27612
Change-Id: I385ed5b18b6985f796054acbf4fca2667942f8d0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
9 years agoDoc: Update QThread class ref to reflect changes since Qt 4.4
Sze Howe Koh [Mon, 8 Oct 2012 13:41:33 +0000 (21:41 +0800)]
Doc: Update QThread class ref to reflect changes since Qt 4.4

Remove advice to subclass QThread; promote thinking of QThread as a
thread manager, not a thread; promote event-driven programming over time
micromanagement; warn against common pitfalls.

Result of collaboration in forum (https://qt-project.org/forums/viewthread/20691/)
and mailing list (http://lists.qt-project.org/pipermail/development/2012-September/006738.html)

This is a modified backport of
qtbase commit d4ad9dbbf96884c0899e8f8116a8a056facd52d5

Task-number: QTBUG-16358
Change-Id: Ib7a8d40aa418b1d96e3e7070df074b396ae9ee7e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
9 years agoAdd a QNX 'quirk' to platformquirks.h
Nick Ratelle [Thu, 15 Dec 2011 20:44:27 +0000 (15:44 -0500)]
Add a QNX 'quirk' to platformquirks.h

This patch is not needed by Qt5, since the code in question no longer exists.

Change-Id: Iabda3ed35ff7adc4af0e6e189fd04dee12a04431
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Nick Ratelle <nratelle@qnx.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
9 years agoBlackberry: implemented "orientation lock" widget attribute
Bernd Weimer [Thu, 4 Oct 2012 11:16:46 +0000 (13:16 +0200)]
Blackberry: implemented "orientation lock" widget attribute

Qt::WA_LockPortraitOrientation and Qt::WA_LockLandscapeOrientation
will be adhered to.

This is not needed in Qt5, as those attributes have been removed from Qt5.

Change-Id: I5f29cad0e2c784caa6201b683d7b658a5b0d083d
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>