9 years agoRevert "Speed up QTextEngine::resolveAdditionalFormats" v4.8.3
Eskil Abrahamsen Blomfeldt [Thu, 6 Sep 2012 08:50:43 +0000 (10:50 +0200)]
Revert "Speed up QTextEngine::resolveAdditionalFormats"

This reverts commit 49fbb6e14af78f751fa114c3cf986aaa607d7408 which
introduced crashes e.g. in Qt Creator. Since the original
change was an optimization, it is reverted in the Qt 4.8 branch
since stability is the main priority there. The crash has been
fixed for the corresponding Qt 5 commit.

It would be an option to recommit the optimization and the
crash fix to a future minor release of Qt 4.

Task-number: QTBUG-27140
Change-Id: I9dc959ea252fe55a22fd90f333ccb335b3ef1311
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
9 years agoDisable rpath, pkg-config, "reduce export" flag when x-compiling for mingw
Peter Kümmel [Wed, 5 Sep 2012 08:47:35 +0000 (10:47 +0200)]
Disable rpath, pkg-config, "reduce export" flag when x-compiling for mingw

This patch disables rpath and pkg-config because both are not supported by Windows.
The reduce export flag produces linker errors when Dlls are used.

Partial cherry pick from qtbase/07a978d3d4b41739eff1061dc45dbfa737bf78b9

Change-Id: Iee679373397a2f97780876471a138c7bcddd2c7b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoAdd cross_compile to qconfig.pri for global advertising
Peter Kümmel [Thu, 6 Sep 2012 15:25:41 +0000 (17:25 +0200)]
Add cross_compile to qconfig.pri for global advertising

.qmake.cache is not necessarily accessible to other modules which depend on
information about whether we are cross compiling or not. We might as well
advertise this fact globally via the CONFIG variable in qconfig.pri.

Backported qtbase/3c47b52bd37488d41a3ad068de7976c838b7d63c

Change-Id: Ie2566a44fb26e26af97c791e1ed1592fd650dbbd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoAdd qmake CROSS_COMPILE variable via load(device_config)
Peter Kümmel [Thu, 6 Sep 2012 10:18:27 +0000 (12:18 +0200)]
Add qmake CROSS_COMPILE variable via load(device_config)

The compiler prefix could be set optionally by CROSS_COMPILE.

Partial cherry pick from qtbase/2dc3181bdcc0d447d2bec42fa3b7cbecb640a51a

Change-Id: I9a9cc31d7c5fda8b33fe280ee2a90cda0196da7d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoMinimal backport of --device-option support in configure
Peter Kümmel [Thu, 6 Sep 2012 09:25:23 +0000 (11:25 +0200)]
Minimal backport of --device-option support in configure

This parial backport only adds the --device-option so it becomes
possible to set and cache additional qmake variables.

Partial cherry pick from qtbase/84e98fd9d2594637e928096c8fcb19d52e5e2676

Change-Id: I96636766aec7e12bfb1d377c8a607301a325a46c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoAllow compilation on OS X 10.5
Sean Harmer [Wed, 5 Sep 2012 09:20:44 +0000 (10:20 +0100)]
Allow compilation on OS X 10.5

Fixes regression introduced by

Change-Id: Iada496dd8fee390771d8fc12066e93ef086dee90
Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com>
Reviewed-by: Juhani Taipale <juhani.taipale@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoQNX: Move qpa-based mkspecs out of the unsupported directory
Sean Harmer [Wed, 5 Sep 2012 08:40:37 +0000 (09:40 +0100)]
QNX: Move qpa-based mkspecs out of the unsupported directory

RIM is committed to supporting Qt on its platforms and the port works

Backport of commit 219ba05b2a43e40feeb2bdebbf53d6da55f2dba2

Change-Id: If34940018036685c6b8dbda193c97b8c50eef1dd
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoOptimize QTextEngine::findItem by using a binary search.
Milian Wolff [Mon, 3 Sep 2012 15:45:43 +0000 (17:45 +0200)]
Optimize QTextEngine::findItem by using a binary search.

This is basically a backport from Qt5:

- revert the revert: 22995948cd3f46780be5d8016708aeef0cd7b066
- backport from qtbase: 487583459ea7958f24cd579888a662bcce26caf3
  this fixes the off-by-one error in the binary search

Task-number: QTBUG-17209
Task-number: QTBUG-231
Change-Id: I7f62fb33cf919ecd7fb2246ae01bb23559e11bf4
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
9 years agoQWizard/Win: Fix vista helper cache state invalidation
Jonathan Liu [Tue, 4 Sep 2012 08:36:26 +0000 (18:36 +1000)]
QWizard/Win: Fix vista helper cache state invalidation

If the cached state is not dirty and the instanceCount is zero, when the
instanceCount is incremented the cached state will not be correct. To
fix this, reset the cached state to dirty if the instanceCount is
incremented from zero.

Change-Id: Ic49eef7f83b1289a939f998817b1b2b5f5a2a45f
(cherry picked from commit e5ebcbc6343a5d5d815cbbd1812f1f5791b7bc88)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
9 years agoQNX: Enable pre-compiled header support for QNX
Sean Harmer [Fri, 31 Aug 2012 13:59:54 +0000 (14:59 +0100)]
QNX: Enable pre-compiled header support for QNX

Backport of bc80ee36f8ffe18f8362b2328ca29f92291df132

Change-Id: I76453dadc24c9bf7ff34d972214c057b82143c77
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoDecouple -lang-c++ from CXX command on QNX mkspecs
Sean Harmer [Fri, 31 Aug 2012 12:52:07 +0000 (13:52 +0100)]
Decouple -lang-c++ from CXX command on QNX mkspecs

Making -lang-c++ integral part of the $CXX command was wrong, because there are
cases where $CXX must be called without the -lang-c++ file (when building asm
files for instance). This commit moves the -lang-c++ to $CXX_FLAGS where it

Backport of commits

Change-Id: I18be06411648281bd42f3c40b8add637cd7ddfa0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoDoc: Improved tr()-example
Robert Loehning [Fri, 27 Jul 2012 17:32:30 +0000 (19:32 +0200)]
Doc: Improved tr()-example

