| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/declarative/samegame/SamegameCore/samegame.js
mkspecs/features/symbian/default_post.prf
src/declarative/qml/qdeclarativeengine.cpp
src/gui/text/qtextdocumentlayout.cpp
src/plugins/plugins.pro
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/s60installs.pro
tests/auto/declarative/declarative.pro
tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
tests/auto/declarative/qmlvisual/qmlvisual.pro
|
| |
| |
| |
| | |
RevBy: Trust me
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The Phonon API does not provide any way for the client to specify
which network connection should be used for streaming playback.
If the application already has a connection open, using a bearer
other than the default (e.g. using WiFi when the device default is
GPRS), it may be desirable to use it for streaming, rather than
allowing the Phonon backend to open a second connection on the
default bearer.
This patch adds a custom property on the Phonon::MediaObject,
called InternetAccessPointName. The client can specify the IAP
which Phonon should use by setting this property.
Note that support for this property is only provided in the Phonon
MMF backend.
Task-number: QTBUG-11436
Reviewed-by: Gareth Stockwell
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Phonon MMF backend: removed redundant trace output
qmediaplayer: added command-line switch for initial volume
|
| | |
| | |
| | |
| | |
| | |
| | | |
Initial volume can be set using the following switch:
-volume <level>
where 0.0 <= level <= 1.0
|
|\ \ \
| |/ / |
|
| |/ |
|
|/
|
|
|
|
|
|
|
|
| |
Complement previous commit by aligning Qt itself to use .files
consistently for DEPLOYMENT as well as INSTALLS.
This excludes changes to webkit.
Task-number: QTBUG-3216
Reviewed-by: axis
|
|
|
|
|
|
|
|
|
|
|
| |
During progressive download, it is not possible for the Symbian MMF Phonon
backend to determine the buffering status, so it returns a value of 0%.
This change causes qmediaplayer to display this value in the UI, thereby
giving a visible notification of buffering during progressive download.
Task-number: QTBUG-10769
Reviewed-by: Derick Hawcroft
|
|
|
|
|
| |
`sources.path += qmediaplayer.pro'
where `sources.files += qmediaplayer.pro' was intended.
|
|
|
|
| |
Complements previous commit.
|
|
|
|
|
|
| |
This demo still needs work on Symbian, related is QTBUG-10095.
Reviewed-by: Jason Barron
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits)
Reverted two commits that were pushed to the wrong branch.
Use the new QTextCodec api in the QXmlStreamWriter.
Added new functions to QTextCodec that accept ConversionFlags.
Fix passing of arguments to syncqt
doc: Fixed typos.
Fixes: Fix spinbox with NoButton style in QGtkStyle
doc: Explained parameter value defaults where appropriate.
Cocoa: Fix painting errors on QGLWidget resizing.
Fix broken QGLWidget::renderPixmap on Mac/Carbon
Fixes: Setting any style sheet breaks checkbox positioning
Fixes: MenuItem size fixes and missing separator with Gtk+
Autotest: add a test for QNAM's HTTP cache handling code
QNAM HTTP: just use the expirationDate in the code that validates the cache
QNAM HTTP: change the caching semantics to match documentation
QNAM HTTP: fix the caching algorithm from RFC 2616
Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner
improve readability a bit more
fix styling; improve readability
make it possible to retrieve name of the user who owns the file
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d )
...
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-4685
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|/
|
|
|
|
|
|
| |
This ensures that Phonon::MediaObject::setNextSource is called before
the first clip finishes playback, and therefore that the next clip
is played once the first finishes.
Reviewed-by: Frans Englich
|
|
|
|
|
|
|
|
| |
Patch done jointly by me and Jan-arve.
Task-number: QTBUG-4725
Reviewed-by: Jan-Arve Sæther
Reviewed-by: Frans Englich
|
|\
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Over src/ tools/ examples/ and demos/
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
| |
This covers cases where the backend knows about video capability in a
state other than the LoadingState. Patch by Adookkattil Saleem, slightly
modified.
Reviewed-by: Gareth Stockwell
|
|
|
|
|
|
|
|
|
|
| |
This means that when the backend's knowledge about the content's video
capability changes outside the LoadingState, it still work. This
apparently matters for the Helix backend. Patch supplied by Adookkattil
Saleem (Nokia-D/Dallas).
Reviewed-by: Gareth Stockwell
Reviewed-by: Frans Englich
|
|
|
|
|
|
|
| |
Tested on Symbian and Windows(DS9).
Task-number: QTBUG-4869
Reviewed-by: Gareth Stockwell
|
|
Symbian already has the executables musicplayer.exe, mediaplayer.exe and
ftp.exe, with the result that we overwrite them with Qt. We solve this
by renaming the examples, and do it not only on Symbian, such that Qt
remains consistent across platforms.
This was previously partly done for mediaplayer. The folder name needs
to be consistent with the executable, for qtdemo to work. Done jointly
with Alessandro.
Task-number: QTBUG-4743
Reviewed-by: Alessandro Portale
Reviewed-by: Frans Englich
|