7 years agoWhen using qmake outside qt src tree, it sometimes generates wrong patches/0253-qmake_correct_path_separators
Christian Ehrlicher [Thu, 8 May 2008 19:25:49 +0000 (21:25 +0200)]
When using qmake outside qt src tree, it sometimes generates wrong
paths (wrong path separator)

qt-bugs@ issue : none
Trolltech task ID : 214661

7 years agoQml Debugging: Only enable if explicitly requested v4.7.1
Jason McDonald [Wed, 3 Nov 2010 01:24:52 +0000 (11:24 +1000)]
Qml Debugging: Only enable if explicitly requested

Enable the remote debugging of QDeclarativeEngines only after


has been called.

Approved by 4.7 Program Team.

Reviewed-by: Alessandro Portale
Task-number: QTBUG-13762
(cherry picked from commit b2016bbfc9c7389e7b64451417395ceba96af21f)



7 years agoDo not crash on Symbian
Jason McDonald [Fri, 29 Oct 2010 00:43:20 +0000 (10:43 +1000)]
Do not crash on Symbian

The qml debugging enabler in QtDeclarative made any Qt app crash
which used QDeclarative. Reason was that QtDeclarative.dll tried
to directly access (private) writable static data from QtGui.dll.

This patch adds an accessor function for the data to QtGui, and
the crash is gone.

Done-by: Kai Koehne
Reviewed-by: Kai Koehne
(cherry picked from commit 2362d8b1e9fa86da1d3cc5dbb7d4467ec12311e1)



7 years agoRevert "Work around bug causing qml apps to crash on Symbian 5.0 devices."
Jason McDonald [Fri, 29 Oct 2010 00:39:59 +0000 (10:39 +1000)]
Revert "Work around bug causing qml apps to crash on Symbian 5.0 devices."

This reverts commit 391e173a8915230205a93b6e0709762f75547772.

7 years agoWork around bug causing qml apps to crash on Symbian 5.0 devices.
Jason McDonald [Thu, 28 Oct 2010 08:54:25 +0000 (18:54 +1000)]
Work around bug causing qml apps to crash on Symbian 5.0 devices.

Disable QML debugging on the devices for now.  A better fix will be
provided in the next release.

Task-number: QTBUG-14670
Reviewed-by: Miikka Heikkinen
7 years agoFix patch_capabilities.pl script for explicit set of capabilities
Miikka Heikkinen [Tue, 26 Oct 2010 10:50:28 +0000 (13:50 +0300)]
Fix patch_capabilities.pl script for explicit set of capabilities

Elftran command never got executed when explicit set of capabilities
was defined. No warning or error was printed either, making it rather
confusing for user.

Task-number: QTBUG-14730
Reviewed-by: Janne Koskinen
(cherry picked from commit f603ce9a960ee387ab10be1916da8ffd09305045)

8 years agoUpdate license headers to release version.
Jason McDonald [Mon, 18 Oct 2010 10:52:13 +0000 (20:52 +1000)]
Update license headers to release version.

8 years agoAdjust the parent index for the itemsMoved call.
Stephen Kelly [Wed, 13 Oct 2010 09:42:10 +0000 (11:42 +0200)]
Adjust the parent index for the itemsMoved call.

Not doing this causes the parent QModelIndexes to be out of sync with
the model.

The fix in fe350ca756df6392b3d0b7840351fccc89f9ef6f is extended to also
use adjusted indexes in the itemMove call.

Merge-request: 849
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
(cherry picked from commit 62dc9c9602987f4381481cc5642e3ea0782bb418)

8 years agoWorkaround for QFileSystemWatcher regression
Jarek Kobus [Thu, 14 Oct 2010 13:21:28 +0000 (15:21 +0200)]
Workaround for QFileSystemWatcher regression

Don't call removePath() when it was not added before.

Reviewed-by: con <qtc-committer@nokia.com>
Task-number: QTBUG-14435
(cherry picked from commit f38e8394eae20f7290688629ab66720ebacd64c9)

8 years agoCleanup changelog for 4.7.1.
Jason McDonald [Fri, 15 Oct 2010 03:36:02 +0000 (13:36 +1000)]
Cleanup changelog for 4.7.1.
(cherry picked from commit eb625b3112c241047e8d08146b63545165d33ebf)

8 years agoMy changes for 4.7.1
Miikka Heikkinen [Mon, 4 Oct 2010 11:27:10 +0000 (14:27 +0300)]
My changes for 4.7.1

Reviewed-by: TrustMe
(cherry picked from commit 0b905d602ffb24b8cad4f09d84a5f762cc6a6603)

8 years agoUpdate change log.
Andrew den Exter [Fri, 1 Oct 2010 07:18:39 +0000 (17:18 +1000)]
Update change log.
(cherry picked from commit 976391c5ce2bbe3b992298e140bbbbc596ca756f)

8 years agoRevert "Don't define highp/mediump/lowp if desktop GL has them"
Trond Kjernåsen [Tue, 12 Oct 2010 10:54:15 +0000 (12:54 +0200)]
Revert "Don't define highp/mediump/lowp if desktop GL has them"

This reverts commit 6155050f68cc86c445552da61a5f240c16f5e2cd.
The GL_ARB_ES2_compatibility extension does not mention the lowp,
mediump or highp keywords.

Task-number: QTBUG-14384
Reviewed-by: Samuel
Reviewed-by: Prasanth
(cherry picked from commit 7cd0a90344d340f22b6b2d3afeef092dbaf2cd51)