Change-Id: I02400b5c6ad2a5b6a5c6a8ffa9f234f27969e0a8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
9 years agoUpdate the git-archive export options
Thiago Macieira [Wed, 29 Aug 2012 14:05:10 +0000 (16:05 +0200)]
Update the git-archive export options

The .gitattributes, .gitignore, .commit-template files do not need to be
present in packaged sources, as they are for people using the Git
repository.  People who download tarballs usually don't reimport into
Git -- they should just download the actual repositories.

Meanwhile, the .tag file is quite useful. Instead of making Git extract
to the useless SHA-1 of the "$Id$\n" string, ask git-archive to store
the SHA-1 of the commit being packaged.

Change-Id: I9a24a526e66f58ef2ebd9a2319bf96cf43e3e6f7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoqpa: incorrect rendering when stretching and clipping
Julien Brianceau [Wed, 29 Aug 2012 14:35:33 +0000 (16:35 +0200)]
qpa: incorrect rendering when stretching and clipping

When using QBlittable with SourceOverScaledPixmapCapability, rendering
through clipAndDrawPixmap is incorrect when stretching: source pixmap
rectangle has to be corrected using scaling factor.

Change-Id: I80ad1c5ddc73a7b7394d0f5b412931c6279c175a
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
9 years agoQWizard/Win: Fix incorrect cached state after all wizards destroyed
Jonathan Liu [Mon, 3 Sep 2012 13:52:46 +0000 (23:52 +1000)]
QWizard/Win: Fix incorrect cached state after all wizards destroyed

If a QWizard is shown when Aero is enabled, the current visual style is
cached in a static member of QVistaHelper. The cached state is updated
by QVistaHelper when it receives WM_THEMECHANGED or

If all QWizard instances are destroyed, there are no instances of
QVistaHelper to receive these notifications and update the cache. If
Aero is now disabled, the cached current visual style in QVistaHelper
isn't updated. If a wizard is now created and shown, a large black
rectangle is shown in the titlebar.

A static instance count is added so that when no wizards are running,
the cached state is not used.

Task-number: QTBUG-27004
Change-Id: Iefe4c8552388280219c9726418ed7476b8ebb15a
(cherry picked from commit 952ea029f40aaff9de0101fc165907ef8693e4aa)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
9 years agoFix limitting shortcuts to keypad only
Jani Honkonen [Fri, 3 Feb 2012 15:04:32 +0000 (17:04 +0200)]
Fix limitting shortcuts to keypad only

The Qt::KeypadModifier modifier is internally masked away from all
shortcuts. So it is not possible to set a keypad only shortcut.
Changed the implementation so that first a full keysequence match is
searched. Then if no match is found the same sequence is tried
without the keypad modifer.

Added a autotest for this also to cover the basic use cases relating
to this.

This is a backport of qt5 commit:

Task-number: QTBUG-20191
Change-Id: Ibb6809050ff6da23bdb1c087b93e517d1963d34c
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
9 years agoSpeed up QTextEngine::setBoundary
Olivier Goffart [Thu, 19 Jul 2012 12:42:37 +0000 (14:42 +0200)]
Speed up QTextEngine::setBoundary

Before, setBoundary was O(N), now it is O(log N) assuming the boundaries
are added in order. (splitItem might still be linear because of the call
to QVector::insert)

This speeds up a lot QTextEngine::addRequiredBoundaries when there is a
lot of addFormats. (For example if there is a very long line with syntax

Task-number: QTBUG-8389
Change-Id: I10c9fca72343f46db24b1d4f519f7747188d4009
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
(cherry picked from commit c13011829fd39661cc9e983256766c6edb88dead)

9 years agoSpeed up QTextEngine::resolveAdditionalFormats
Olivier Goffart [Thu, 19 Jul 2012 12:54:10 +0000 (14:54 +0200)]
Speed up QTextEngine::resolveAdditionalFormats

Don't call the linear QTextEngine::format in the loop.
Instead, keep track of the current formats by indexing their start and end position.

Task-number: QTBUG-8389
Change-Id: I89c18b804111edfab6254442cbee33da39d1a273
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
(cherry picked from commit 4f6efe16416f0222ae78ab16c0eb8085bf9c521b)

9 years agoFix fvisibility.test for "QMAKE_CXX = ccache g++"
Sean Harmer [Fri, 31 Aug 2012 14:45:07 +0000 (15:45 +0100)]
Fix fvisibility.test for "QMAKE_CXX = ccache g++"

Or other compilers composed of more than one word (e.g. QNX's compiler
qcc -Vgcc_ntoarmv7le)

Testcase: adding this line at the end of mkspecs/linux-g++-64/qmake.conf
   QMAKE_CXX = ccache g++

  fvisibility.test: line 28: ccache g++: command not found
  Symbol visibility control disabled.

Result after fix:
  Symbol visibility control enabled.

Backport of f1f500b9aa70edfc7511a714c9aefb132d66f10e

Change-Id: If3b0ef2d3ab4e2ff0cb11272ca6d4f8c6ed819b1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoEnable symbol visibility support on QNX
Sean Harmer [Fri, 31 Aug 2012 13:21:56 +0000 (14:21 +0100)]
Enable symbol visibility support on QNX

Backport of bf5e3247ae27b89d4a6bdf356a8b15e8f4157918

Change-Id: If953052941b89edda778aa24913f24df0432f50b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoMake connectNotify() work with QML
Thomas McGuire [Mon, 6 Aug 2012 07:36:05 +0000 (09:36 +0200)]
Make connectNotify() work with QML

Call connectNotify() and disconnectNotify() in QML signal
handlers and in QML bindings.

This is a backport of Qt5's QtDeclarative commit

Task-number: QTBUG-11284
Change-Id: If5c3701426208875f3b775040c4e7bcbaac2b0a9
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
9 years agoMark updateAndelete as XFAIL on Lion and above.
Morten Johan Sorvig [Wed, 29 Aug 2012 13:30:31 +0000 (15:30 +0200)]
Mark updateAndelete as XFAIL on Lion and above.

It fails on Mountain Lion as well.

Change-Id: I9841e857c1746ed69ccad9dfccf3fb9135e6abde
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
9 years agoMake sure the parent widget still exists.
Jarek Kobus [Mon, 13 Aug 2012 13:49:23 +0000 (15:49 +0200)]
Make sure the parent widget still exists.

It may happen that InPlaceWidgetHelper's destructor
is called after parent widget destructor. Now inside
InPlaceWidgetHelper's destructor we check if parent
widget still exists.

Task-number: QTCREATORBUG-7684
Change-Id: I4c9ecbfae7323fd95345ccabc113218a7011ebe8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit aad795575646b37b5c531cb6314eaa049e90e076)

