| 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
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (69 commits)
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
QNAM HTTP: More testcases
Fixing compiling issues.
Remove garbage test.
OpenVG blending modes from VG_KHR_advanced_blending extension
Fix spurious mouse click when dismissing a native menu
...
|
| |\ \ \
| | |/ /
| |/| /
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Divided the UI into two tabs:
- One which lists all formats supported by the device, in a table.
This table is populated dynamically when the user presses a button,
rather than at application startup - for some backends such as ALSA,
isFormatSupported() is a time-consuming operation.
- One which allows the user to specify a particular format, and then
test whether it is supported. If the format is not supported, the
nearest supported format is displayed.
Changing mode causes test result to be cleared.
Call showFullScreen() on small-screen devices.
Reviewed-by: Kurt Korbatits
|
|/ / |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Focus should be applied to focus scopes all the way up the chain, not
Add focus docs snippets
Fix doc for status, add Image::onLoaded.
Don't crash due to recursive positioning.
ListModel::get() shouldn't print warnings for invalid indices since it
Add \brief to TextInput
Add missing .pro
Restructure the examples. They are now organized into various
graphicsWidgets doc example was previously removed
Doc fix
Add a "priority" property to Keys and KeyNavigation
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
subdirectories to make it easier to locate examples for certain
features (e.g. animation) and to distinguish between different types
of examples (e.g. very basic examples vs complex demo-like examples).
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert "More improvements to pixmap cache key generation"
More improvements to pixmap cache key generation
More 4.7 stuff.
Fix for autotest failure in qwidget::saveRestoreGeometry()
Optimized pixmapcache key generation for icons and styles
doc: Another upgrade of the top page and overviews.
Mac: restoreGeometry()
[Regression] Build failure on Mac Carbon
doc: Added some \briefs to how-to docs.
Some 4.7 changes.
Updated changelog.
Cherry pick fix for MOBILITY-932 from Qt Mobility.
Cherry pick fix for MOBILITY-962 from Qt Mobility.
Cherry pick fix for MOBILITY-828 from Qt Mobility.
Bearer management changes from Qt Mobility.
Cherry pick fix for MOBILITY-828 from Qt Mobility.
Added snippet labels to QML Dial example.
Fixed documentation typo.
|
| |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
More improvements to pixmap cache key generation
More 4.7 stuff.
Fix for autotest failure in qwidget::saveRestoreGeometry()
Optimized pixmapcache key generation for icons and styles
doc: Another upgrade of the top page and overviews.
Mac: restoreGeometry()
[Regression] Build failure on Mac Carbon
doc: Added some \briefs to how-to docs.
Some 4.7 changes.
Updated changelog.
Cherry pick fix for MOBILITY-932 from Qt Mobility.
Cherry pick fix for MOBILITY-962 from Qt Mobility.
Cherry pick fix for MOBILITY-828 from Qt Mobility.
Bearer management changes from Qt Mobility.
Cherry pick fix for MOBILITY-828 from Qt Mobility.
Added snippet labels to QML Dial example.
Fixed documentation typo.
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Mac: restoreGeometry()
[Regression] Build failure on Mac Carbon
doc: Added some \briefs to how-to docs.
Some 4.7 changes.
Updated changelog.
Cherry pick fix for MOBILITY-932 from Qt Mobility.
Cherry pick fix for MOBILITY-962 from Qt Mobility.
Cherry pick fix for MOBILITY-828 from Qt Mobility.
Bearer management changes from Qt Mobility.
Cherry pick fix for MOBILITY-828 from Qt Mobility.
Added snippet labels to QML Dial example.
Fixed documentation typo.
|
| | | |\ \ |
|
| | | | |\ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
examples/declarative/dial/dial-example.qml
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
9286bfcc43d38e0cb3bfd1d3f99ac7ab5d88b7e3
|
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Revert "Optimize QPixmapIconEngine's pixmap() function"
Limit the lower glyph texture cache size to 16x16 in GL.
Added workarounds for two MBX/SGX specific GL ES bugs/problems.
Add missing file!
Optimize QPixmapIconEngine's pixmap() function
|
| |\ \ \ \ \ \
| | |/ / / / / |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Amendment to 812f78e55aa3db4d51ec8617320358d80c4a71d5.
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The qml executable was first referred to as QML Viewer, then QML Runtime ...
however, the latter one caused much confusion (see old version of
qmlruntime.qdoc).
Doc changes reviewed by Leena Miettinen.
|
|\ \ \ \ \ \ \
| |_|/ / / / /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Qt.include() support in worker scripts
Only add "include" property in non-workerscript threads
Missing files from 645b9ee9dd6e0576542cc61872ecedb408ca8a89
Reduce the chance of AnchorAnimation animating geometry changes it
Add Qt.include() method for scoped inclusion of JavaScript files
Fix crash in ParentAnimation.
Revert "Fix crash in ParentAnimation."
Symbian build fix to declarative auto and benchmark tests
Revert "Use raster graphicssystem for qml.app on OS X."
Fix crash in ParentAnimation.
Minor declarative webview tweaks
Removed dependency of QDeclarativeWebView to private Qt (Declarative) API
Note that you need to unset a flag to create a visual item
Follow-up on Flickable changes.
ListModel::get() should return undefined if bad index specified
Add an example spinner.
Fix crash on remote content.
Dates and variants are not considered nested objects
|
| |\ \ \ \ \ \
| | | |_|_|/ /
| | |/| | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Also add missing increment/decrementCurrentIndex() slots to PathView,
and tweak the number of points cached along a Path.
|