| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
This change was performed by a script that was written by the
previous release manager and reviewed by me. Thus
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
| |
We had to revert an earlier fix since it obviously did
not work correctly. However since we do not really need to propagate the
palette on the viewContainer _before_ it is created, we can simply avoid
the issue alltogether as it would happen because we implicitly added
a child widget during the polish of the combo box.
Reviewed-by: nrc
(cherry picked from commit 35c26d696cbff269d551c012a212c09692dd6f6b)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Gah, my original change (f5ef0eb1a6543abdd29e07c23de7fa1128f6d623) had
its heart in the right place, but it seems that it can cause crashes
on closing where we refuse to give up the first responder and we end up
with a dangling pointer. This lets that case happen (when we have no
focus widget and are setting a nil first responder, there's no reason to
stop that, but it refuses to do that when we do have a focus widget.
Hopefully we don't get in a situation where our focus widget gets out of
sync.
Reviewed-by: Prasanth Ullattil
(cherry picked from commit 773c4d326c24f8db12ab58e379bd223ce1126d72)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Symptom: checkboxes didn't get checked if you press, hold for some
seconds and then release the mouse or stylus.
In QAbstractButton we reacted on the contextMenuEvent that gets sent if
the system recognizes the context menu gesture (tap and hold) and did
call setDown(false).
This change has been done because buttons in tool bars stayed in the
down state when displaying the context menu with this gesture.
I've now moved the handling of this to qtoolbar.cpp.
Task-number: 246619
Reviewed-by: thartman
(cherry picked from commit de007bd2a20a141aefe901408512c806879a2387)
|
|
|
|
|
|
|
|
| |
RevBy: Joerg
AutoTest: mediaobject
Details: Since our wave files on Windows CE are very short (memory) we actually land up in the PausedState
when playback is finished
(cherry picked from commit 0ea43e7d28815c133e8029f3d966871a10fef8e0)
|
|
|
|
| |
(cherry picked from commit c5b0197611ebb3279b3426aca275458477edb42d)
|
|
|
|
|
|
|
|
|
|
| |
the Cocoa Builds.
The drag move events were compressed based only on the position of the
cursor. It has to be based on both position and the "drag operation" in
native event.
Reviewed-by: nrc
(cherry picked from commit ca2d62f97f991d042a781d9d7bd0dbda910e1d04)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Mac OS X - cocoa
The filename as NSString that we get from Cocoa does not have
the correct file system encoding. This means that certain characters are
implemented differently than what e.g. QFile::encoded returns. This fix
normalizes the string from cocoa before using it.
Task-number: 249928
Reviewed-by: Trenton Schulz
(cherry picked from commit 179fafcc370c907a6070c7150695d446255e68d1)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In our Cocoa menu we check if we need to send the key event to the
qwidget before the menu has a chance at it, because logically in Qt, the
key event should go to the widget and not the menubar first (a bit
different than what happens on the mac). The way to determine this is to
send a shortcut override event and see if it accepts it. If it does,
that means we should just send it the key event. Previously we were
sending the shortcut override, but not following through on the key
event because we thought (however foolishly). That returning "YES" but
not setting an action would somehow forward the event (it doesn't).
There still seems to be some problems if you have a Dvorak-QWERTY+CWD
layout, but this probably needs to be dealt with at the key mapper
level.
Reviewed-by: Prasanth Ullattil
(cherry picked from commit acff913a6287ad50b0ac782d817d51072ccb479c)
|
|
|
|
|
| |
Someone messed up the whitespace on this comment.
(cherry picked from commit a6ab4f638a63755a601b61141fa7730d5ac6e793)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
append the source dir to the include path, but only after the dirs with
the generated files.
this seems to have worked before only accidentally: the unqualified
default dirs were expanded to the source dir instead of the build dir,
but the build dir is added implicitly by default, so things magically
worked. now that we qualify the moc/ui dirs, projects relying on the
strange side effect suddenly break.
we should probably add the source dir to the include path by default,
but this coupling to uic/moc is closer to the historical behavior and
thus should be safer.
Reviewed-by: mariusSO
(cherry picked from commit 3279b07302fde0eb14f9b197c9ad2e14d512817e)
|
|
|
|
|
| |
Reviewed-by: ogoffart
(cherry picked from commit b9d6ecc1dbe5791fec6fb06de3be06186b485420)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QWidget::childAt() makes some assumptions about its children (they are
all contained in its geometry). This does not hold up when using the
unified toolbar because the toolbar ends up in the "non-client" area.
So, when dispatching an enter/leave event in tooltip show, we end up
dispatching to the wrong widgets and that results in the tooltip
cleverly thinking that it needs to hide itself because we've left the
widget that needs the tooltip. I've special cased this by just having a
"native" mapFromParent() that is only called for on the mac, though
there is nothing that is limiting this from being called on other
platfroms.
Also QWidget::mapFromParent() probably needs to be looked at at some
point.
Task-number: 248048
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 640f2c732c6fd76866cd7e601a9140dbe7849e6f)
|
|
|
|
|
|
|
|
| |
(cherry picked from commit 0d29af709e168096f5b33ff27e3338129678ff09)
Conflicts:
LGPL_EXCEPTION.txt
|
|
|
|
|
|
|
|
| |
Full fix will potentially break other code and is thus avoided
Task-number: 248992
Reviewed-by: Trond
(cherry picked from commit e0560bcaa3703fafccc21dd709731341a123a0e4)
|
|
|
|
|
|
|
| |
Reviewed-by: joerg
QTest::newRow only accepts char* and without Qt3Support there is no implicit cast available.
(cherry picked from commit b8dcae1572651774085024ddf4cb02e4a954bcd7)
|
|
|
|
|
|
|
| |
Reviewed-by: thartman
function declaration was missing arguments as done in the other testcases in 831d2742b7c41924f052acd81620e8bfc58afde7
(cherry picked from commit e517ecc9025b68179c67a383791eefbedfee0543)
|
|
|
|
|
| |
Reviewed-by: joerg
(cherry picked from commit a93551a2e3e590400b09bc076d3a6883c162b75d)
|
|
|
|
| |
(cherry picked from commit 6393b9fa8474b7b9e86319f54477cba9bec65d11)
|
|
|
|
|
|
|
|
|
|
|
|
| |
The old code did not split up the frame from the central
parts of the itemview selection box correctly. We now
draw the edges as border images instead. Previously this
would lead to somewhat ugly scaling artifacts for small
header sections.
Task: 248839
Reviewed-by: ogoffart
(cherry picked from commit 041a8ecdb5f11dfc499f8f8f77d85cb63508c093)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It seems that Cocoa is much more strict about coalesced updates than
Carbon ever was. The upshot of this is that some examples that "worked"
after a fashion in Carbon, do not exhibit good frame rates with Cocoa.
The reason why is that apparently Cocoa will decide to flush to the
screen every time a timer fires. If you have a lot of timers that are
all dependent on doing on update to the screen, you will get undesirable
effects.
Thankfully, it is possible to adjust the examples to follow best
practices and get a good result. So, we now only do the animation once
using QGraphicsScene::advance(). We are also able to make the mice less
heavy (no QObject subclass). I've updated the docs and someone on the
doc team has kindly volunteered to go through them.
Reviewed-by: Andreas
(cherry picked from commit 1bb9d8fcd59a91751c8d91e2885e2b05eff4d1bb)
|
|
|
|
|
|
|
|
|
|
| |
The previous change 6c2dd295b2ca2f9125fe072d035a3784ce748718 to remove
usage of NaN in SVG gradients was incomplete. This commit should fix
that.
Task-number: 250146
Reviewed-by: Samuel
(cherry picked from commit 003223dcfc1fa884b82085db19d4c4056bf6eaa0)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Using branch origin/qtwebkit-4.5 (f72c14123c593dc9d649d25b7186334bba0026b5)
Changes in WebKit since the last update:
++ b/WebCore/ChangeLog
2009-04-06 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed by Simon Hausmann.
[Qt] Don't show and hide the platformPluginWidget, as it's our QWebView
* plugins/mac/PluginViewMac.cpp:
(WebCore::PluginView::show):
(WebCore::PluginView::hide):
(WebCore::PluginView::setParentVisible):
2009-04-06 Mike Belshe <mike@belshe.com>
Reviewed by Eric Seidel.
HTMLCanvasElement crash when ImageBuffer creation fails.
https://bugs.webkit.org/show_bug.cgi?id=23212
Check for NULL before using the ImageBuffer as we might
be low on memory and creation may have failed.
Test case creation blocked by:
https://bugs.webkit.org/show_bug.cgi?id=25055
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::createImageBuffer):
2009-04-05 Erik L. Bunce <elbunce@xendom.com>
Reviewed by Simon Hausmann.
https://bugs.webkit.org/show_bug.cgi?id=25050
Fix an assert failure when dropping an 'empty' text/uri-list on a QWebView.
* platform/qt/DragDataQt.cpp:
(WebCore::DragData::asURL):
++ b/WebKitTools/ChangeLog
2009-03-31 Adam Roben <aroben@apple.com>
Make resolve-ChangeLogs -f work when the working tree has spaces in
its path
Reviewed by Mark Rowe and David Kilzer.
* Scripts/resolve-ChangeLogs:
(sub fixMergedChangeLogs): Quote the path to resolve-ChangeLogs in
case it contains spaces.
2009-03-17 David Kilzer <ddkilzer@apple.com>
resolve-ChangeLogs should not die on unmerged non-ChangeLog files
Reviewed by Adam Roben.
Fixes the following bug in resolve-ChangeLogs:
Use of uninitialized value in -e at ./WebKitTools/Scripts/resolve-ChangeLogs line 132.
Died at ./WebKitTools/Scripts/resolve-ChangeLogs line 164.
* Scripts/resolve-ChangeLogs:
(findUnmergedChangeLogs): Check the result of findChangeLog() to
make sure we don't add undef values to the list of files being
returned.
2009-03-11 David Kilzer <ddkilzer@apple.com>
Bug 24378: resolve-ChangeLogs should use git status or svn status to find and fix unmerged ChangeLogs
<https://bugs.webkit.org/show_bug.cgi?id=24378>
Reviewed by Adam Roben.
* Scripts/resolve-ChangeLogs: If -f|--fix-merged is not passed
and no file or directory names are specified on the command-line
then try to find unmerged ChangeLog files based on 'svn stat' or
'git diff'. Added global $isGit and $isSVN variables so that
isGit() and isSVN() only have to be called once.
(findUnmergedChangeLogs): Added.
(cherry picked from commit 1d3706f2b66ba5fbb586e532fc29852f55d81c86)
|
|
|
|
|
| |
Reviewed-by: jbache
(cherry picked from commit 6ce4a3b66e2b31f80d1a2d09a4c4087f88a7a9e8)
|
|
|
|
|
|
|
|
|
|
| |
There was a regression in the background color for QComboBox popups.
This should resolve it. It essentially tells the system to stay off
the system palette while QGtkStyle is used. We will introduce
a cleaner style hint for this in 4.6.
Reviewed-by: nrc
(cherry picked from commit f06c4f2d7378b40a0a184393a8986032d5a700ee)
|
|
|
|
|
|
|
|
| |
QFileSystemModel::filter().
Task-number: 250285
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
(cherry picked from commit cf65dea821a2ba796bb1f32c80de6b9db224dff5)
|
|
|
|
|
|
|
|
| |
mkdist doesn't case-insensitive comparison.
Reviewed-by: TrustMe
BT: yes
(cherry picked from commit 5bb504a78cad5e38cd522785a37898f4e88cd272)
|
|
|
|
|
|
|
|
|
| |
Otherwise, for people who install Qt (everyone outside Nokia), the
animation file isn't present.
Reviewed-by: Trust Me
BT: yes
(cherry picked from commit 73f5131793d52d93b18a40d36599e063f18246e9)
|
|
|
|
|
| |
Reviewed-by: jasplin
(cherry picked from commit 1a125061f201bb7ee746f1eddc0604cd85a6545c)
|
|
|
|
|
|
|
|
| |
desktop environment.
Task-number: 250338
Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
(cherry picked from commit 38b5bff2fab59e965aba59b4f121a7c8945e4d75)
|
|
|
|
|
|
|
|
| |
Use qmake -query QT_INSTALL_HEADERS at test startup time instead of
relying on the dead QTDIR environment variable.
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
(cherry picked from commit d071b3528f51aaded18029f2f22e8db03e47a2a6)
|
|
|
|
|
|
|
| |
Remove unused QTDIR tests.
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
(cherry picked from commit 10ba12c7b73b89761a43a450c2932c8a56bf64db)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We have to pass the correct include paths when testing the multiple
inheritance warning, because we want moc to find the QtGui and QObject
headers.
In addition we have to adjust the line numbers and include QObject in
the qobject test to avoid a warning about the unknown QObject
superclass.
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
(cherry picked from commit 73cffd26dcfbfee48caf86329d636361d02e5c03)
|
|
|
|
|
|
|
|
|
| |
We changed the logic for determining sheets, but it seems we forgot to
take the parentWidget() into account. It's required for WindowModality
to make any sense.
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 1e32cdefa382b16eaffc663594ccab1dbe1faebb)
|
|
|
|
|
|
|
|
|
|
| |
The default scheduling policy on Linux doesn't allow specifying thread
priorities, so the priority passed to start() and setPriority() has no
effect. Document this.
Task number: 249997
Reviewed-by: Kavindra Devi Palaraja <kavindra.palaraja@nokia.com>
(cherry picked from commit 638b61dec0d335b12d48fe561b19a0f0f6ef83a3)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It seems that GetThemeTextColor is not available at all for 64-bit
versions of the operating system and there is no good equivalent.
We were using a technique where we would create a small pixmap and then
use HIThemeSetTextFillColor() with the proper enum. However, this
function will silently set a black color if it doesn't know about the
enum. So, we get black when we really shouldn't. It also seems to
produce colors that are a bit different from the Carbon function. So, in
the meantime, just hard code the values in. It might break if you are
hacking the resources in Mac OS X, but we'll have to live with that
until we get a real function.
Task-number: 248918
Reviewed-by: Prasanth Ullattil
(cherry picked from commit c350892f55a1d8633be54f09e6e4596f4687bc89)
|
|
|
|
|
|
|
| |
processed.
Reviewed-by: TrustMe
(cherry picked from commit 020ced4994bace0ed7f494bec8905afa959f76ed)
|
|
|
|
|
| |
Reviewed-by: TrustMe
BT: yes
|
|
|
|
|
|
|
| |
Add some frames-per-second output for debugging when QT_DIRECTFB_TIMING
is defined.
Reviewed-by: Donald <qt-info@nokia.com>
|
|
|
|
|
|
| |
We don't need to chain to the base class anymore.
Reviewed-by: Donald <qt-info@nokia.com>
|
|
|
|
|
|
|
| |
Even though these variables couldn't really be used uninitialized GCC
4.3.2 thinks it could. This is nicer, more readable and faster anyway.
Reviewed-by: Donald <qt-info@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Well actually this change is a bit bigger than just that.
*We no longer override the palette you provide in polish so it should
be a bit more frienly toward custom application changes.
* Another issue was that we would generate the palette information
when we got the style callback from gtkButton but then the line edits might not yet have been
polished. Hence we now return from the callback and instead post the
update for later.
* We had to modify the PE_Frame entry to draw a raised menu when the
custom combo box delegate was used.
* We now simply ignore custom
qtconfig palette entries when using GtkStyle since they only cause
trouble with it.
Task-number: 250142
Reviewed-by: nrc
|
|
|
|
|
|
|
|
|
| |
If we get an hover event while the model gets invalidated, we might ends
up calling itemDecorationAt before the viewitem is refreshed.
Can be reproduced in KTorrent (Relates to KDE bug 172198) or Kopete trunk
Reviewed-by: Thierry
|
|
|
|
|
|
|
|
| |
This fixes KRunner on XMonad. The Qt::Dialog flag of the krunner dialog
was lost when the Qt::WA_TranslucentBackground was set, leading to
incorrect behaviour in some window manager (such as xmonad)
Reviewed-by: Samuel
|
|
|
|
|
|
|
|
|
|
|
|
| |
The main problem is that enterDirectory received a QModelIndex that can
be a proxy index and not a source index if there is a proxy set on the
QFileDialog. This fix basically discover some other crashes in the
completer. The problem was that we didn't apply the proxy to the
completer too. So we basically messed up source and proxy indexes.
Both have a proxy set now and convert the model indexes if needed.
Task-number:250194
Reviewed-by:jasplin
|
|
|
|
|
|
|
|
|
| |
The OpenGL ES config tests are there to test if there's enough to build
QtOpenGL, not OpenGL applications using Qt. Therefore we should use
QMAKE_LIBS_OPENGL_QT rather than QMAKE_LIBS_OPENGL. This is mostely
because Qt needs to link against EGL whereas Qt applications do not.
Reviewed-by: TrustMe
|
|
|
|
|
|
|
|
|
| |
Previously, it was entirely possible to successfully configure Qt/X11
without any X11 installed. The problems would only start showing up once
you stated building. This is not very useful if you're cross-compiling
and trying to setup the paths correctly.
Reviewed-by: Denis
|
|
|
|
| |
Reviewed-by: Kim
|
|
|
|
|
|
|
|
|
|
|
|
| |
types.
C++ is nice, but we don't have to use confusing syntax when plain old
C works (and is correct). This apparently fixes a compilation error on
MSVC 6, that doesn't like the constructor-like initialisation for POD
types.
Reviewed-by: Trust Me
BT: yes
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since there is no way to find out if gradient stops have been added to a
gradient, a gradient stop at NaN was earlier used in the SVG module to
mark the gradient as empty. This could cause floating point exceptions.
The usage of NaN has now been replaced by a boolean in
QSvgGradientStyle.
Duplicate entry "qxmlpatterns" was removed from auto.pro in the auto
test directory.
Task-number: 250146
Reviewed-by: Samuel
|