8 years agoAvoid in-place convertion of images with multiple references
Benjamin Poulain [Fri, 8 Oct 2010 12:21:10 +0000 (14:21 +0200)]
Avoid in-place convertion of images with multiple references

The decoding from image reader was assuming the image reader do not
keep the image internally. This is not true for the GIF plugins because
the previous image can be used to compose the current image.

This was causing crash on ARM because the 16 bits color depth causes
the image memory to be reduce by half. When the plugin was accessing
the memory, it assumes the images has not changed and is on 32 bits.

This patch disable the in-place conversion if a detach is required.
Regular conversion is the correct solution in this case, and it can
also be made faster by converting while copying.

Reviewed-by: Andreas Kling
(cherry picked from commit 4d974ff0a748b22e668a4cb7ef38101122c85b3b)

8 years agoAdd missing data for the autotest of in-place conversion for Pixmap
Benjamin Poulain [Sat, 9 Oct 2010 15:28:06 +0000 (17:28 +0200)]
Add missing data for the autotest of in-place conversion for Pixmap

The commit 4d974ff0a748b22e668a4cb7ef38101122c85b3b uses an new image
which was not commited with the patch.
(cherry picked from commit f0c1f381af7d6338ded9f65d00ed54b1b9405ba9)

8 years agoFixes assert in QDeclarativeWebView
Thomas Hartmann [Wed, 6 Oct 2010 09:48:24 +0000 (11:48 +0200)]
Fixes assert in QDeclarativeWebView

If QDeclarativeWebView was instantiated twice
an assert was triggered by QWebSettings::enablePersistentStorage();

This patch is crtical for tooling (Bauhaus)

Task-number: QTBUG-14278
Reviewed-by: Aaron Kennedy
(cherry picked from commit f532679ca11914b453e22342f2ae5e9f790ce47a)

8 years agoQGraphicsItem device coordinate cache unefficient in portrait mode
Bjørn Erik Nilsen [Wed, 6 Oct 2010 12:19:44 +0000 (14:19 +0200)]
QGraphicsItem device coordinate cache unefficient in portrait mode

Problem was that we always invalidated the cache whenever the item was
rotated. This is however not required for simple rotations such as
90, 180 and 270 degrees. This commit also removes the somewhat arbitrary
logic which takes the desktop size into account. We now use the viewport
size instead.

Auto test included.

Task-number: QT-3779
Reviewed-by: yoann
(cherry picked from commit e84ab1fee7f44a28ee82793f83b0b27d04d28c09)

8 years agoFix minehunt execution from QtDemo
Joona Petrell [Wed, 6 Oct 2010 04:01:56 +0000 (14:01 +1000)]
Fix minehunt execution from QtDemo

Task-number: QTBUG-14250
Reviewed-by: Martin Jones
(cherry picked from commit 695b54e671b55bd8103dee8b30ee76309dbd26c1)

8 years agoEnsure PathView updates positions when path changes.
Michael Brasser [Wed, 6 Oct 2010 03:59:19 +0000 (13:59 +1000)]
Ensure PathView updates positions when path changes.

Fixes regression caused by optimization added in commit

Task-number: QTBUG-14239
Reviewed-by: Martin Jones
8 years agoSupport device orientation in harmattan
Martin Jones [Thu, 7 Oct 2010 09:05:27 +0000 (19:05 +1000)]
Support device orientation in harmattan

Task-number: QTBUG-14137
Reviewed-by: Aaron Kennedy
(cherry picked from commit f9a8c4ec598a0070b9d2d861efe5ee69d5045a1f)

8 years agoSome 4.7.1 changes.
Bjørn Erik Nilsen [Thu, 30 Sep 2010 14:46:26 +0000 (16:46 +0200)]
Some 4.7.1 changes.
(cherry picked from commit 72fd8399aa36395e41f497fff79842496d6f9b03)

8 years agoUpdate changes
Jens Bache-Wiig [Thu, 30 Sep 2010 09:00:33 +0000 (11:00 +0200)]
Update changes
(cherry picked from commit 7d5afd371d634e35192ab27f65c6dc895f7bbb5c)

8 years agoAdd declarative changelog entries for 4.7.1
Joona Petrell [Thu, 30 Sep 2010 08:03:43 +0000 (18:03 +1000)]
Add declarative changelog entries for 4.7.1

Reviewed-by: Yann Bodson
(cherry picked from commit 753d366ced1a62a97d5207eb2708817efc35bc4d)

8 years agoconnman backend
Lorn Potter [Thu, 30 Sep 2010 05:00:47 +0000 (15:00 +1000)]
connman backend
(cherry picked from commit ba698e20b32defcb0840293fc4ac5948f7c190c9)

8 years agoMy changelog entries for 4.7.1
Markus Goetz [Wed, 29 Sep 2010 12:31:46 +0000 (14:31 +0200)]
My changelog entries for 4.7.1
(cherry picked from commit 646c37a670b101487a76b1e787fd298187b49430)

8 years agoupdated changes-4.7.1
Joerg Bornemann [Wed, 29 Sep 2010 11:58:51 +0000 (13:58 +0200)]
updated changes-4.7.1
(cherry picked from commit 0ce33ebfa8b99c2988b56d0157ddc039a9ab06ae)

8 years agoUpdate changelog
Olivier Goffart [Wed, 29 Sep 2010 09:33:18 +0000 (11:33 +0200)]
Update changelog
(cherry picked from commit 8050dc45c8c9a134875196dcddf010d4194fd974)

8 years agomy contributions to dist/changes-4.7.1
Bradley T. Hughes [Wed, 29 Sep 2010 09:34:29 +0000 (11:34 +0200)]
my contributions to dist/changes-4.7.1
(cherry picked from commit 3519840ef2c5cb7cbc5b32ffc9976a8638187d64)

