| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Task-number: QTBUG-4685
Reviewed-by: TrustMe
(cherry picked from commit bd01114b3fcf2cc702fdd9e303a15bcc900cfe95)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In preparation for future removal of Webkit from Qt, Qt.sis no longer
contains QtWebkit.dll. All projects that have webkit dependency now
automatically also add dependency qtwebkit.sis into their .pkg files.
To create qtwebkit.sis, run "make sis" in src\3rdparty\webkit\WebCore
directory.
Task-number: QTBUG-6841
Reviewed-by: Simon Hausmann
Reviewed-by: Janne Koskinen
(cherry picked from commit 337931b28cb1157512ae2b6ab67ceaaf63bf1e48)
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
| |
The sliding surface does not move, the position of the children
must be used to find the correct layout.
|
|
|
|
|
|
|
|
| |
Some minor changes to improve the demo:
-use QUrl::fromUserInput()
-scroll a surface instead of moving the widgets
to minimize the repaint
-use the animation framework instead of QTimeLine
|
|\
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
WeatherInfo now shows Oslo info upon launch instead of blank screen
Fixed QCoeFepInputContext::widgetDestroyed
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-6367
Reviewed-by: Janne Anttila
|
|/
|
|
|
|
|
|
| |
The chip demo causes a memory exception on most Windows CE devices.
For now we simply will not include this demo in the package for Windows
CE. In the future a specialized version might be created.
Reviewed-by: Maurice
|
|
|
|
|
|
|
|
| |
Patch done jointly by me and Jan-arve.
Task-number: QTBUG-4725
Reviewed-by: Jan-Arve Sæther
Reviewed-by: Frans Englich
|
|\ |
|
| |\
| | |
| | |
| | | |
4.6-staging2
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: TrustMe
|
|\ \ \ \
| | |_|/
| |/| |
| | | |
| | | | |
Conflicts:
demos/qmediaplayer/mediaplayer.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Requested by Nokia Dallas/Helix team. Patch supplied by Fu Liz
EXT-DextraTech/Dallas, minor changes by me.
Task-number: QTBUG-4882
Reviewed-by: Gareth Stockwell
|
| | |/
| |/|
| | |
| | |
| | |
| | | |
From discussions with Helix team.
Reviewed-by: Gareth Stockwell
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
ICON keyword can be used without UID, since .mif filename
is generated based on target instead of UID3 nowadays
Task-number: QTBUG-4677
Reviewed-by: Miikka Heikkinen
|
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
This commit basically reverts fa35247d31bd35d72c307f4a6a231400aade0c0.
It can be reverted now since mifconv invoking is changed to use
relative paths instead of absolute one.
Task-number: QTBUG-4745
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Over src/ tools/ examples/ and demos/
|
| |\
| | |
| | |
| | | |
4.6-staging2
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Browser demo isn't currently compiling for Symbian GCCE builds
because ARMV5 built static uitools.lib apparently isn't compatible with
linking into GCCE application. Removed the browser from Symbian builds
as a hotfix for 4.6.0.
Task-number: QTBUG-5692
Reviewed-by: Janne Anttila
|
| |\ \
| | |/
| |/| |
|
| | |\ |
|
| | |\ \ |
|
| | |\ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
browser use it.
- Handle windows files names by looking for paths first (and don't check
that it exists first)
- Handle host names without dots (it was not handled because of
difficulties with the case host:port)
- Return the parsed url only if the host or the path is not empty
instead of returning a url that looks like "http:"
Reviewed-by: Thiago Macieira
|
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
It has too many problems at the moment, like taking up too much space
and not being able to close the popup window.
RevBy: Alessandro Portale
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | | |
4.6-staging2
|
| | |_|_|/
| |/| | |
| | | | |
| | | | | |
This fixes a valgrind warning.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
These shortcuts are used for pausing video playback while in
full-screen mode, and for exiting full-screen mode.
They are for non-QWERTY mobile devices, which lack keys mapping to
the previously existing shortcut keycodes.
Reviewed-by: Frans Englich
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-5586
Reviewed-by: Frans Englich
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This modifies the patch which introduced "exit full screen when end
of playback is reached": f9d36789
Reviewed-by: Frans Englich
|
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
qmediaplayer when popping up dialogs shouldn't:
* play when it's paused
* pause when playing only audio
Task-number: QTBUG-5851
Reviewed-by: Gareth Stockwell
|
|\ \ \ \
| |/ / / |
|
| |\ \ \
| | |_|/
| |/| | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The sub-attaq's animation manager was accessing a deleted animation.
Task-number: QTBUG-5646
Reviewed-by: thierry
|
| | |/
| | |
| | |
| | |
| | | |
Task-number: QTBUG-5526
Reviewed-by: thierry
|
| |/
| |
| |
| | |
Reviewed-by: Trust Me
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QPaintDevice and QImage used the functions numColors(), setNumColors(),
and numBytes(). However, this is not consistent with the rest of the Qt
API which uses *Count() and set*Count().
Removed all usage of these functions inside Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
|\ \ \
| |/ / |
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
dist/changes-4.6.0
|
| | |\ \
| | | |/
| | |/| |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Sarah Smith
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QAbstractAnimation:
currentTime returns the "complete" current time
currentLoopTime() returns the time inside the current loop
add setPaused(bool) for consistency with QTimeLine
stateChanged: newState passed as first paramater (before oldState)
for consistency with the reset of Qt
QAnimationGroup:
rename clearAnimations to clear
rename insertAnimationAt to insertAnimation
rename takeAnimationAt to takeAnimation
QSequentialAnimationGroup:
rename insertPauseAt to insertPause
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Only done for small screens. Patch simplified by Gareth.
Task-number: QTBUG-5307
Reviewed-by: Gareth Stockwell
|
| |/
|/|
| |
| |
| |
| |
| |
| | |
This change improves the user experience - previously, video playback
would continue in the background, while the user read the dialog.
Then, when the dialog was dismissed, video playback would pause.
Reviewed-by: Frans Englich
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-by: Sarah Smith
|
|\ \
| |/ |
|