| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/getting-started/gettingstartedqml.qdoc
|
| | |
| |
| |
| |
| |
| | |
warning: use of old-style cast
Reviewed-by: brad
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/index.qdoc
src/dbus/qdbusconnection.cpp
src/gui/s60framework/qs60mainapplication.cpp
src/gui/s60framework/qs60mainappui.cpp
src/network/access/qnetworkrequest.cpp
src/network/bearer/qnetworkconfiguration.h
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-12705
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It's the scene itself that acts as a focus scope, not the top-level
item.
Task-number: QTBUG-12682
Reviewed-by: Aaron Kennedy
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Aaron Kennedy
|
| |/ /
| |
| |
| |
| | |
Reviewed-by: Trust Me
To-be-verified-by: Qt Doc Team
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
src/declarative/util/qdeclarativeanimation.cpp
|
| | |
| |
| |
| | |
Task-number: QTBUG-12666
|
| | |\ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
crash problems that no longer occur).
Task-number: QTBUG-12599
Reviewed-by: Martin Jones
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-12649
Reviewed-by: Martin Jones
|
| | |/
| |
| |
| |
| | |
Task-number: QTBUG-12473
Reviewed-by: Aaron Kennedy
|
| |\ \
| |/ |
|
| | |\ |
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed crash in concentric circles example
QDeclarativeDebug: use QueuedConnection in the packet protocol
Implement comp_Source with SSE2 when there is a const alpha
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
SpringFollow was turned into SpringAnimation so it could be
used inside a Behavior. This patch completes the work and makes
it usable inside a transition.
This is the documented behavior of SpringAnimation, the patch
is essential to make SpringAnimation work consistently.
Reviewed-by: Michael Brasser
Task-number: QTBUG-12141
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-11251
Reviewed-by: Bea Lam
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| |\ \ \ \
| | |_|/
| |/| | |
|
| | | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Else, we can have deadlock in the javascript debugger, which may
start an event loop.
If the javascript execution result from some network command, the
further network command are not processed more
(the ones that exist the javascript debugger event loop)
Having a QueuedConnection there means the network events will not
be blocked by a rentrency in the event loop
Reviewed-by: Lasse Holmstedt
|
| |\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
doc/src/examples/qml-examples.qdoc
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits)
Removed the unfinished sentence. Fix for QTBUG-10173.
Fixed the addressbook tutorial and some spelling mistakes. Fix for QTBUG-7071 and QTBUG-10173
Unbreak QImage::rgbSwapped() for many image formats.
Crash when pressing the '£' key on Belgian Keyboard layout (Cocoa)
Doc: Adding content to installation guide and fixing printing bugs
Cocoa: Active QDockWidget does not stay on top of inactive QDockWidget
Made changes to qdoc to allow it to accept a "style level" flag
Doc: Correcting bugs in the CSS
Return 'Unknown' bearer type name for unknown bearer type.
Update def files.
Doc: updating index page, x platform and platform spec. Removing redundant style files
Added notice that some links are online documents.
Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)
configure: don't symlink the mkspecs/features directory
Doc: adding changes to getting started and fixing redirection links
doc: Fixed many qdoc errors.
Fixed potential infinite loop in QFileSystemWatcher on Mac.
qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf
Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.
...
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Return 'Unknown' bearer type name for unknown bearer type.
Update def files.
Doc: updating index page, x platform and platform spec. Removing redundant style files
Added notice that some links are online documents.
Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)
configure: don't symlink the mkspecs/features directory
Doc: adding changes to getting started and fixing redirection links
doc: Fixed many qdoc errors.
Fixed potential infinite loop in QFileSystemWatcher on Mac.
qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf
Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.
Simplify network manager settings code.
Use an enum to return the bearer type of a network configuration.
Rename QNetworkConfiguration::bearerName() function.
|
| | | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: updating index page, x platform and platform spec. Removing redundant style files
Added notice that some links are online documents.
Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)
configure: don't symlink the mkspecs/features directory
Doc: adding changes to getting started and fixing redirection links
doc: Fixed many qdoc errors.
Fixed potential infinite loop in QFileSystemWatcher on Mac.
qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf
Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.
Simplify network manager settings code.
Use an enum to return the bearer type of a network configuration.
Rename QNetworkConfiguration::bearerName() function.
|
| | | | | | |
|
| | | | | |\ |
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Clip the content position to the beginning rather than the end, if
both apply.
Task-number: QTBUG-12573
Reviewed-by: Michael Brasser
|
| | |\ \ \ \ \
| | |/ / / / |
|
| | | |/ / /
| | | | |
| | | | |
| | | | | |
QTBUG-12590
|
| | |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If a model emits dataChanged() every role was be updated, rather than
just the roles required. Now only roles which have been used are updated.
Task-number: QTBUG-12598
Reviewed-by: Michael Brasser
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-12570
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Otherwise a new delegate isn't created for the currentItem.
GridView didn't release any item. It is now equivalent to LsitView.
Task-number: QTBUG-12548
Reviewed-by: Bea Lam
|
| | |\ \ \ \
| | |/ / / |
|
| | | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
directly from the base state.
Make sure qmlExecuteDeferred is called on the state being extended.
Task-number: QTBUG-12559
|
| | |/ /
| | |
| | |
| | |
| | | |
Task-number: QTBUG-12470
Reviewed-by: Bea Lam
|
| | |\ \
| | |/ |
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Add missing image
Mention scope of id uniqueness
Update QML Documents example
add license header
doc: Add a note about QCoreApplication::applicationDirPath
Add license header
Add moving and flicking properties to PathView
Improve utility of QMLViewer
Add missing \l doc commands
Document elements that are focus scopes.
Remove use of shared NOTIFY signals in QGraphicsScale
Remove use of shared NOTIFY signals
|
| | | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-12529
|
| | | | |
| | | |
| | | |
| | | | |
QTBUG-11938 and QTBUG-10801
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 755
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 757
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 739
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | | |
The views expect the models to reference count and not destroy (or hide
in the case of VisualItemModel) until there are no references.
Task-number: QTBUG-12450
Reviewed-by: Michael Brasser
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-12404
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
PathView handles its own mouse interaction, but lacked properties
similar to those in Flickable to determine when it is stationary.
This made it impossible to start an animation when the view stops moving,
for example.
Task-number: QTBUG-12497
Reviewed-by: Warwick Allison
|
| | |\ \
| | |/ |
|