8 years agoMy 4.7.1 changes.
Trond Kjernåsen [Wed, 29 Sep 2010 09:22:53 +0000 (11:22 +0200)]
My 4.7.1 changes.
(cherry picked from commit 99340cf858731f531af29be1e1368e4991e8564e)

8 years agoadded my and Jan-Arve's change to changelog for 4.7.1
Thierry Bastian [Wed, 29 Sep 2010 08:22:26 +0000 (10:22 +0200)]
added my and Jan-Arve's change to changelog for 4.7.1
(cherry picked from commit c1a9c50d53ae41b19bdcd7930eec0805498e01c6)

8 years agoChanges done for 4.7.1
Prasanth Ullattil [Wed, 29 Sep 2010 08:13:22 +0000 (10:13 +0200)]
Changes done for 4.7.1
(cherry picked from commit 583ca462caf656af17bea1c3f05d88ae7785ae91)

8 years agoUpdated changes-4.7.1
Samuel Rødal [Wed, 29 Sep 2010 07:49:29 +0000 (09:49 +0200)]
Updated changes-4.7.1
(cherry picked from commit 2d1e3b9778328046d3ba94dd51c37c507e618721)

8 years agoMy changes.
Aaron McCarthy [Wed, 29 Sep 2010 07:02:06 +0000 (17:02 +1000)]
My changes.
(cherry picked from commit 2b70a3a6d5ebef36e90f52076c5d942d8cc171d7)

8 years agoAdded note to changes-4.7.1
Zeno Albisser [Tue, 28 Sep 2010 13:44:06 +0000 (09:44 -0400)]
Added note to changes-4.7.1

Reviewed-by: Frederik Gladhorn
(cherry picked from commit 02de74f0b2d443e410154e96321357cfe2ef9aad)

8 years agoAdded my changes to the changelog.
axis [Mon, 27 Sep 2010 14:34:04 +0000 (16:34 +0200)]
Added my changes to the changelog.
(cherry picked from commit fbf91dc787c15f561686cd708735ff8f45984aba)

8 years agodist/changes: QML Debugging changes
Lasse Holmstedt [Fri, 24 Sep 2010 10:44:17 +0000 (12:44 +0200)]
dist/changes: QML Debugging changes
(cherry picked from commit baa2d6bee64e458f547b290d7cd1acdfc6292e05)

8 years agoUpdated changes-4.7.1.
Kim Motoyoshi Kalland [Fri, 24 Sep 2010 10:27:34 +0000 (12:27 +0200)]
Updated changes-4.7.1.
(cherry picked from commit bed3d1eca213f24dae13cbd4cda4df94d9f0738b)

8 years agoChangelog: 4.7.1 (uic/Designer).
Friedemann Kleint [Thu, 23 Sep 2010 13:49:46 +0000 (15:49 +0200)]
Changelog: 4.7.1 (uic/Designer).
(cherry picked from commit f160e04ebe2926d09c20ef3960def1388a566db7)

8 years agoUpdate the changelog with the SSE work done for Qt 4.7.1
Benjamin Poulain [Thu, 23 Sep 2010 10:22:15 +0000 (12:22 +0200)]
Update the changelog with the SSE work done for Qt 4.7.1
(cherry picked from commit 9c97aa4946a1d6b22bdcd8475f32b5ead7051976)

8 years agomy changes for 4.7.1
Peter Hartmann [Thu, 23 Sep 2010 09:15:45 +0000 (11:15 +0200)]
my changes for 4.7.1
(cherry picked from commit f2be9f394972edffa0eebc9c30fe00a4fce81abc)

8 years agoMy Qt 4.7.1 changes
Eskil Abrahamsen Blomfeldt [Thu, 23 Sep 2010 09:00:11 +0000 (11:00 +0200)]
My Qt 4.7.1 changes
(cherry picked from commit 77b9b5dc93662d505b2c69211d001e5672d8a2cb)

8 years agoRevert "When using complex transformations rendering goes easily off by one pixel."
Jani Hautakangas [Mon, 4 Oct 2010 12:42:51 +0000 (15:42 +0300)]
Revert "When using complex transformations rendering goes easily off by one pixel."

This reverts commit 2acdc634ee895af4a9738c0f6c2496e388afba38.

Originally this fixed QT-3791 but it caused lots of problems in
other sites. So reverting this will fix QT-4001 but reopens
QT-3791. QT-4001 blocks Qt 4.7.1 but QT-3791 doesn't.

Task-number: QT-4001
Reviewed-by: Jason Barron
(cherry picked from commit 25ddfb434f13aa3bbc6ac303aa17dbe9582bf3f0)

8 years agoQS60Style: QDateEdit - Layout issues
Sami Merila [Tue, 5 Oct 2010 13:43:33 +0000 (16:43 +0300)]
QS60Style: QDateEdit - Layout issues

In portrait orientation, QDateEdit's calendar popup (QCalendarWidget)
does not fit into screen.

As a fix, the pixel metric PM_FocusFrameHMargin, is reduced from
13 to 3 in qHD screens (640*360). Also, the explicit halving of
the pixel metric for QTableViews is removed.

The pixel metric resulted in 27 pixel text margins (2 * pm + 1)for
calendar widgets, which is clearly a bit too much.

Task-number: QTBUG-14126
Reviewed-by: Miikka Heikkinen
(cherry picked from commit b3f895fd97deda0c7c5bfd704c04450e7afee748)

