| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
| |
Task-number: QTBUG-5972
|
|
|
|
|
|
| |
This partially reverts commit 1176ecf0b533279e5a1c97f183e5c5f1c57fb188.
Task-number: QTBUG-5972
|
|
|
|
|
|
|
|
|
| |
The select() system call was used in the wrong way.
We need to select for exceptions too.
Task-number: QTBUG-5799
Reviewed-by: Aleksandar Sasha Babic <aleksandar.babic@nokia.com>
Reviewed-by: Peter Hartmann
|
|
|
|
|
|
|
|
|
|
| |
It wasn't generating any message, but it did think it was an
evaluation install. So all Qt console applications produced an extra
newline and the GUI ones showed the Qt logo briefly.
I noticed because of the extra newline when building Qt itself.
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-By: Jocelyn Turcotte
|
|
|
|
|
|
| |
You have to link to Glib if you're using it...
Reviewed-by: Peter Hartmann
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Qt 4.6 reports smaller sizes for all fonts which means a lot of
the size adjustments QGtkStyle does were now off. I have adjusted
most of them including some fixes to menu items themselves.
Note that the changes were introduced with this change:
04d18b38c38c5ff623b30366ea08d56128b9b7d0
We now also adapt to GNOME 2.16 style submenu arrow sizes.
Combo boxes, line edits, spin boxes and push buttons should
finally have a uniform height.
Task-number: QTBUG-5753
Reviewed-by: thorbjorn
|
| |
| |
| |
| |
| |
| |
| | |
This is a workaround for a bug that we introduced with the QGtkStyle refactoring
to properly support Maemo5.
RevBy: jbache
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
configure.exe
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When filling in touch point data for delivering to widget don't use the setter
methods to avoid unnecessary detaches. Making it not detach also allows not to
re-calculate widget-relative start position and last position on each delivery
step.
Also use the QWeakPointer to store a pointer to a widget that expects to
receive a touch event, so that if the widget is destroyed we'll get notified.
Reviewed-by: Bradley T. Hughes
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
( 7bdf90f753d25fb1b5628b0980827df11110ad5a )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2009-11-18 Paul Olav Tvete <paul.tvete@nokia.com>
Reviewed by Simon Hausmann.
[Qt] Make the QWebElement::render() test pass when pixmaps aren't 32 bit.
* tests/qwebelement/tst_qwebelement.cpp:
(tst_QWebElement::render):
2009-11-18 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Tor Arne Vestbø.
Clarify and simplify the legal section in the overview documentation,
after review with our legal team.
* docs/qtwebkit.qdoc:
2009-11-18 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed and suggested by Tor Arne Vestbø.
Fix the autotest after commit ecbb2c0dd21bfc197e1f7b53150ec9b1a1d8cb8f
to compare the Qt::ImFont property's family against an explicitly
previously configured family.
* tests/qwebpage/tst_qwebpage.cpp:
(tst_QWebPage::inputMethods):
|
|\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
configure.exe
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
As discussed with the legal team:
* Removed the confusing sentence about the LGPL version.
* Replaced the use of "Lesser" with "Library"
* Use the same notice for QtWebKit and QtScript
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
| |\ \ |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This value seems to cause problems on various chipsets and we get a
double buffered window regardless.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
(cherry picked from commit 3bc9a381ebfaf9144120936bb579b71fc7cf29ae)
|
| | |\ \ |
|
| | | |\ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
In commit f44fe888ee82b9e04, we adjusted the item size to the size of the
viewport. It should really be adjusted to the size of the content.
Task-number: QTBUG-5854
Reviewed-by: Gabi
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The problem was that the scene was not notified it lost the focus
when it was disconnected from the view (with setScene)
So when it got back the focus, nothing was updated because the
scene thought it still had the focus.
Reviewed-by: jasplin
|
| | | | |\ \
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-staging2
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Removing some unreferenced variables that were left overs after
revert&merge operation.
Reviewed-by: Kim Motoyoshi Kalland
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: prasanth
|
| | | | |/ /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We always queried the client for its GLX extensions and used them
blindly, even though they might not be available in the server.
Also fixed the extension string check itself. We used simple sub-string
search, which could potentially break if one extension name is a
sub-string of another.
Task-number: QTBUG-5732
Reviewed-by: Kim
|
| | | | |\ \
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-staging2
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Signed-off-by: axis <qt-info@nokia.com>
|
| | | | |/ /
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-4480
Reviewed-by: Thierry
|
| | | | |\ \
| | | | | | |
| | | | | | |
| | | | | | | |
4.6-staging2
|
| | | | | |\ \ |
|
| | | | | |\ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
- Replaced VolumeObserver and VideoOutputObserver interfaces with
signals.
- Added signals for propagating changes in aspect ratio and scale mode
from VideoOutput to VideoPlayer.
- Removed VideoPlayer::getNativeWindowSystemHandles. Interaction with
window system is moved into VideoOutput, so that VideoPlayer is better
focussed on its main task: interacting with CVideoPlayerUtility.
- WId changes, resize and move events received by the VideoOutput
widget cause it to emit a videoWindowChanged signal. This is received
by the VideoPlayer, which triggers a call to updateVideoRect. The
main task of this function is to calculate the scale factors which are
provided to the MMF via CVideoPlayerUtility::SetScaleFactorL. Note
that:
i) This function must be called both before and after the call
to SetDisplayWindowL. For changes in aspect ratio or scale
mode, setting the scale mode after updating the display window
is sufficient. However, testing showed that, when switching in
or out of full-screen mode, two calls were necessary in order
to preserve the correct aspect ratio.
ii) The screen rectangle passed to the MMF is still the full
window extent; it is not the region in which video will
actually be rendered. The post-processor will fill in the
remainder of the window with a background colour (typically
black). If, on the other hand, we passed in the actual video
display rectangle, we would need to do this background painting
in the widget. This in turn would require a change to QtGui:
at present, we can only disable blitting on a per-widget basis
(by setting QWExtra::disableBlit). If we needed to paint the
borders of the video window, disableBlit would need to contain
the actual DSA region, rather than just a single boolean flag.
Task-number: QTBUG-5585
Reviewed-by: Frans Englich
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
When qmediaplayer receives a stateChanged(ErrorState) signal, it first
displays a dialog, and then calls pause() on the media object. This
change allows that pause command to be executed on the underlying MMF
client API.
Reviewed-by: Frans Englich
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Frans Englich
|
| | | | | |\ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
mmfphonon
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
The debug{} directive in src/plugins/phonon/mmf/plugin/plugin.pro does not have
any effect - this can be seen by looking at the generated MMP file, which has a
STATICLIBRARY directive which is applied in both UDEB and UREL builds. This is
the general problem that .pro files cannot tell distinction between the
different targets that one makespec covers.
Also remove objectdumpstub; objectdump was originally prepared for QtGui
inclusion, but since that never happened, no other platforms than Symbian needs
to be covered.
Task-number: QTBUG-5466
Reviewed-by: Gareth Stockwell
|
| | | | | |/ / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: trustme
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This statement calls a function (RWindowBase::ClientHandle) which was
introduced in S60 3.2. Although there is a runtime check, a build
made against 3.2 or above will fail on a 3.1 device. This manifests
itself by the plugin failing to load.
The log statement is not really necessary anyway, because, for
window-owning controls, the window handle is the same value as the
CCoeControl* pointer. This means that logging
RWindowBase::ClientHandle is redundant information.
Task-number: QTBUG-5406
Reviewed-by: trustme
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This reverts commit 4c999f26a2cd255238d3543d2c4fdd3e51e70769.
Generated file should not have our copyright (specially if it comes
from customers)
Reviewed-by: Marius Storm-Olsen
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
When setting the contents frame layout, the overlapping amount used was the
one from the base style because we were checking the wrong widget. We now
ensure that it's the QTabWidget we are checking for the pane pseudo-element
subrule.
Reviewed-by: Olivier
Task-number: QTBUG-2555
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This fixes a regression from 4.5, where exporting a GL capable display
from an old X11 HP/Sun workstation to a modern Linux machine causes
crashes and lots of X11 error output. Just relying on the client
GL version number is not enough under X11, since the server might
only support GL 1.1 with non or very few extensions.
Also, the extension checks worked a bit randomly since it checked
for sub-strings which might or might not occur within one or more
full extension names.
Task-number: QTBUG-5853
Reviewed-by: Kim
|
| | | | |\ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
The test I wrote was not testing if calling undo/redo had any effect
on emitting undoCommandAdded(), added these test cases and fixed the
QTextDocumentPrivate::endEditBlock so we now again emit only when an
undo command is added, not also on calling undo or redo.
Reviewed-by: mae
Reviewed-by: Samuel Rødal
|
| | | | | | |_|/ /
| | | | | |/| | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QTBUG-5840
Reviewed-by: Kim
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This is a behavior change from Qt 4.5. The motivation for the change
is the following use case: A user types into a line or text edit, and
gets interrupted by for example phone call or an SMS. This causes the
active application to lose focus, which again causes edit focus to be
lost. When resuming the application the focus gets set back, but the
edit focus does not (nor should it). However, when the user types the
next character, the line edit will erase *all* contents of the widget
because it did not have edit focus. This is extremely destructive for
a mobile phone user, especially since undo is not easily available.
Another reason for doing that fix is that it seems that this is the
mode of operation that most existing phones use.
The fix is enabled for Symbian only at the moment, but will be
followed by a patch for all platforms which will go into 4.7.
Task: QTBUG-5698
RevBy: Jason Barron
|
| | | | | |\ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.6-staging2
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
It makes no sense to use the S60-theme based palette in web based
widgets. Web pages do not generally show theme background, but their
own (or by default white) which clashes badly with WindowText and Text
that are set to work with theme background. Therefore, QWebView and
QGraphicsWebView need to be set their own palette for texts in
theme palette hash. This improves visibility of text in webkit
when QS60Style is active.
Task-number: QTBUG-4885
Reviewed-by: Janne Koskinen
|