9 years agoWindows: Fix Drag and drop in Designer.
Friedemann Kleint [Wed, 29 Aug 2012 11:09:22 +0000 (13:09 +0200)]
Windows: Fix Drag and drop in Designer.

When hitting on a child widget that does not accept drops,
go up the hierarchy until the parent is hit or a widget
that  accepts drops is found.

Introduced by f6bf4b2baa91e55f40596bf3f2823b119fdfa5e0 .

Task-number: QTBUG-22987
Task-number: QTBUG-27037
Change-Id: I4d9308942c1109c11f7e31555d4ad84fa2610d15
Reviewed-by: Markku Tapio Heikkilä <markku.heikkila@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
9 years agoFixed the QTreeView expansion/collpasing when animated
Thierry Bastian [Wed, 29 Aug 2012 11:10:23 +0000 (13:10 +0200)]
Fixed the QTreeView expansion/collpasing when animated

If you had a QTreeView with expandable items, if you tried to expand and while
the animation was still running you'd try to collpase the node,
the display would be completely broken: the items below that items would
not be visible any more except for a fraction of a second when expanding
or collapsing it again.
The problem is in the fact that when starting an animation the QTreeView
stores the state before animating. And it does that even if an animation
is already running. So the stateBeforeAnimation becomes AnimatingState and
when the animation finishes, AnimatingState is the state that is restored
breaking the painting.
Unit test is included.

qtbase-sha1: 1e97dbaf6ca807397e3ec77a3611763769499d17
Change-Id: I62e16101b70153f78022f6195fd9de6db0cd4878
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
9 years agorebuild configure
Oswald Buddenhagen [Tue, 21 Aug 2012 13:31:59 +0000 (15:31 +0200)]
rebuild configure

... again.

Change-Id: I0b36c25373bdb3842dd41df598804310e502acb1
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Juhani Taipale <juhani.taipale@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
9 years agoPersian translation of Qt has been updated for 4.8
soroush [Thu, 23 Aug 2012 15:46:45 +0000 (20:16 +0430)]
Persian translation of Qt has been updated for 4.8

Change-Id: I30537aed87cc793c74588f0220072e97b7232e46
Reviewed-by: Mahdi
Reviewed-by: Abbas Farahmand
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agodocumentation: grammar nitpick
Mark Brand [Wed, 29 Aug 2012 09:00:13 +0000 (11:00 +0200)]
documentation: grammar nitpick

Cherry-picked from qt5/qtbase 4692432b61b09f010a3a7e57e80b9599686fe438
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Change-Id: I1944946b5f17bbf69005d2da30cedff4970f9827
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
9 years agoBackport fix screen event-registration failure.
James Turner [Thu, 30 Aug 2012 12:44:49 +0000 (13:44 +0100)]
Backport fix screen event-registration failure.

Don't attempt to register for events from non-attached screens.

Backport of commit 9597e0d2a23c4673aea7a74598a6a634527c443c
from qt5/qtbase

Change-Id: I95859abc476f43308ba9b2c684b8eaae731c59f6
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
9 years agoFixes possible memory leak in QContiguousCache
Fabian Bumberger [Fri, 24 Aug 2012 18:36:16 +0000 (14:36 -0400)]
Fixes possible memory leak in QContiguousCache

When inserting an item on a position that is already occupied, the destructor of the old item was never invoked.

Qt5 SHA1: b4075c8ea31b235cdbb61fcd6290105b9914d627

Change-Id: I842fd81f284d9ca58760bce7e1adfea84da0a788
Reviewed-by: Peter Hartmann <phartmann@rim.com>
9 years agoDisplay QThread name for debugging.
Sean Harmer [Tue, 24 Apr 2012 08:29:09 +0000 (09:29 +0100)]
Display QThread name for debugging.

Backport of commits:

Change-Id: Ibcb13ebb2e6cb05ab381328228eca5abdde52ad9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoImplementation of the BlackBerry Bearer engine
Benoit Dumas [Wed, 15 Aug 2012 07:18:11 +0000 (09:18 +0200)]
Implementation of the BlackBerry Bearer engine

An implementation for BlackBerry devices based on the BPS netstatus APIs.

cherry-picked from qtbase df7a1a28aaab31

Change-Id: I979f594aca64315af1f39e68886b819f7f215f6b
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Vladimir Minenko <vminenko@rim.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
9 years agoBlackberry: Fix QFileSystemEngine::tempPath()
Thomas McGuire [Tue, 28 Aug 2012 12:05:33 +0000 (14:05 +0200)]
Blackberry: Fix QFileSystemEngine::tempPath()

Apparently it depends on the user and/or firmware version on whether
TMPDIR or TEMP is set, so try both.
Additionally, fall back to /tmp if neither is set, as that seems to be
present on all devices.

This is a backport of a135d87a0f8ec24445e13fb54f4316e4ca7473be from

Change-Id: I1637f4ab74c8c8bd350b4efb451c2143c0642796
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
9 years agotst_qtoolbutton: stabilize and improve failure message
Rohan McGovern [Tue, 5 Jun 2012 04:24:18 +0000 (14:24 +1000)]
tst_qtoolbutton: stabilize and improve failure message

Allow for a little more leeway in timers.