8 years agoUpdate .def files for recent cherry-picks.
Jason McDonald [Tue, 5 Oct 2010 10:11:47 +0000 (20:11 +1000)]
Update .def files for recent cherry-picks.

8 years agoFixed a layout issue where you could get NaN as dimensions
Thierry Bastian [Thu, 30 Sep 2010 09:38:14 +0000 (11:38 +0200)]
Fixed a layout issue where you could get NaN as dimensions

The problem is that with empty layouts we could sometimes divide by 0.
Note: This doesn't fix the whole task...

Task-number: QTBUG-13547
Reviewed-by: ogoffart
(cherry picked from commit c1f9978c9d61bcbdb2f280185a3abdea13d7f532)

8 years agoBuild fix for -qtnamespace.
Leandro Melo [Thu, 30 Sep 2010 09:43:10 +0000 (11:43 +0200)]
Build fix for -qtnamespace.

Reviewed-by: Thiago Macieira
(cherry picked from commit b8089f0b7a0fef9318070aea9c8344bfe987bac9)

8 years agoDoc update for the support of MSVC 2010 64-bit
Thierry Bastian [Mon, 27 Sep 2010 09:39:05 +0000 (11:39 +0200)]
Doc update for the support of MSVC 2010 64-bit

MS has released a hotfix for the support of MSVC 2010 64-bit.
It fixes the optimizer that could generate code that crashes.

Reviewed-by: Trust-Me
Task-number: QTBUG-11445
(cherry picked from commit ce2a273bab9b9094a1f0f3f60309797e11e59404)

8 years agoFix double painting when adding an item into a linear layout
Thierry Bastian [Wed, 29 Sep 2010 10:56:38 +0000 (12:56 +0200)]
Fix double painting when adding an item into a linear layout

the problem was that the item is first painted at its default position,
then moved by the layout and finally repainted.
We now made sure the item is laid out before the first paint event

Task-number: QTBUG-13865
Reviewed-by: bnilsen
(cherry picked from commit 33f525e636ef8fa64a15d3e66c56adaea0075bda)

8 years agoFixed performance regression in curve stroking.
Samuel Rødal [Mon, 27 Sep 2010 11:02:47 +0000 (13:02 +0200)]
Fixed performance regression in curve stroking.

Change c46688b8a88da made us use m_curve_threshold for both
QBezier::shifted and QBezier::toPolygon, and adjusted the threshold
dynamically based on the painter scale. Since the threshold in shifted
was already relative to the pen width, it is independent from the
painter scale. Instead, we need to set a separate threshold for dashing.

Also, in several places we were calling setCurveThresholdForTransform
with the painter matrix even though we were transforming the points into
device coordinate space before stroking.

Task-number: QTBUG-13894
Reviewed-by: Gunnar Sletta
(cherry picked from commit d60dc7cba21794866c9382f83080fab1a129eb08)

8 years agoFixed parsing of SVGs with absolute font sizes.
Kim Motoyoshi Kalland [Wed, 29 Sep 2010 16:41:38 +0000 (18:41 +0200)]
Fixed parsing of SVGs with absolute font sizes.

Task-number: QTBUG-14070
Reviewed-by: Gunnar
(cherry picked from commit 4cd4160d85dc1e158a545422cac895792b14eda6)

8 years agoRevert "Fix (implement!) hfw/wfh in QGridLayoutEngine"
Thierry Bastian [Thu, 30 Sep 2010 09:40:39 +0000 (11:40 +0200)]
Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"

This reverts commit 62b5ef3cc1306e46a4042b14867f2f92d9a110f3.

The implementation of hfw from this patch is unfortunately not robust enough.
It doesn't manage correctly the constraints on the layouts and the cell spans.
It caused bad behaviour or regressions seen in tasks:
QTBUG-13547, QTBUG-13067, QTBUG-13549, and more

Reviewed-By: ogoffart
(cherry picked from commit 5bd6f7eb5c7d87c08539b6c2df416990cc417ec7)

8 years agoQDeclarativeDebug: Make autotests more robust
Kai Koehne [Thu, 30 Sep 2010 15:49:19 +0000 (17:49 +0200)]
QDeclarativeDebug: Make autotests more robust

Always flush sockets after sending data, and make autotests more robust
by using busy wait.

Reviewed-by: Christiaan Janssen
(cherry picked from commit cfe198948f1e4867918176df38b3e0b49757a4b8)

8 years agoQDeclarativeDebugClient: Make sure status is consistent
Kai Koehne [Thu, 30 Sep 2010 13:26:05 +0000 (15:26 +0200)]
QDeclarativeDebugClient: Make sure status is consistent

When statusChanged() is called during handsake state() was not the same
as the argument passed. Fix this by setting gotHello = true _before_
notifying the clients.

Reviewed-by: Christiaan Janssen
Task-number: QTBUG-14087
(cherry picked from commit a1f050fe4217d3a642ab7f4df8e50c21aa51689c)

8 years agoQDeclarativeDebugClient: Fix gcc warning
Kai Koehne [Tue, 28 Sep 2010 10:48:13 +0000 (12:48 +0200)]
QDeclarativeDebugClient: Fix gcc warning
(cherry picked from commit 9caae83e1f2b9c56ee86b8523391e6a83ea724c5)

8 years agoQmlDebugService: Check that there is a receiver before sending messages
Kai Koehne [Tue, 28 Sep 2010 10:24:55 +0000 (12:24 +0200)]
QmlDebugService: Check that there is a receiver before sending messages

Reviewed-by: Christiaan Janssen
(cherry picked from commit 30959e88498b2c8591145e30c8b497a76c12d8f6)

