Commit 0284817d authored by Matthew Vogt's avatar Matthew Vogt

Merge master <-> api_changes

Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
parents 377eb94e 36bd7f61

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

.tag ident
*_crlf.* eol=crlf
# This file is used to ignore files which are generated in the Qt build system
# ----------------------------------------------------------------------------
examples/*/*/*
!examples/*/*/*[.]*
!examples/*/*/README
examples/*/*/*[.]app
!examples/declarative/*
!examples/tutorials/*
!examples/tutorials/*/*
!examples/ja_JP/*/*
demos/*/*
!demos/spectrum/*
demos/spectrum/bin
!demos/*/*[.]*
demos/*/*[.]app
!demos/declarative/*
config.tests/*/*/*
!config.tests/*/*/*[.]*
config.tests/*/*/*[.]app
......@@ -273,4 +259,4 @@ tests/auto/*/*.o
tests/auto/*/*.moc
tests/auto/*/*/*.o
tests/auto/*/*/*.moc
src/declarative/generated/
\ No newline at end of file
src/declarative/generated/
......@@ -75,6 +75,7 @@ QML_SYMBOLS="\
QDeclarativeCompiledData
QDeclarativeCompiler
QDeclarativeCompilerTypes
QDeclarativeCompilingProfiler
QDeclarativeComponent
QDeclarativeComponentAttached
QDeclarativeComponentExtension
......@@ -152,6 +153,7 @@ QML_SYMBOLS="\
QDeclarativeGuard
QDeclarativeGuardedContextData
QDeclarativeGuardImpl
QDeclarativeHandlingSignalProfiler
QDeclarativeImageProvider
QDeclarativeImageProviderPrivate
QDeclarativeImportDatabase
......@@ -189,6 +191,7 @@ QML_SYMBOLS="\
QDeclarativeNotifierEndpoint
QDeclarativeNullableValue
QDeclarativeNumberExtension
QDeclarativeObjectCreatingProfiler
QDeclarativeObjectData
QDeclarativeObjectProperty
QDeclarativeObserverMode
......
......@@ -19,7 +19,8 @@ headerdirs += ../src \
imagedirs += ../src/images \
sourcedirs += ../src \
../../src
../../src \
../../examples
#indexes = $QT5DOC/doc/html/qt.index
......
......@@ -31,15 +31,6 @@
\image qml-i18n-example.png
\brief This is an internationalization example
*/
/*!
\title QML Examples - Shader Effects
\example declarative/shadereffects
\image qml-shadereffects-example.png
\brief This is a shader effects example
This example demonstrates a couple of visual effects that you can perform
with shaders in QtQuick 2.0
*/
/*!
\title QML Examples - Positioners
\example declarative/positioners
......@@ -48,26 +39,6 @@
This example demonstrates the positioners and some of their animations.
*/
/*!
\title QML Examples - Animation
\example declarative/animation
\brief This is a collection of QML examples
\image qml-animations-example.png
This is a collection of small QML examples relating to animation. Each example is
a small QML file, usually containing or emphasizing a particular element or
feature. You can run and observe the behavior of each example.
*/
/*!
\title QML Examples - Image Elements
\example declarative/imageelements
\brief This is a collection of QML examples
\image qml-imageelements-example.png
This is a collection of small QML examples relating to image elements. Each example is
a small QML file, usually containing or emphasizing a particular element or
feature. You can run and observe the behavior of each example.
*/
/*!
\title QML Examples - Models and Views
\example declarative/modelviews
......
......@@ -26,13 +26,6 @@
****************************************************************************/
/*!
\title QML Example - Calculator
\example declarative/calculator
\brief This is an example application written in QML.
\image qml-calculator-demo-small.png
*/
/*!
\title QML Example - Samegame
\example declarative/samegame
......
......@@ -33,9 +33,24 @@ The local storage API provides a JavaScript interface to an SQL relational
database. The QtQuick.LocalStorage module contains the API and it may be given
a namespace.
Import QtQuick.LocalStorage module from QML:
\code
import QtQuick.LocalStorage 2.0 as SQL
//sql.qml
import QtQuick.LocalStorage 2.0 as Sql
\endcode
Import QtQuick.LocalStorage module from JavaScript:
\code
//sql.js
.import QtQuick.LocalStorage 2.0 as Sql
\endcode
Note, importing a module from JavaScript is different from importing from QML.
The \l{JavaScript Code} article contains detailed information on importing in JavaScript code.
\section2 Database API
The \c openDatabaseSync() and related functions
......
......@@ -60,7 +60,7 @@ ListView {
NumberAnimation { property: "scale"; from: 0; to: 1.0; duration: 400 }
}
addDisplaced: Transition {
displaced: Transition {
NumberAnimation { properties: "x,y"; duration: 400; easing.type: Easing.OutBounce }
}
......
......@@ -60,12 +60,12 @@ ListView {
}
//! [0]
addDisplaced: Transition {
id: addDispTrans
displaced: Transition {
id: dispTrans
SequentialAnimation {
PauseAnimation {
duration: (addDispTrans.ViewTransition.index -
addDispTrans.ViewTransition.targetIndexes[0]) * 100
duration: (dispTrans.ViewTransition.index -
dispTrans.ViewTransition.targetIndexes[0]) * 100
}
NumberAnimation { properties: "x,y"; duration: 400; easing.type: Easing.OutBounce }
}
......
......@@ -60,20 +60,20 @@ ListView {
}
//! [0]
addDisplaced: Transition {
id: addDispTrans
displaced: Transition {
id: dispTrans
SequentialAnimation {
PauseAnimation {
duration: (addDispTrans.ViewTransition.index -
addDispTrans.ViewTransition.targetIndexes[0]) * 100
duration: (dispTrans.ViewTransition.index -
dispTrans.ViewTransition.targetIndexes[0]) * 100
}
ParallelAnimation {
NumberAnimation {
property: "x"; to: addDispTrans.ViewTransition.item.x + 20
property: "x"; to: dispTrans.ViewTransition.item.x + 20
easing.type: Easing.OutQuad
}
NumberAnimation {
property: "y"; to: addDispTrans.ViewTransition.item.y + 50
property: "y"; to: dispTrans.ViewTransition.item.y + 50
easing.type: Easing.OutQuad
}
}
......
......@@ -60,7 +60,7 @@ ListView {
}
//! [0]
addDisplaced: Transition {
displaced: Transition {
NumberAnimation { properties: "x,y"; duration: 400; easing.type: Easing.OutBounce }
// ensure opacity and scale values return to 1.0
......
......@@ -76,20 +76,20 @@ ListView {
}
//! [0]
addDisplaced: Transition {
id: addDispTrans
displaced: Transition {
id: dispTrans
SequentialAnimation {
PauseAnimation {