Task-number: QTBUG-26004
Change-Id: I59936d0f675b7f734e04b3f5e63631c74ca4f163
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
(cherry picked from commit 4eecbf3b842afcfb91d78552ce19d2c0b8f8c53a)
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
9 years agoQGLGlyphCache: Fix texture buffer overrun
Jonathan Liu [Wed, 15 Aug 2012 14:31:39 +0000 (00:31 +1000)]
QGLGlyphCache: Fix texture buffer overrun

The QGLGlyphCache::cacheGlyphs function reallocates a larger texture
when there is no more room to insert a newly rendered glyph. However,
the glyph width used to check whether reallocation is needed is not the
same as the actual glyph image width and may be less. When the glyph
image is then copied into the texture, a buffer overrun may occur.

Task-number: QTBUG-23584
Change-Id: I71d6cd987b7519e5235109c14a5a35e452332417
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
9 years agoQSharedPointer: make QT_SHAREDPOINTER_TRACK_POINTERS work with QObjects
Giuseppe D'Angelo [Thu, 16 Aug 2012 16:06:16 +0000 (17:06 +0100)]
QSharedPointer: make QT_SHAREDPOINTER_TRACK_POINTERS work with QObjects

If setQObjectShared crashes because a QObject is tracked by two
different QSharedPointers, we lose the debug feature offered by #defining
QT_SHAREDPOINTER_TRACK_POINTERS, as the check done by this define
happens after the setQObjectShared call.

Therefore, move setQObjectShared after the internalSafetyCheckAdd2 call.

This way, the error raised by QSharedPointer created changes from f.i.

  QSharedPointer: pointer 0xa10010 already has reference counting

to the more "debuggable" (and consistent with non-QObjects)

  QSharedPointer: internal self-check failed: pointer 0x1dd90e0 was already tracked by another QSharedPointer object 0x1dd9330

"Backport" of change-id I71340d0f878828354537762d01c46d441efc918c from
qtbase (although, as of commit 609b0a9c2e69180ceff5d89c42e0d9468491d7e3,
this issue is not present there, as setQObjectShared does nothing).

Change-Id: I4cea83d705795eae0e05da128a3f189aea36f5ce
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoTake account of hidden items in QListView when using scrollTo.
Stephen Kelly [Fri, 24 Aug 2012 08:24:27 +0000 (10:24 +0200)]
Take account of hidden items in QListView when using scrollTo.

This is a backport of 799ceebad8a2dbe1ca0e60a11c7d6ca0c2c8b7a9 from

Task-number: QTBUG-21804
Change-Id: I757b9598f354cdfa62c08d0c2613ded93fe88804
Reviewed-by: Jani Honkonen <jani.honkonen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
9 years agoFix patch to WebKit git repo
Simon Hausmann [Fri, 24 Aug 2012 09:41:14 +0000 (11:41 +0200)]
Fix patch to WebKit git repo

Change-Id: Ibb5165f3f4ac4aca23cf28a504b8ef7179b018b1
Reviewed-by: Andras Becsi <andras.becsi@nokia.com>
9 years agotest: Re-enabling tst_QPrinter test
Sergio Ahumada [Fri, 24 Aug 2012 08:47:37 +0000 (10:47 +0200)]
test: Re-enabling tst_QPrinter test

This test has been passing for some time now.

Change-Id: I8d03e3af184645b89b8a2e81be7d4bc5be14816e
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
9 years agotest: Remove useless insignificant_test mark
Sergio Ahumada [Fri, 24 Aug 2012 08:51:41 +0000 (10:51 +0200)]
test: Remove useless insignificant_test mark

This mark does not have any effect as the real mark is under

Change-Id: I8885e6921940d0652326934dd1acc2d0cd3bc7a0
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
9 years agotest: Re-enabling tst_QToolTip test
Sergio Ahumada [Fri, 24 Aug 2012 09:01:06 +0000 (11:01 +0200)]
test: Re-enabling tst_QToolTip test

This test has been passing for some time now.

Change-Id: If33c0a4b675f6ab331fa64709c2c8c8f3f3ffb4e
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
9 years agoFix indentation.
Morten Sorvig [Wed, 15 Aug 2012 11:45:20 +0000 (13:45 +0200)]
Fix indentation.

Change-Id: I3442592b903afa99e85953cdf40b91b914963a8b
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
9 years agoParse yearless date strings on leap years during LIST in QFtp
Philip Van Hoof [Wed, 22 Aug 2012 11:12:12 +0000 (13:12 +0200)]
Parse yearless date strings on leap years during LIST in QFtp

Adapted _q_parseUnixDir to handle yearless date strings during
a leap year while performing LIST.

Task-number: QTBUG-26911
Change-Id: I3193400a274a896530d45de986ec8fa5b159abb4
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Philip Van Hoof <philip@codeminded.be>
9 years agoQUrl: fix thread safety.
David Faure [Fri, 13 Jul 2012 22:39:18 +0000 (00:39 +0200)]
QUrl: fix thread safety.

Developers expect const methods on the same QUrl instance to be usable
from multiple threads (including copying and modifying the copy).
The delayed parsing and internal cache of encoded strings break this, however
(and the implicit sharing, for the case of copying).
Protection with a mutex fixes this.

Qt-5.0 doesn't have this issue, since QUrl doesn't do delayed parsing

Change-Id: Ie2674e46eb7416b0e753323b673c10f9d3457f6d
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoFix a QListViewItem width when spacing is set
Jani Honkonen [Fri, 17 Aug 2012 11:25:13 +0000 (14:25 +0300)]
Fix a QListViewItem width when spacing is set

The listitem width was calculated incorrectly because spacing was
not considered. This fixes the second part of the reported bug where
spacing is set. Added some tests to catch the issue relating to the
reported bug.

Also added a test to check spacing in general.

Backported from Qt5 commit:

Task-number: QTBUG-21804
Change-Id: I20cae3a2b9d42650052441f9f15b43f72418f58b
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
9 years agoRemove warning about non existing paint device engine
Titta Heikkala [Thu, 16 Aug 2012 08:27:57 +0000 (11:27 +0300)]
Remove warning about non existing paint device engine