8 years agoMake QmlDebug protocol more robust
Kai Koehne [Wed, 22 Sep 2010 19:03:57 +0000 (21:03 +0200)]
Make QmlDebug protocol more robust

The protocol so far was client->server only. That is, there was no
sane way for a client to check whether a plugin on the server (service)
was available or not. E.g. calling Client::setEnabled(true) 'succeeded',
without a check whether there is actually a service to talk to.

The new protocol replaces this shortcoming by a service discovery
mechanism: Both client & service announce their available plugins at
handshake time, and later on if there are changes. The status is
reflected in Client::status() and Service::Status() , which are either

  NotConnected - no network connection, or not registered properly
  Unavailable - TCP/IP connection works, but no plugin with the same
name on the other side
  Enabled - You can connect to plugin on other side

The status changes happen automatically (no setEnabled() anymore).

Furthermore a version ID was added to the handshake, so that we can
extend the protocol further in the future :)
(cherry picked from commit fd9771c29d401d88779ab7c5d7715c9ca41dd723)

8 years agoAdd exports for Bauhaus
Thomas Hartmann [Tue, 21 Sep 2010 11:00:02 +0000 (13:00 +0200)]
Add exports for Bauhaus

The QmlDesigner(Bauhaus) should not rely on -nokia-developer

Reviewed-by: Marco Bubke
(cherry picked from commit 8ad396891f2a4966ad3cf943f99e208211e956bb)

8 years agoQmake: Fix wrong path in the breakpad post link step
Marco Bubke [Wed, 22 Sep 2010 17:58:18 +0000 (19:58 +0200)]
Qmake: Fix wrong path in the breakpad post link step

Reviewed-By: Oswald Buddenhagen
(cherry picked from commit 7412ac5b38d83b627a372a525f271c225f9c1f70)

8 years agoAdd breakpad support
Marco Bubke [Wed, 4 Aug 2010 12:15:35 +0000 (14:15 +0200)]
Add breakpad support

