| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
(cherry picked from commit c01ce578761aefc2c1780047aa666eb7ee96159f)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Don't state a specific version number, or we'll keep forgetting to
update it.
Task-number: 251338
Reviewed-by: Trust Me
(cherry picked from commit 08934a1647d60150d260275b4aac7d680bce3cfe)
Conflicts:
FAQ.txt
|
|
|
|
|
|
|
|
|
| |
The previous logic caused a license check when the eval
license file was missing.
Reviewed-by: Jason McDonald
Task-number: 251339
(cherry picked from commit 8eb08c8c294f00763961e86cc3370b0ef78c8976)
|
|
|
|
|
|
|
|
| |
Restore the text that is omitted for a minor release but included in
patch releases. Also fixes obsolete link to changes files.
Reviewed-by: Trust Me
(cherry picked from commit e389dc42a1d3d473eac34987767b94dbe623a275)
|
|
|
|
| |
(cherry picked from commit 095c4209fe8fea6d46cc6c1486d2bc6471e8f0a5)
|
|
|
|
| |
This reverts commit b173f1671fd35c6ae674f5368f7a8b66a0f15322.
|
| |
|
|\ |
|
| |
| |
| |
| | |
(cherry picked from commit 90d7509e4a1543e43a49bfb25dd672d824c4fde3)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The comment in the code pretty much says it all, so I'll repeat it:
This is a workaround for NSToolbar. When a widget is hidden by
clicking the toolbar button, Cocoa reparents the widgets to another
window (but Qt doesn't know about it). When we start showing them,
it reparents back, but at this point it's window is nil, but the
window it's being brought into (the Qt one) is for sure created.
This stops the hierarchy moving under our feet.
Task-number: 251294
Reviewed-by: Prasanth Ullattil
(cherry picked from commit 139265031939d676f049edd2c91918040e0659b4)
|
| |
| |
| |
| |
| |
| | |
Reviewed-by: TrustMe
BT: Yes
(cherry picked from commit 0aa3203fa13bfbc42e77488765023832934dd36b)
|
| |
| |
| |
| | |
(cherry picked from commit 602da82d3c9413df41eb5b17bdf7e3c1586316b5)
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: 251346
Reviewed-by: TrustMe
BT: Yes
(cherry picked from commit fc8285ec610b02f440f692be90aed1e6925a8675)
|
| |
| |
| |
| |
| |
| |
| |
| | |
have a version number, so we do not have to update it each release.
Task-number: 251352
Reviewed-by: TrustMe
(cherry picked from commit 90ff6b0ad7397a6892185e8340d58dab4b85b032)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
marked getInt() as since Qt 4.5 and finally modified the StandardDialogs
example to reflect the fact that getInteger() is deprecated.
Task-number: 251288
Reviewed-by: nrc <qt-info@nokia.com>
BT: Yes
(cherry picked from commit 08dff2935af2d71f2fe76182079da636c1bb6f5b)
|
| |
| |
| |
| | |
(cherry picked from commit 78659fbe2d4ad8a01b41cb485f57b4a66c031fd5)
|
| |
| |
| |
| |
| | |
Changelog
(cherry picked from commit b6a50971f51618a3965605d9223c8b2b06c23f29)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This has to do with coalesced updates. The easy fix for now is
to fix QtDemo itself, meaning: always use a steady timer for
redrawing the viewport of the graphics view (as opposed to let
each item on screen calling update whenever they move)
Task-number: 250667
Reviewed-by: Trenton Schulz
(cherry picked from commit 4aa94a353224c14265446276277a91339f2e415d)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Amend fd5f83e612729cebc5395c992bd98628bb9ea25f
calling fetchMore in create_mapping was a bad idea bacause it may lead
to infinite recurtion
Make a special case for hasChildren instead
Task-number: 250023
Reviewed-by: Marius Bugge Monsen
BT: yes
(cherry picked from commit f8fba0d48a1f30540ddf15f0d36f415b192d1d8b)
|
| |
| |
| |
| | |
(cherry picked from commit 97ff2bde044838be0d5210a86c2fafd23c05d994)
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The data passed to XChangeProperty should be long arrays, as this is
what Xlib expects.
Task-number: 244062
Reviewed-by: Rhys Weatherley
(cherry picked from commit 1ae4c7b989b04f89a5069d5a5db78c0d8914972b)
|
| |
| |
| |
| | |
(cherry picked from commit b01d52de1f942755c59e22d50b84dd37ffc8e3fe)
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QSortFilterProxyModel::hasChildren need to construct the mapping. And when it
tries to construct the mapping, it needs to fetch the childs, so there is none.
Task-number: 250023
Reviewed-by: Marius Bugge Monsen
(cherry picked from commit fd5f83e612729cebc5395c992bd98628bb9ea25f)
|
| |
| |
| |
| | |
(cherry picked from commit 4f66b3c550ca1c90c33952ad8603cc6c1a702280)
|
| |
| |
| |
| | |
(cherry picked from commit c4846a0e62482abb28cdc973fb4823be3e71f4f7)
|
| |
| |
| |
| | |
(cherry picked from commit a1a3dd96aef2b2edd7eb7c563fabee124cdbfe5a)
|
| |
| |
| |
| | |
(cherry picked from commit 0da3eabece2d33e2f8cdf421bbd8e95787c170f7)
|
| |
| |
| |
| | |
(cherry picked from commit 0da501b644c0799d4e5e357b27847cb7a58583e4)
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The eclipse integration is namespaced, but it still pulled in system plugins like the oxygen style through QT_BUILD_KEY_COMPAT check in QLibraryPrivate::isPlugin()
Task: 250185
Reviewed-by: dt <qtc-committer@nokia.com>
BT: yes
(cherry picked from commit cca58cff45ea248ab9c65fd8ce088433af1c0fe0)
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
mode, the settings are stored in
HKEY_LOCAL_MACHINE\Software\WOW6432node.
Task-number: 232011
Reviewed-by: Martin Petersson <martin.petersson@trolltech.com>
(cherry picked from commit bbad83a64373b7e01f6abee98d854380f03aa6b6)
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Clip both against the source and target device rectangles.
Task-number: 247937
Reviewed-by: Trond
BT: yes
(cherry picked from commit 9da65ead69c92df717b1a63fe3c98c0cc73270f9)
|
| |
| |
| |
| | |
(cherry picked from commit 4e9c2364e8e9580aa317e9387338d45207ac4baa)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
same.
updateBoudingRect update the item only if the boundingRect change
but if we have 123 as an initial text and then we set 321 as the new
text, then nothing happen because the rect is the same.
In case the boundingRect change then we call update 2 times but
the item is already dirty so the second call will just return.
BT:yes
Reviewed-by: Andreas
(cherry picked from commit 36b16a126e24cb8d8e5c34cfd807bc7c51ea49cf)
|
| |
| |
| |
| | |
(cherry picked from commit 4cb80de7ade662deb5542f77cd3a36517fa9cd9b)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Mac/Cocoa.
Check if the view is visible before attaching it to a context.
Task-number: related to 250066
Reviewed-by: Norwegian Rock Cat
BT: yes
(cherry picked from commit b646787cf0d67f4df00212f62a83432c641eae95)
|
| |
| |
| |
| |
| | |
It worked in 4.5.0, so it should work in 4.5.1 too.
(cherry picked from commit d7e8586e6ab009a6da1eb63aa6798d7c6a34c30d)
|
| |
| |
| |
| | |
(cherry picked from commit 869c85e2f965a226416f0a142572ff749b30ba9e)
|
|/ |
|
| |
|
|
|
|
|
|
|
|
|
| |
qt_accHotKey() was pretty buggy; it could both crash or spin forever
in some cases.
Task-number: 221731
Reviewed-by: alexis
(cherry picked from commit b33ebce3de3efd98a45c8ca0a349f78aac09c875)
|
|
|
|
|
| |
BT: yes
(cherry picked from commit 61abefeb649fdbc4653bd69415431cabd640e4ce)
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit 8fc0d4ed0d306e131276ce6e4dd236ca42582d9a)
|
|
|
|
|
|
|
|
|
|
| |
Made a mistake when pushing e0706ca2fbce063c263bad9a1eee24f057f170bd
I Corrected this.
Task-number: 250254
Rev-by: Frans Englich
Rev-by: Geir Vattekar
(cherry picked from commit 809b192f245f24e3e17655e4f5f335bee4bcad79)
|
|
|
|
|
|
|
| |
glpixmapfilter should not be compiled for OpenGL ES 2.0 on nay platform
Reviewed-by: Tom Cooksey
(cherry picked from commit 9f6146dd3a7c111923e79c490c9504f39b205f0b)
|
|
|
|
|
|
|
| |
Stated a remark about the need to use well-formed XML as input to the example.
Rev-by: Geir Vattekar
(cherry picked from commit e0706ca2fbce063c263bad9a1eee24f057f170bd)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The NSOpenGLContext seems to be tied to the window. So if the view
changes from one window to another, the OpenGL context needs to be
cleared. We can do this by hooking into the viewWillChangeWindow and
viewDidChangeWindow events and clear and reset the drawable
respectively. We also found out that QCocoaOpenGLView was not being used
at all, so just remove it to get rid of any confusion.
Task-number: 250066
Reviewed-by: Trond
(cherry picked from commit b4234ab3f4dbd8c7017d749888b2d8effd3c5983)
|
|
|
|
|
|
|
|
|
|
|
| |
We did not update initGtkWidgets on theme changes which could
lead to crashes as the contents of the widget hash depend on
certain properties in the style. A simple way to reproduce this would
be to change between the redmond gtk theme and cleanlooks.
Task-number: 251115
Reviewed-by: paul
(cherry picked from commit a55f477b2a40b89e690fe6b61509cf665e96243b)
|
|
|
|
|
|
|
|
|
| |
emit disconnected() if we were in ConnectedState or in ClosingState
before
Reviewed-by: Thiago
Task-number: 250976
(cherry picked from commit 85db19b2eef0f7933fa28e8e5e1d365aab72458a)
|
|
|
|
|
|
|
|
|
| |
The submenu would always appear to the side of the menu instead of its
right.
Task-number: 250673
Reviewed-by: ogoffart
(cherry picked from commit 8f223e03effba1aef6be5e50caf7482af1d7dd8a)
|
|
|
|
|
|
| |
This reverts commit 66fe4167b123c644874216af4f1c1a2fb3c478b2.
Oops, missed the bit in the comment about not fixing for a 4.5 patch
release.
|