The QWindowsVistaStyle::drawPrimitive() method was trying to draw the
pixmap for an item in an item view even if the section width was zero
or less then zero. This resulted "QPainter::begin: Paint device
returned engine == 0, type: 2" error.
It's now checked that the width and the height of the section is
greater than zero before creating the painter.

Task-number: QTBUG-26047
Change-Id: I36dd2792fd505be773951e5ac36b0e3362ec2292
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit 929e934969c621d7c1773e4233c14d358de4d385)

9 years agoMake QStatusBar text available via accessibility.
Tilman Sauerbeck [Fri, 17 Aug 2012 16:14:12 +0000 (18:14 +0200)]
Make QStatusBar text available via accessibility.

Change-Id: Iec3efb4b91bdba33fe93b928ff2349440e15aa35
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
9 years agoQNX: Enable QT_NO_IMPORT_QT47_QML
Kevin Ottens [Fri, 17 Aug 2012 06:01:05 +0000 (08:01 +0200)]

Add this include to reduce the startup time of QML based applications.
Supporting the "Qt 4.7" module name isn't needed for QNX.

Change-Id: I86db40eefa83ccdd53a036faf0df4fd2135b2b74
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
9 years agotest: Mark tst_qdeclarativeflickable unstable failures as XFAIL
Sergio Ahumada [Tue, 21 Aug 2012 17:19:17 +0000 (19:19 +0200)]
test: Mark tst_qdeclarativeflickable unstable failures as XFAIL

The test has two unstable failures, so mark these with QEXPECT_FAIL

Task-number: QTBUG-26905
Change-Id: I1912626376f70ae6d645638fb5b07dbf9e4c3393
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
9 years agouikit: update screen geometry correctly for interface orientation
Eike Ziller [Wed, 15 Aug 2012 10:50:57 +0000 (12:50 +0200)]
uikit: update screen geometry correctly for interface orientation

Broke with baeb42184402454da3e337bbfa2f4d5c7346435f

Change-Id: Ia8d844b7b4b9815a1cce4a1acccdbe515149d3ea
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
9 years agouikit: Fix missing point to pixel conversions
Eike Ziller [Wed, 15 Aug 2012 10:19:51 +0000 (12:19 +0200)]
uikit: Fix missing point to pixel conversions

Qt wants drag distance and font size in pixels.

Change-Id: I363ed9ab8bcfdcddbfd168fc81b71c4184ecfa5c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
9 years agouikit: Adapt readme and examples to recent changes
Eike Ziller [Wed, 15 Aug 2012 06:56:24 +0000 (08:56 +0200)]
uikit: Adapt readme and examples to recent changes

Use the new configure option (4720003c8f52ad7ecb59be04e1b5aa319c2f0ff0)
Add info about mkspecs (c13df9f2147e85e104ac105f975ef87914c908e9)

Change-Id: I4eadd4807a36400de3cf261605e3e1a71d217bbc
Reviewed-by: Ian Dean <ian@mediator-software.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
9 years agotest: Mark tst_QWidget unstable failures as XFAIL
Sergio Ahumada [Tue, 21 Aug 2012 10:57:40 +0000 (12:57 +0200)]
test: Mark tst_QWidget unstable failures as XFAIL

XFAIL'ing lots of failures on Linux and Mac.
Also removing some unused variables.

Task-number: QTBUG-26896
Change-Id: I1deb1ad0141e48d3df7cf0a2a4ea84c593f4a0fc
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
9 years agoDoc: Really minor typo fix
Sergio Ahumada [Wed, 22 Aug 2012 10:19:59 +0000 (12:19 +0200)]
Doc: Really minor typo fix

Task-number: QTBUG-26891
Change-Id: I9b726d8766337fbb001afcb9ecbc45f51b6e363f
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
(cherry picked from commit 75901712f04eceafd164cbbf752c916070b44507)

9 years agoFix undo and redo in QLineEdit when in password mode
Jani Honkonen [Fri, 3 Feb 2012 14:57:58 +0000 (16:57 +0200)]
Fix undo and redo in QLineEdit when in password mode

There are some security issues with undo/redo. User should not be
able to get the erased password back in any situation. Therefore
redo must be disabled completely and undo is limited only for erasing
previously entered text.

Backported from Qt5 SHA1: 121062d8848986dcfaf421388a5603b3b48a1e58

Task-number: QTBUG-14226
Change-Id: Ia712f95e8a2e45537a95d48b70686a1a8dd95da2
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
9 years agoFix QListWidget scrolling with keys when there are hidden items
Jani Honkonen [Tue, 28 Feb 2012 10:26:22 +0000 (12:26 +0200)]
Fix QListWidget scrolling with keys when there are hidden items

If the selected item is scrolled with keyboard keys the selected item
will go outside the visible area. The scrolling did not take hidden
items into account when calculating the amout to be scrolled.

Backported from Qt5 commit:

Task-number: QTBUG-21804
Change-Id: I81a82ed56bb0e4c0229fd117784790e1234aacca
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
9 years agoRemove qurl.cpp from qmake and bootstrap, it's not needed.
David Faure [Sun, 19 Aug 2012 10:01:06 +0000 (12:01 +0200)]
Remove qurl.cpp from qmake and bootstrap, it's not needed.

(and I need this out to be able to use QMutex in QUrl)

Change-Id: Ic3eec2b41bd8626ce99f31c83a167c1c197dad82
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agotest: XFAIL tst_QListWidget::fastScroll() test on Windows
Sergio Ahumada [Mon, 20 Aug 2012 13:30:35 +0000 (15:30 +0200)]
test: XFAIL tst_QListWidget::fastScroll() test on Windows

The test has one unstable failure so mark it with QEXPECT_FAIL
until is fixed.

Task-number: QTBUG-26892
Change-Id: If7e647380a99db3145522c780980fe4904c76114
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
9 years agotest: Re-enabling tst_QFileInfo test on Windows
Sergio Ahumada [Mon, 20 Aug 2012 13:41:59 +0000 (15:41 +0200)]
test: Re-enabling tst_QFileInfo test on Windows