Breakpad is a portable crash handler. It sends the raw crash
information to a server for analysis. This analysis needs debug
information. Consequently, we compile with debug info even in release
mode if qt-breakpad integration is requested (via an environment

Reviewed-by: ossi
(cherry picked from commit 1a99cdbb36334e17c34b38dd5df1bdd70167b42a)

8 years agoAdd sendParentChangeNotification to QGraphicsItem
Marco Bubke [Thu, 30 Sep 2010 14:27:25 +0000 (16:27 +0200)]
Add sendParentChangeNotification to QGraphicsItem

Fixes crash in creator. If flag is true notifications are sent. It is important
that positioners work correctly and don't leak.

Reviewed-By: Alexis Menard
(cherry picked from commit 3b43389b78925ce87d660c343c925fa280b91e11)

8 years agoUse setParentItem() instead of setParentItemHelper if componentComplete is true
Marco Bubke [Thu, 30 Sep 2010 15:23:27 +0000 (17:23 +0200)]
Use setParentItem() instead of setParentItemHelper if componentComplete is true

This ensures that if the component has already been completed, itemChange()
is called. This is required to modify QDeclarativePositions in the visual
editor, while keeping a legal state. Without this patch notifications are
missing and the Positioner keeps track of already deleted children.
This resulted in a crash.

Reviewed-by: Thomas Hartmann
(cherry picked from commit 1f8bb573f06234a3d13fb57de5eb644824d5024f)

8 years agoAdd export to QDeclarativeBasePositioner
Marco Bubke [Mon, 27 Sep 2010 14:10:52 +0000 (16:10 +0200)]
Add export to QDeclarativeBasePositioner

Bauhaus needs this export to manage layouts.
(cherry picked from commit 858469445ceb745c70dad9cd4f913acc34683e15)

8 years agoAutotest that new "import Qt 4.7"s aren't added accidentally
Aaron Kennedy [Wed, 29 Sep 2010 04:16:27 +0000 (14:16 +1000)]
Autotest that new "import Qt 4.7"s aren't added accidentally

Task-number: QTBUG-13799
(cherry picked from commit f7a439a0a00b0bdd6ebeff8bfd5ee2285eab1398)

8 years agoDocument "import QtQuick 1.0" change
Aaron Kennedy [Wed, 29 Sep 2010 03:48:42 +0000 (13:48 +1000)]
Document "import QtQuick 1.0" change

Task-number: QTBUG-13799
(cherry picked from commit 1ab457d5db184c53d9857a7b425051e5aa5ff2e0)

8 years agoReplace "import Qt 4.7" with "import QtQuick 1.0"
Aaron Kennedy [Wed, 29 Sep 2010 02:19:37 +0000 (12:19 +1000)]
Replace "import Qt 4.7" with "import QtQuick 1.0"

Task-number: QTBUG-13799
(cherry picked from commit 1f43e68c4ca5b28444b046deff1658b1b4b1923d)

8 years agoAdd test for Qt 4.7 module
Aaron Kennedy [Wed, 29 Sep 2010 02:14:44 +0000 (12:14 +1000)]
Add test for Qt 4.7 module

Task-number: QTBUG-13799
Reviewed-by: Martin Jones
(cherry picked from commit 6f35701275ab0cd80daec45b3407725b10571693)

8 years agoReplace all occurances of "Qt 4.7" with "QtQuick 1.0"
Jason McDonald [Fri, 1 Oct 2010 05:28:48 +0000 (15:28 +1000)]
Replace all occurances of "Qt 4.7" with "QtQuick 1.0"

Task-number: QTBUG-13799
Reviewed-by: Martin Jones
(cherry picked from commit 49452ad6b22e080b1dfdfde38c21c48bb910a1ae)



8 years agoRegister QtQuick 1.0 module.
Aaron Kennedy [Wed, 29 Sep 2010 01:13:18 +0000 (11:13 +1000)]
Register QtQuick 1.0 module.

Qt 4.7 is still supported, but deprecated.

Reviewed-by: Martin Jones
Task-number: QTBUG-13799
(cherry picked from commit 4fcf055f66cc23c9e60a7add489e394420e71914)

8 years agoIf a type is registered under several names, share the attached property object
Aaron Kennedy [Tue, 28 Sep 2010 08:50:18 +0000 (18:50 +1000)]
If a type is registered under several names, share the attached property object

Task-number: QTBUG-13799
(cherry picked from commit 746954581f06e0bca98f25eb95dca09c663d47bf)

8 years agoFixed compile error on non-Symbian platforms.
axis [Tue, 28 Sep 2010 06:21:13 +0000 (08:21 +0200)]
Fixed compile error on non-Symbian platforms.
(cherry picked from commit 3e3ce984b54a0b199bf5d4f5e3dcb0a9d5b5bd79)

8 years agoFixed regression when typing in QTextControl based widgets on Symbian
axis [Mon, 27 Sep 2010 11:37:14 +0000 (13:37 +0200)]
Fixed regression when typing in QTextControl based widgets on Symbian

The bug was that when querying for the maximum text length, the case
where an invalid QVariant was returned (which is allowed) was not
handled properly. This would lead to input being blocked by the input
context when it shouldn't.

RevBy:    Sami Merila
(cherry picked from commit 3bb3af84bef3c0472ca8ed0d5c6bb3c82320956d)

8 years agoFix QApplication::desktop()->availableGeometry() for Symbian
Miikka Heikkinen [Thu, 30 Sep 2010 07:42:21 +0000 (10:42 +0300)]
Fix QApplication::desktop()->availableGeometry() for Symbian

Since screen geometry changes before client area geometry is
changed in Eikon, we need to send two resize events, one for screen
area change and one for client area change.

Note that the correct way to detect client area change in applications
is to connect to QApplication::desktop() signal workAreaResized(int)
instead of filtering for resize events meant for QDesktopWidget.

Task-number: QTBUG-14058
Reviewed-by: Jason Barron
(cherry picked from commit 0725abc4607755833a1eb7cb9e083add48d03a88)

8 years agofix moc argument quoting on mingw
Oswald Buddenhagen [Tue, 28 Sep 2010 12:53:44 +0000 (14:53 +0200)]
fix moc argument quoting on mingw

for some bizarre reason, mingw doesn't like double quotes.
so instead of building some more elaborate custom quoting, just let
qmake do it for us.

Reviewed-by: mariusSO
(cherry picked from commit fa5c83003db5dea46fc045b2fd90e6308a0d8911)

8 years agoQDeclarativeDebugService: Add bc autotest
Kai Koehne [Mon, 27 Sep 2010 08:56:00 +0000 (10:56 +0200)]
QDeclarativeDebugService: Add bc autotest

Although it's a private header we use qdeclarativedebugservice_p.h in
creator / qmljsdebugger library. Working with a copy of the header in
the autotest hopefully catches some bc breakages.
(cherry picked from commit 31dcf2b4028b1f76301fc69fccff0a9474a0a135)

8 years agoAdded support for unsigned smart installer package creation in Symbian
Miikka Heikkinen [Thu, 30 Sep 2010 13:11:43 +0000 (16:11 +0300)]
Added support for unsigned smart installer package creation in Symbian

Make target "unsigned_installer_sis" can now be used to create
unsigned smart installer sis. The contained application sis
will also be unsigned.

Task-number: QTBUG-13902
Reviewed-by: axis
(cherry picked from commit 6d5309c2fbdbf15948b430de103f393c5af5b7cd)

8 years agoFix crash when trying to append a null transform to QDeclarativeItem.
Michael Brasser [Tue, 28 Sep 2010 03:55:04 +0000 (13:55 +1000)]
Fix crash when trying to append a null transform to QDeclarativeItem.

Task-number: QTBUG-13893
(cherry picked from commit 085a121cb1ebba38d62c924500dbc71806b29b3c)

8 years agoQAxBase::dynamicCall() returns invalid QVariant
Prasanth Ullattil [Thu, 30 Sep 2010 11:45:00 +0000 (13:45 +0200)]
QAxBase::dynamicCall() returns invalid QVariant

Starting from 4.7.0, QVariant is recognized as a standard type by the
meta type system. ActiveQt needs to consider this while converting
COM VARIANT types to a QVariant.

Task-number: QTBUG-13845
Reviewed-by: Volker Hilsheimer
Reviewed-by: Olivier Goffart
(cherry picked from commit fc50d7ecaacfbfef1dbefd6ffdc083cb66c5633c)

8 years agoFixes cursor shape when widget becomes native on X11.
Denis Dzyubenko [Wed, 29 Sep 2010 12:02:10 +0000 (14:02 +0200)]
Fixes cursor shape when widget becomes native on X11.

When a native window handle is created for a widget that has override
cursor set, we should reset the cursor on the parent and set the cursor
on the new window handle.

Task-number: QTBUG-6185
Reviewed-by: Olivier Goffart
(cherry picked from commit 9e9a7bc29319d52c3e563bc2c5282cb7e6890eba)

8 years agoStreamlined smart installer package creation
Miikka Heikkinen [Mon, 27 Sep 2010 12:39:18 +0000 (15:39 +0300)]
Streamlined smart installer package creation

Previously manual editing of the pkg file was required to publish
application using smart installer. Now a proper app_installer.pkg
will  be created as long as application has protected range UID.
Also changed "make installer_sis" to always generate the application
sis as publishing process supports signing both application and its
smart installer wrapper packages in single step.

Task-number: QTBUG-13991
Reviewed-by: axis
(cherry picked from commit bc8409b9d04be54d98ca97d96c32473039f58a80)

8 years agoFixed incorrect snippet in BLD_INF_RULES documentation
Miikka Heikkinen [Mon, 27 Sep 2010 13:15:40 +0000 (16:15 +0300)]
Fixed incorrect snippet in BLD_INF_RULES documentation

Task-number: QTBUG-13988
Reviewed-by: TrustMe
(cherry picked from commit 1e4f736c2825c8c36ec74719efbc723f6374d072)

8 years agoFix assert when placing a .qml file inside $QTDIR/imports
Kai Koehne [Mon, 27 Sep 2010 12:47:21 +0000 (14:47 +0200)]
Fix assert when placing a .qml file inside $QTDIR/imports

The assert "Internal error: Plugin imported previously with different uri"
happens on Windows. $QTDIR\imports, which is prefixed to the
search path, is still written with backslashes. Unify this to forward
slashes for all paths.

Reviewed-by: mae
(cherry picked from commit 0aa6360b7648ddeb8a905960265eb46d8c12448f)

8 years agoFixed floating point overflow issues in QRasterizer::rasterizeLine
Samuel Rødal [Thu, 23 Sep 2010 08:04:39 +0000 (10:04 +0200)]
Fixed floating point overflow issues in QRasterizer::rasterizeLine

Change 7c673a4cf64ba04 introduced some autotest failures in the
fpe_steepSlopes test in QPainter.

Since the other rasterizers all deal in a 26.6 fixed point coordinate
space we should snap the line vertices to this to prevent floating point
overflows due to very steep slopes.

This also necessitates keeping track of four different slope / inverse
slope increments for each of the four edges.

This also fixes a previously QEXPECT_FAIL'ed test case.

Task-number: QTBUG-13429
Reviewed-by: Trond
(cherry picked from commit 93199a5b7082fd484b7f21ad4825d71693ecead2)

8 years agoFixed scaled point drawing with square cap in raster paint engine.
Samuel Rødal [Mon, 20 Sep 2010 12:54:30 +0000 (14:54 +0200)]
Fixed scaled point drawing with square cap in raster paint engine.

With a large pen width and a small scale, due to the hacky way we draw
points (stroking a line from (x, y) to (x + tiny_amount, y)), we some
times end up snapping these two points to the same in rasterizeLine().
If we instead apply the SquareCap before we do clipping / snapping we
don't get this problem.

Task-number: QTBUG-13429
Reviewed-by: Trond
(cherry picked from commit 7c673a4cf64ba043bb27f90287517bdcdd7a21db)

8 years agoRemoving libconninet 3rdparty component.
Aaron McCarthy [Mon, 27 Sep 2010 07:12:02 +0000 (17:12 +1000)]
Removing libconninet 3rdparty component.

The use of libconninet caused Qt to have a cyclic build dependency.
Which was solved by embedding a copy as a 3rd party library. Maemo has
since donated the libconninet code to Qt because (1) it was a private
Maemo API and (2) the Qt ICD plugin is the only user of the library.

This commit moves the relevent code from src/3rdparty/libconninet to
src/plugins/bearer/icd and deletes the rest.

Task-number: QT-3893
(cherry picked from commit f532d8fcd236be9933e4186a95561e1c264de277)

8 years agoCloses properly the dbus connection in icd backend
Aaron McCarthy [Mon, 27 Sep 2010 07:07:55 +0000 (17:07 +1000)]
Closes properly the dbus connection in icd backend
(cherry picked from commit 2ff0dee1b97348a750532223f0a318596c93d412)

8 years agoConnect/Disconnect requests needs to use the same dbus connection to ICD for the...
Aaron McCarthy [Mon, 27 Sep 2010 07:05:25 +0000 (17:05 +1000)]
Connect/Disconnect requests needs to use the same dbus connection to ICD for the refcounting to work in ICD.

Fixes NB#188145 -  Network interface doesn't go down after last client disconnects
(cherry picked from commit 4acbb418b1ad093ad848143218a10ee2957db282)

8 years agoUpdated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2
Simon Hausmann [Fri, 24 Sep 2010 14:29:46 +0000 (16:29 +0200)]
Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2

Includes Jay's fix for the JSC memory consumption on Symbian

See also commit 03b7a3cffba609df56b4ccadacae6b6f985e96e9
(cherry picked from commit dbf1d0339a0cfbe60e6b3e45f39e6c02aa3de0a8)

8 years agoUpdate QtDeclarative .def files.
Jason McDonald [Mon, 27 Sep 2010 09:56:07 +0000 (19:56 +1000)]
Update QtDeclarative .def files.

8 years agoMove includes after copyright block
Martin Jones [Wed, 22 Sep 2010 22:50:21 +0000 (08:50 +1000)]
Move includes after copyright block
(cherry picked from commit b750bb085029117497d26a24dcd590fbe34fe281)

8 years agoMitigate private header problems in QtCreator by adding semi-private API
Kai Koehne [Wed, 22 Sep 2010 07:16:42 +0000 (09:16 +0200)]
Mitigate private header problems in QtCreator by adding semi-private API

Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator
accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a
private header, where we nevertheless can make some BC checks/guarantees.

Aaron Kennedy agreed with the idea.

Task-number: QTCREATORBUG-2179
(cherry picked from commit c1a7deedf1628e0dd3a5fbf92d97c4151d17fb5a)

8 years agoMitigate private header problems in QtCreator by adding semi-private API
Kai Koehne [Wed, 22 Sep 2010 07:16:42 +0000 (09:16 +0200)]
Mitigate private header problems in QtCreator by adding semi-private API

Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator
accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a
private header, where we nevertheless can make some BC checks/guarantees.

Aaron Kennedy agreed with the idea.

Task-number: QTCREATORBUG-2179
(cherry picked from commit 63c4c0449361ced03838e51d18e1113740f27fa9)

8 years agofix RSS listing example
Peter Hartmann [Fri, 24 Sep 2010 09:47:36 +0000 (11:47 +0200)]
fix RSS listing example

... by handling HTTP 30X responses and using QNetworkAccessManager
instead of QHttp. The server now sends back a HTTP 302 instead of a 200.

Reviewed-by: Markus Goetz
Task-number: QTBUG-13892
(cherry picked from commit 15ddcea2d15b7d7731e24151b0a30990e77efe74)

8 years agoImproved Symbian4 platform detection
Miikka Heikkinen [Wed, 22 Sep 2010 13:32:31 +0000 (16:32 +0300)]
Improved Symbian4 platform detection

Now returns correct value for Symbian4 platforms with
QSysInfo::symbianVersion(). SYMBIAN_VERSION .pro file variable should
also return correct value even if it doesn't get set in environment.prf.

Task-number: QTBUG-13802
Reviewed-by: Shane Kearns
Reviewed-by: Janne Anttila
(cherry picked from commit 0aad0d2043e061469b7139483c489dc6f823490b)

8 years agoQHostInfo: Fix a crash when a new request is pushed while resolving.
Jocelyn Turcotte [Sun, 26 Sep 2010 16:38:55 +0000 (18:38 +0200)]
QHostInfo: Fix a crash when a new request is pushed while resolving.

The loop looking for posponedLookup in the lookup thread wasn't locking
the mutex before trying to access/modify the list.

Reviewed-by: Andreas Kling
(cherry picked from commit 45c2ac4f1e1218f595b1d21691c8dec4eaa1a021)

8 years agoQML Debugging: Documentation fixes
Lasse Holmstedt [Fri, 24 Sep 2010 11:13:29 +0000 (13:13 +0200)]
QML Debugging: Documentation fixes

Many things have changed with QML debugging in Qt Creator. Now docs
simply refer to Qt Creator documentation.

Reviewed-by: Leena Miettinen
(cherry picked from commit f61d2d16310aa0a87ec1ba823f903f19575aed7c)

8 years agoFix dependency on the plugins rule for multimedia
Andy Shaw [Fri, 24 Sep 2010 07:13:35 +0000 (09:13 +0200)]
Fix dependency on the plugins rule for multimedia

When configuring with -no-multimedia then the plugins rule should not
be depending on multimedia, otherwise it will not try and build any

Task-number: QTBUG-13912
Reviewed-by: Rohan McGovern
(cherry picked from commit c52224f8010bf90732e5b2ad6cef84f9bd248787)

8 years agoAvoid OpenVG rendering errors when stroking an aliased path.
Jason Barron [Wed, 22 Sep 2010 13:41:40 +0000 (15:41 +0200)]
Avoid OpenVG rendering errors when stroking an aliased path.

Stroking a path can sometimes result in inconsistent rendering
especially when combined with a clip. For example, if the logical edge
of a clip rect coincides with the logical edge of a path then it can
happen that the edge is not painted correctly because the stroke lies
outside the bounds of the clip rect. To workaround this problem, we add
the 'aliasedCoordinateDelta' such that the rounding will err on the
side of caution. This improves the correctness when using the raster
engine as a reference.

Task-number: QTBUG-13165
Reviewed-by: Samuel
(cherry picked from commit 74f09c794d5fdcb8f4b547b1c55bcd512ef07b95)

8 years agoIncorrect translations for application menu items on Mac OS X.
Prasanth Ullattil [Thu, 23 Sep 2010 11:43:26 +0000 (13:43 +0200)]
Incorrect translations for application menu items on Mac OS X.

This is a regression fron 4.6 release. Menu entries with some specific
roles are automatically merged to the application menu. They are now
translated based on the context "MAC_APPLICATION_MENU" instead of
"QMenuBar" context. This patch eanbles the use for both contexts.

Task-number: QTBUG-13878
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 7d878ba53909157cf1911c30ce973378589c2cc0)

8 years agoFix a crash with D&d on mingw
Thierry Bastian [Wed, 22 Sep 2010 09:35:39 +0000 (11:35 +0200)]
Fix a crash with D&d on mingw

The Drag&Drop callbacks need to be correctly aligned to not crash
in the graphics SSE code.

Task-number: QTBUG-13787
Reviewed-by: benjamin poulain
(cherry picked from commit a7c28aa588417c0a75f82d55019814443f889340)

8 years agoQTreeView: do not scroll to top if last item is removed
Frank Reininghaus [Wed, 22 Sep 2010 08:19:59 +0000 (10:19 +0200)]
QTreeView: do not scroll to top if last item is removed

When the last item is the current item and is removed,
QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's
viewItems member is cleared. This commit makes sure that viewItems is
restored by calling QTreeView::doItemsLayout() in this case, preventing
that the scroll bar range is set to zero temporarily and the view is
scrolled to the top unexpectedly (this was a regression in 4.7.0:

Merge-request: 2481
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
(cherry picked from commit 6da6b7099d4e0b49329793e4b90703ec3d868048)