| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
The code was changed and changed the behaviour. This is
basically a kind of revert.
Reviewed-By: gabi
Task-Number: QTBUG-10735
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix platform regression: Support QFont::setStretch() on Cocoa
Fix a memory leak from QItemSelectionModel when changing the model
Small hack to allow forcing off font smoothing on Mac OS X
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QFont::setStretch() would previously have no effect on Mac OS X/Cocoa.
Task-number: QTBUG-10585
Reviewed-by: Eskil
Done-by: Andy
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
removed test file, part of mediaservice removal.
Rebuild configure.exe
Rebuild configure following the removal of media services.
More mediaservices removal work.
Removed mediaservices.
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by:Justin McPherson
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Rebuild configure.exe
Rebuild configure following the removal of media services.
More mediaservices removal work.
Removed mediaservices.
|
| | | | | |
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
configure.exe
src/imports/multimedia/qdeclarativeaudio.cpp
src/imports/multimedia/qdeclarativeaudio_p.h
src/multimedia/mediaservices/mediaservices.pro
src/plugins/mediaservices/mediaservices.pro
src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h
src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h
src/s60installs/s60installs.pro
src/src.pro
|
| | | | | | |
|
| | | | | | |
|
| | | | | | |
|
| |\ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (74 commits)
Fixed tst_compilerwarnings test failure due to icecc node failures.
QNAM HTTP: Remove dead code
Doc: fix typo
QCompleter: fix misuse of QMap that can lead to crashes
qmake: added possibility to specify the type of an install target
re-add overriding of tool paths to configure
fix regexp
Support linked fonts (.ltt) from standard font locations.
fix path separators in install targets for MinGW+sh
fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
define qtPrepareTool() function and use it throughout
QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike
QNAM HTTP: And one more testcase
QNetworkAccessManager: Backends were tried in wrong order
Fix QUrl::isValid if the host contains invalid caracter.
Fix anomaly demo control strip icon placement
QUrl: parsing of host name with an undercore.
Fixed race condition compiling xmlpatterns tests.
Remove qdbusserver from tests/auto/dbus.pro
QNAM HTTP: Preemptive anti crash if() statement
...
|
| | |\ \ \ \ |
|