This test was fixed by b1c46b4b3e322554146aed92cd6035cd9ba43982

Change-Id: I423ea7cb2587c23cc5afe2eac28bed8ba80d67a2
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
9 years agoFix deleting of QTreeWidget items.
Friedemann Kleint [Mon, 20 Aug 2012 09:22:31 +0000 (11:22 +0200)]
Fix deleting of QTreeWidget items.

Breakage introduced by
which caused the autoconnections to no longer work.

Task-number: QTBUG-26770

Change-Id: Id00341d93d4a830f3f48a1db6234818e6d262977
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
(cherry picked from commit c6616bcdc87b8665a2ea84b07dd04229f2ccbd7a)

9 years agoRegister less types for QtDeclarative/QCoreApplication
Kevin Ottens [Wed, 8 Aug 2012 10:53:41 +0000 (12:53 +0200)]
Register less types for QtDeclarative/QCoreApplication

In Qt5 QtQml and QtQuick are separated so you have control on the
amount of facilities you need. It is not the case in Qt4
unfortunately so you always pay the price of those registration.

To overcome that, this patch avoids quite some of the type
registration when we detect we're not running a QApplication. In
such case all the GUI related QtQuick 1 runtime is not usable

We keep around only a handful of convenience like Timer, Connection,
Component, etc.

Change-Id: Idf5aa935795a224ceb5bc66015282fd094b5686c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
9 years agotest: Re-enabling tst_QListWidget test
Sergio Ahumada [Fri, 17 Aug 2012 08:35:21 +0000 (10:35 +0200)]
test: Re-enabling tst_QListWidget test

This test has been passing for some time now.

Change-Id: I2ac0eaacab5e9873b691d3d1f5dad3d85ec90485
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
9 years agotest: Re-enabling tst_QImageReader test
Sergio Ahumada [Thu, 16 Aug 2012 13:15:21 +0000 (15:15 +0200)]
test: Re-enabling tst_QImageReader test

This test has been passing in a stable way since build 679.

Change-Id: I19dd774793b11604ac0c725cc23adc58fd63cba7
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
9 years agoFix tst_qbytearray on QNX/Blackberry systems
Rafael Roquetto [Wed, 15 Aug 2012 10:09:09 +0000 (12:09 +0200)]
Fix tst_qbytearray on QNX/Blackberry systems

tst_QByteArray::qUncompress() no longer fails on QNX systems.

cherry-picked from qt commit 555e4e05f4f98f524e108fba0fb236406f2e2b2f

Change-Id: Ia88204b42f65a94c3f00c4b618255e1870c5a564
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoDisable 3DNOW on Blackberry/Win32
Rafael Roquetto [Thu, 16 Aug 2012 13:29:18 +0000 (15:29 +0200)]
Disable 3DNOW on Blackberry/Win32

3DNow is being incorrectly auto-detected on Windows, causing it to be enabled
by default when cross-compiling to Blackberry. In other words, the code line
introduced by this patch should have already been there since the beginning,
but it got lost somehow. So here it is.

Change-Id: Iad0b90908602633e3046b54c1c60139c6483632d
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoImplement QAccessibleLineEdit::characterRect()
Jan-Arve Saether [Mon, 13 Aug 2012 15:35:44 +0000 (17:35 +0200)]
Implement QAccessibleLineEdit::characterRect()

It was probably not implemented because it needed to access
private APIs.
However, accessing those from this a11y plugin is unproblematic.

Change-Id: Icadad45a83daa60e2fbc4cab17b91c84c3f36a7f
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
9 years agoPolish Polish translations
Jarek Kobus [Tue, 14 Aug 2012 07:07:09 +0000 (09:07 +0200)]
Polish Polish translations

Change-Id: I52ae2101dd60881ffb9e5202b8351d8bd192e42a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agotest: Re-enabling tst_qdeclarativeerror test
Sergio Ahumada [Wed, 15 Aug 2012 11:31:24 +0000 (13:31 +0200)]
test: Re-enabling tst_qdeclarativeerror test

This test is passing now on Windows.

Change-Id: I569c32c268406e3909ad418dc1761f85e9388f92
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoFix error test on Windows.
Glenn Watson [Thu, 21 Jun 2012 22:53:13 +0000 (08:53 +1000)]
Fix error test on Windows.

Add missing .gitattributes file to ensure the test data file is
checked out with LF line endings on Windows.

Change-Id: I9ece655dbc8657d6e70c58ce1ada06ee021c92ad
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
(cherry picked from commit 587b21cf18bcb689aef58411837ed616b02c952b)

9 years agoFix for restoring dockwidget's size when it gets dragged.
Mikko Knuutila [Mon, 20 Feb 2012 13:10:22 +0000 (15:10 +0200)]
Fix for restoring dockwidget's size when it gets dragged.

When user drags a dockwidget out of the docking area, restore widget's
previous floating size and center it's titlebar under the mouse.

Task-number: QTBUG-2940
Change-Id: I004de36d649abc4c32420bdd46bb6c810ef98c64
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
9 years agorebuild configure
Oswald Buddenhagen [Wed, 15 Aug 2012 14:51:40 +0000 (16:51 +0200)]
rebuild configure

Change-Id: I4dbe8cb9b777b141e9e147277c7a424739d40926
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
9 years agoPrepare QtHelp library for modularized documentation.
Pierre Rossi [Wed, 15 Aug 2012 11:38:00 +0000 (13:38 +0200)]
Prepare QtHelp library for modularized documentation.

- Support ".." in QCH documentation file paths.
  This essentially means that we stop using cleanPath, and where needed,
  prepend the virtual folder name, followed by "/..", in front of the
  original path.
- Remove com.trolltech default DocPath since this was not used anymore.

(Cherry picked from Qt5: I7309805000f343e2f58c74cd0655a936399fd939)

Change-Id: I6508529de756bad979356c63bfcf6c55a609e827
Done-with: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
9 years agoXMLHttpRequest does not support the DELETE method
Jani Honkonen [Thu, 9 Aug 2012 12:25:27 +0000 (15:25 +0300)]
XMLHttpRequest does not support the DELETE method

This is a backport from qt5 commit:

Task-number: QTBUG-17963
Change-Id: Ibc262e81d6c7d3b6882461627a7a312d1fbafb3b
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
9 years agotest: Re-enabling tst_QFont test
Sergio Ahumada [Wed, 15 Aug 2012 08:53:18 +0000 (10:53 +0200)]
test: Re-enabling tst_QFont test

This test has been passing for a long time.

Change-Id: I45b5d155979dc2055349906d3dde2caa6900d827
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
9 years agotest: Re-enable tst_QGraphicsEffect test.
Sergio Ahumada [Wed, 15 Aug 2012 08:44:09 +0000 (10:44 +0200)]
test: Re-enable tst_QGraphicsEffect test.

The test has four stable failures. Mark these with QEXPECT_FAIL and
re-enable the test.

Task-number: QTBUG-26858

Change-Id: I278baa8179f1be83b6d6f620393fcaea92a5bf2f
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
9 years agoadd configure options for debug/release OpenSSL
Peter Kümmel [Wed, 25 Jul 2012 16:57:14 +0000 (18:57 +0200)]
add configure options for debug/release OpenSSL

msvc cannot use the same library for debug and release builds
if openssl libraries are linked statically into the network library.

Backported from 952788d64bc30c7aac5f9572533241ab8f48fb63
Change-Id: I8332b8293a27b6f9bd87ca1e6ebc63327589ab78
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
9 years agolicense: Fix Blackberry/QNX license headers
Sergio Ahumada [Sun, 12 Aug 2012 09:25:26 +0000 (11:25 +0200)]
license: Fix Blackberry/QNX license headers

These files where skipped when tst_license was enabled a while
ago since they had a different license header that didn't match
our test.

Fix these licenses and stop skipping them in tst_license.cpp

Change-Id: I14b2aa1b7c794894c2c74aedab01ff8667621003
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
9 years agotest: Re-enabling tst_QTreeView test
Sergio Ahumada [Tue, 14 Aug 2012 13:15:04 +0000 (15:15 +0200)]
test: Re-enabling tst_QTreeView test

This test has been passing for a long time.

Change-Id: Iebf211aa87bbf1a65910412c2fa2753d7e21b574
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
9 years agotest: Re-enabling tst_QMenu test
Sergio Ahumada [Tue, 14 Aug 2012 13:03:51 +0000 (15:03 +0200)]
test: Re-enabling tst_QMenu test

This test has been passing for a long time.

Change-Id: I75f3ec9d7e44df4e7cdf821aa85efa5e93724ba1
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
9 years agotest: Re-enabling tst_QNetworkConfiguration test
Sergio Ahumada [Tue, 14 Aug 2012 12:53:22 +0000 (14:53 +0200)]
test: Re-enabling tst_QNetworkConfiguration test

This test has been passing for a long time.

Change-Id: Ifb5088dd8e0e8ec3ea03baaf0ccabbffd82e6722
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
9 years agotest: Re-enabling tst_QNetworkConfigurationManager test
Sergio Ahumada [Tue, 14 Aug 2012 12:46:47 +0000 (14:46 +0200)]
test: Re-enabling tst_QNetworkConfigurationManager test

This test has been passing for a long time.

Change-Id: I570540b907e390bffad5e4afea1f2bc0f7099327
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
9 years agoBump hex copy of Qt version number to 4.8.3.
Jason McDonald [Tue, 14 Aug 2012 06:51:32 +0000 (16:51 +1000)]
Bump hex copy of Qt version number to 4.8.3.

Change-Id: I7bf366fc15aeb86f0d0a19481b81f690feb7af9a
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Simo Fält <simo.falt@nokia.com>
Reviewed-by: Juhani Taipale <juhani.taipale@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
9 years agofix dangling pointer access during drag-n-drop operation
Nick Shaforostoff [Mon, 27 Feb 2012 16:12:10 +0000 (18:12 +0200)]
fix dangling pointer access during drag-n-drop operation

delay deco widget freeing because the pointer to it
is still available to the drag operation.
Task-number: QTBUG-19363

Change-Id: I775864f72d7151c9fbd26feff5a9bd844f87f292
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
9 years agoFix vcproj file generation for incredibuild handling of moc etc targets
Andy Shaw [Fri, 10 Aug 2012 12:54:32 +0000 (14:54 +0200)]
Fix vcproj file generation for incredibuild handling of moc etc targets

When incredibuild-xge had been turned on by configure then it was not
ensuring that the generated vcproj files had the right extra comments
needed to make incredibuild run moc and other tools in parallel.  By
fixing the prf file to get around a problem in the parser this is now

Task-number: QTBUG-14482

Change-Id: Ifd24bde2db7d80d3a52719c733d15f228c7b3534
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit fb3c850581953983588d49391f40f03cc7e61e62)

9 years agoAccessibility: Add missing break;
Jan-Arve Saether [Tue, 7 Aug 2012 14:47:00 +0000 (16:47 +0200)]
Accessibility: Add missing break;

Found while porting QAccessibleTextWidget to Qt 5

Change-Id: I6a8f69d859fad20949e8250f03dd18d4106cc31c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
9 years agoAdd default QPA plugin option to 'configure'
Ian Dean [Sun, 29 Jul 2012 07:08:13 +0000 (00:08 -0700)]
Add default QPA plugin option to 'configure'

Add option to specify default QPA plugin with -qpa command-line option
for 'configure'. This matches the option used for configuring the
default platform plugin for Qt5, and is optional (if omitted, no
default platform plugin will be set up).

This change is back-ported from Qt5 (Change-Id: 0074cc5d)

Change-Id: Iec6e29ab14f19dcdde50ca1baa02b61b3ef66979
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
9 years agomake currentText the USER property for QComboBox
Mark Brand [Wed, 18 Jul 2012 20:02:43 +0000 (22:02 +0200)]
make currentText the USER property for QComboBox

QItemDelegate takes the USER property as the value to be set using
model->setData(). The text is what is expected.

follow-up to b1b87a73012342dc1619a8e907ea9954d59ca564 which in Qt 4.8.0
broke the interaction between QComboBox and QItemDelegate used by
QDataWidgetMapper and item views.

Task-number: QTBUG-26501
Cherry-picked from qt5/qtbase 816c5540179362500dfc175b77f05abf3ef25233
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Change-Id: Ie9c228f2aa47f194467419398b37d05d98a70a1b
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
9 years agotest: Re-enabling tst_QWidget_window
Sergio Ahumada [Fri, 10 Aug 2012 13:10:48 +0000 (15:10 +0200)]
test: Re-enabling tst_QWidget_window

This test has been passing for a long time.

Change-Id: Ic3ac0c9e5ab266912283e3f89fb06b6b08b777e9
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agotest: Mark tst_QTimeLine as significant on platforms other than Windows
Sergio Ahumada [Fri, 10 Aug 2012 10:38:19 +0000 (12:38 +0200)]
test: Mark tst_QTimeLine as significant on platforms other than Windows

This test only fails on Windows at the moment, so enabling it for
all the other platforms.

Change-Id: I41fe201b94126d7ca82b39f2124f5a9e35109afe
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
9 years agoMac: Don't crash if language preferences can't be retrieved.
Eike Ziller [Tue, 17 Jul 2012 10:01:33 +0000 (12:01 +0200)]
Mac: Don't crash if language preferences can't be retrieved.

That can happen when e.g. running an application with sudo.

Task-number: QTBUG-26547
Change-Id: I4b1d4b71716da4026dfa0f68bad905f0010d0968
(cherry-picked from 67d082223c90912a88f5282af90d8fc05f4a389b in Qt5)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
9 years agoDon't build qtscript when stdint.h isn't available
Kent Hansen [Thu, 9 Aug 2012 13:40:16 +0000 (15:40 +0200)]
Don't build qtscript when stdint.h isn't available

Change-Id: Iba283c8642b2738e1b333e6734eec4369ce8bac4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoDon't build qtscript when stl isn't available
Kent Hansen [Thu, 9 Aug 2012 11:06:46 +0000 (13:06 +0200)]
Don't build qtscript when stl isn't available

Task-number: QTBUG-7813

Change-Id: Ie0873e7fbd1168b11e5881d156a0583d0fa7f859
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agotests: Re-enable tst_MacNativeEvents test.
Sergio Ahumada [Wed, 8 Aug 2012 14:30:36 +0000 (16:30 +0200)]
tests: Re-enable tst_MacNativeEvents test.

This test is unstable on Mac OS X so marking it with QEXPECT_FAIL and
re-enable the test.

Change-Id: I8549378db1216de7484feb4080e5e2a1522d2418
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
9 years agotests: Re-enable tst_QMdiSubWindow test.
Sergio Ahumada [Wed, 8 Aug 2012 14:18:43 +0000 (16:18 +0200)]
tests: Re-enable tst_QMdiSubWindow test.

The test has one unstable failure. Mark this with QEXPECT_FAIL and
re-enable the test.

Change-Id: I2ccbbae4d5367cd9a24577857ed97247018f140e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agotests: Re-enable tst_QGraphicsProxyWidget test.
Sergio Ahumada [Wed, 8 Aug 2012 13:09:52 +0000 (15:09 +0200)]
tests: Re-enable tst_QGraphicsProxyWidget test.

The test has one stable failure. Mark this with QEXPECT_FAIL and
re-enable the test.

Change-Id: I2e536f1b40a1d36ab593d724ee5f9ce66ce87495
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
9 years agoChanged qt version to 4.8.3
jutaipal [Tue, 7 Aug 2012 10:58:41 +0000 (03:58 -0700)]
Changed qt version to 4.8.3

Change-Id: Ib26f4c1d3b236f947d685ef5c376c203bda0e650
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Simo Fält <simo.falt@nokia.com>
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
9 years agoProperly handle include cycles
Kevin Ottens [Wed, 1 Aug 2012 13:38:03 +0000 (15:38 +0200)]
Properly handle include cycles

Currently lupdate is just issuing a warning when it detects an
include cycle. Since it's not a full preprocessor, most of those
warnings are false positives, but they need special handling, this
patch provides that.

Now every result is stored as part of a cycle (so in the general
case a cycle of one file). When detecting a cycle, instead instead
of issuing a warning, we record the presence of the newly detected
cycle for later use and merge the other relevant cycles with it.
When retrieving results now it's not for a single file anymore but
for a complete cycle at once (which can turn out to be a cycle of
one file).

This is a backport of the commit done in qttools with revision

Task-number: QTBUG-6587

Change-Id: Idc79fbac4f69478ccff1464c1f4278d4afbf9d61
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoqmake vcxproj generator: map TARGET_EXT to $(TargetExt)
Joerg Bornemann [Tue, 7 Aug 2012 15:16:56 +0000 (17:16 +0200)]
qmake vcxproj generator: map TARGET_EXT to $(TargetExt)

Task-number: QTBUG-26782

Cherry-picked from qt5/qtbase commit

Change-Id: I7a93ede18d83d1ecfa74449fc5db76e8b3f6ae99
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoqmake: un-copy-and-pastify vcxproj generator a bit
Joerg Bornemann [Tue, 7 Aug 2012 15:07:50 +0000 (17:07 +0200)]
qmake: un-copy-and-pastify vcxproj generator a bit

Reusing already built strings improves readability and performance.

Cherry-picked from qt5/qtbase commit

Change-Id: I62554ffb9100af47ffb4978d51444a4cbbea7572
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
9 years agoAvoid crashes when invalidating a proxy model filter.
Stephen Kelly [Mon, 6 Aug 2012 15:02:49 +0000 (17:02 +0200)]
Avoid crashes when invalidating a proxy model filter.

Backport of b84e180263d0da3d1e6967fcf759225a778ea6ea
from qtbase.

Task-number: QTBUG-26107

Change-Id: I8323b19ce7b641165de21ad9a6e6b05bf4d93b1c
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>