summaryrefslogtreecommitdiffstats
path: root/Modules/FindSDL_image.cmake
blob: 4cef46188977ea9854ef2a59b46479406f3de0d8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
# - Locate SDL_image library
# This module defines
#  SDLIMAGE_LIBRARY, the library to link against
#  SDLIMAGE_FOUND, if false, do not try to link to SDL
#  SDLIMAGE_INCLUDE_DIR, where to find SDL/SDL.h
#
# $SDLDIR is an environment variable that would
# correspond to the ./configure --prefix=$SDLDIR
# used in building SDL.
#
# Created by Eric Wing. This was influenced by the FindSDL.cmake 
# module, but with modifications to recognize OS X frameworks and 
# additional Unix paths (FreeBSD, etc).

# On OSX, this will prefer the Framework version (if found) over others.
# People will have to manually change the cache values of 
# SDLIMAGE_LIBRARY to override this selection.
FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h
  $ENV{SDLIMAGEDIR}/include
  $ENV{SDLDIR}/include
  ~/Library/Frameworks/SDL_image.framework/Headers
  /Library/Frameworks/SDL_image.framework/Headers
  /usr/local/include/SDL
  /usr/include/SDL
  /usr/local/include/SDL12
  /usr/local/include/SDL11 # FreeBSD ports
  /usr/include/SDL12
  /usr/include/SDL11
  /usr/local/include
  /usr/include
  /sw/include/SDL # Fink
  /sw/include
  /opt/local/include/SDL # DarwinPorts
  /opt/local/include
  /opt/csw/include/SDL # Blastwave
  /opt/csw/include 
  /opt/include/SDL
  /opt/include
  )
# I'm not sure if I should do a special casing for Apple. It is 
# unlikely that other Unix systems will find the framework path.
# But if they do ([Next|Open|GNU]Step?), 
# do they want the -framework option also?
IF(${SDLIMAGE_INCLUDE_DIR} MATCHES ".framework")
  # Extract the path the framework resides in so we can use it for the -F flag
  STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDLIMAGE_FRAMEWORK_PATH_TEMP ${SDLIMAGE_INCLUDE_DIR})
  IF("${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
      OR "${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
      )
    # String is in default search path, don't need to use -F
    SET(SDLIMAGE_LIBRARY "-framework SDL_image" CACHE STRING "SDL_image framework for OSX")
  ELSE("${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
      OR "${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
      )
    # String is not /Library/Frameworks, need to use -F
    SET(SDLIMAGE_LIBRARY "-F${SDLIMAGE_FRAMEWORK_PATH_TEMP} -framework SDL_image" CACHE STRING "SDL_image framework for OSX")
  ENDIF("${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
    OR "${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
    )
  # Clear the temp variable so nobody can see it
  SET(SDLIMAGE_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")

ELSE(${SDLIMAGE_INCLUDE_DIR} MATCHES ".framework")
  FIND_LIBRARY(SDLIMAGE_LIBRARY 
    NAMES SDL_image
    PATHS
    $ENV{SDLIMAGEDIR}/lib
    $ENV{SDLDIR}/lib
    /usr/local/lib
    /usr/lib
    /sw/lib
    /opt/local/lib
    /opt/csw/lib
    /opt/lib
    )
ENDIF(${SDLIMAGE_INCLUDE_DIR} MATCHES ".framework")

SET(SDLIMAGE_FOUND "NO")
IF(SDLIMAGE_LIBRARY)
  SET(SDLIMAGE_FOUND "YES")
ENDIF(SDLIMAGE_LIBRARY)

tr> -rw-r--r--examples/declarative/animation/basics/color-animation.qml (renamed from examples/declarative/animations/color-animation.qml)0
-rw-r--r--examples/declarative/animation/basics/images/face-smile.png (renamed from examples/declarative/parallax/pics/face-smile.png)bin15408 -> 15408 bytes-rw-r--r--examples/declarative/animation/basics/images/moon.png (renamed from examples/declarative/animations/images/moon.png)bin2433 -> 2433 bytes-rw-r--r--examples/declarative/animation/basics/images/shadow.png (renamed from examples/declarative/parallax/pics/shadow.png)bin425 -> 425 bytes-rw-r--r--examples/declarative/animation/basics/images/star.png (renamed from examples/declarative/dynamic/images/star.png)bin349 -> 349 bytes-rw-r--r--examples/declarative/animation/basics/images/sun.png (renamed from examples/declarative/dynamic/images/sun.png)bin8153 -> 8153 bytes-rw-r--r--examples/declarative/animation/basics/property-animation.qml (renamed from examples/declarative/animations/property-animation.qml)0
-rw-r--r--examples/declarative/animation/behaviors/SideRect.qml (renamed from examples/declarative/behaviors/SideRect.qml)0
-rw-r--r--examples/declarative/animation/behaviors/behavior-example.qml (renamed from examples/declarative/behaviors/behavior-example.qml)0
-rw-r--r--examples/declarative/animation/behaviors/behaviors.qmlproject (renamed from examples/declarative/behaviors/behaviors.qmlproject)0
-rw-r--r--examples/declarative/animation/easing/easing.qml (renamed from examples/declarative/animations/easing.qml)0
-rw-r--r--examples/declarative/animation/easing/easing.qmlproject (renamed from examples/declarative/workerscript/workerscript.qmlproject)0
-rw-r--r--examples/declarative/animation/states/states.qml (renamed from examples/declarative/states/states.qml)0
-rw-r--r--examples/declarative/animation/states/states.qmlproject (renamed from examples/declarative/states/states.qmlproject)0
-rw-r--r--examples/declarative/animation/states/transitions.qml (renamed from examples/declarative/states/transitions.qml)0
-rw-r--r--examples/declarative/animation/states/user.png (renamed from examples/declarative/states/user.png)bin4886 -> 4886 bytes-rw-r--r--examples/declarative/connections/connections-example.qml37
-rw-r--r--examples/declarative/connections/content/Button.qml12
-rw-r--r--examples/declarative/connections/content/bg1.jpgbin23771 -> 0 bytes-rw-r--r--examples/declarative/connections/content/rotate-left.pngbin3061 -> 0 bytes-rw-r--r--examples/declarative/connections/content/rotate-right.pngbin3115 -> 0 bytes-rw-r--r--examples/declarative/cppextensions/cppextensions.pro10
-rw-r--r--examples/declarative/cppextensions/cppextensions.qmlproject (renamed from examples/declarative/webview/webview.qmlproject)0
-rw-r--r--examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir (renamed from examples/declarative/imageprovider/ImageProviderCore/qmldir)0
-rw-r--r--examples/declarative/cppextensions/imageprovider/imageprovider-example.qml (renamed from examples/declarative/imageprovider/imageprovider-example.qml)0
-rw-r--r--examples/declarative/cppextensions/imageprovider/imageprovider.cpp (renamed from examples/declarative/imageprovider/imageprovider.cpp)0
-rw-r--r--examples/declarative/cppextensions/imageprovider/imageprovider.pro (renamed from examples/declarative/imageprovider/imageprovider.pro)0
-rw-r--r--examples/declarative/cppextensions/imageprovider/imageprovider.qmlproject (renamed from examples/declarative/imageprovider/imageprovider.qmlproject)0
-rw-r--r--examples/declarative/cppextensions/plugins/README (renamed from examples/declarative/plugins/README)0
-rw-r--r--examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml (renamed from examples/declarative/plugins/com/nokia/TimeExample/Clock.qml)0
-rw-r--r--examples/declarative/cppextensions/plugins/com/nokia/TimeExample/center.png (renamed from examples/declarative/plugins/com/nokia/TimeExample/center.png)bin765 -> 765 bytes-rw-r--r--examples/declarative/cppextensions/plugins/com/nokia/TimeExample/clock.png (renamed from examples/declarative/plugins/com/nokia/TimeExample/clock.png)bin20653 -> 20653 bytes-rw-r--r--examples/declarative/cppextensions/plugins/com/nokia/TimeExample/hour.png (renamed from examples/declarative/plugins/com/nokia/TimeExample/hour.png)bin625 -> 625 bytes-rw-r--r--examples/declarative/cppextensions/plugins/com/nokia/TimeExample/minute.png (renamed from examples/declarative/plugins/com/nokia/TimeExample/minute.png)bin625 -> 625 bytes-rw-r--r--examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir (renamed from examples/declarative/plugins/com/nokia/TimeExample/qmldir)0
-rw-r--r--examples/declarative/cppextensions/plugins/plugin.cpp (renamed from examples/declarative/plugins/plugin.cpp)0
-rw-r--r--examples/declarative/cppextensions/plugins/plugins.pro (renamed from examples/declarative/plugins/plugins.pro)0
-rw-r--r--examples/declarative/cppextensions/plugins/plugins.qml (renamed from examples/declarative/plugins/plugins.qml)0
-rw-r--r--examples/declarative/cppextensions/plugins/plugins.qmlproject (renamed from examples/declarative/plugins/plugins.qmlproject)0
-rw-r--r--examples/declarative/cppextensions/proxyviewer/main.cpp (renamed from examples/declarative/proxyviewer/main.cpp)0
-rw-r--r--examples/declarative/cppextensions/proxyviewer/proxyviewer.pro (renamed from examples/declarative/proxyviewer/proxyviewer.pro)0
-rw-r--r--examples/declarative/cppextensions/proxyviewer/proxyviewer.qrc (renamed from examples/declarative/proxyviewer/proxyviewer.qrc)0
-rw-r--r--examples/declarative/cppextensions/proxyviewer/view.qml (renamed from examples/declarative/proxyviewer/view.qml)0
-rw-r--r--examples/declarative/cppextensions/proxywidgets/ProxyWidgets/qmldir (renamed from examples/declarative/proxywidgets/ProxyWidgets/qmldir)0
-rw-r--r--examples/declarative/cppextensions/proxywidgets/README (renamed from examples/declarative/proxywidgets/README)0
-rw-r--r--examples/declarative/cppextensions/proxywidgets/proxywidgets.cpp (renamed from examples/declarative/proxywidgets/proxywidgets.cpp)0
-rw-r--r--examples/declarative/cppextensions/proxywidgets/proxywidgets.pro (renamed from examples/declarative/proxywidgets/proxywidgets.pro)0
-rw-r--r--examples/declarative/cppextensions/proxywidgets/proxywidgets.qml (renamed from examples/declarative/proxywidgets/proxywidgets.qml)0
-rw-r--r--examples/declarative/cppextensions/proxywidgets/proxywidgets.qmlproject (renamed from examples/declarative/proxywidgets/proxywidgets.qmlproject)0
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.cpp (renamed from examples/declarative/layouts/graphicsLayouts/graphicslayouts.cpp)0
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro (renamed from examples/declarative/layouts/graphicsLayouts/graphicslayouts.pro)0
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qml (renamed from examples/declarative/layouts/graphicsLayouts/graphicslayouts.qml)0
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qrc (renamed from examples/declarative/layouts/graphicsLayouts/graphicslayouts.qrc)0
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts_p.h (renamed from examples/declarative/layouts/graphicsLayouts/graphicslayouts_p.h)0
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/main.cpp (renamed from examples/declarative/layouts/graphicsLayouts/main.cpp)0
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.pro (renamed from examples/declarative/layouts/layoutItem/layoutItem.pro)0
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qml (renamed from examples/declarative/layouts/layoutItem/layoutItem.qml)0
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qrc (renamed from examples/declarative/layouts/layoutItem/layoutItem.qrc)0
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/layoutItem/main.cpp (renamed from examples/declarative/layouts/layoutItem/main.cpp)0
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.qmlproject (renamed from examples/declarative/velocity/velocity.qmlproject)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/adding/adding.pro (renamed from examples/declarative/extending/adding/adding.pro)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/adding/adding.qrc (renamed from examples/declarative/extending/adding/adding.qrc)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/adding/example.qml (renamed from examples/declarative/extending/adding/example.qml)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/adding/main.cpp (renamed from examples/declarative/extending/adding/main.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/adding/person.cpp (renamed from examples/declarative/extending/adding/person.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/adding/person.h (renamed from examples/declarative/extending/adding/person.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/attached/attached.pro (renamed from examples/declarative/extending/attached/attached.pro)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/attached/attached.qrc (renamed from examples/declarative/extending/attached/attached.qrc)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.cpp (renamed from examples/declarative/extending/attached/birthdayparty.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.h (renamed from examples/declarative/extending/attached/birthdayparty.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/attached/example.qml (renamed from examples/declarative/extending/attached/example.qml)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/attached/main.cpp (renamed from examples/declarative/extending/attached/main.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/attached/person.cpp (renamed from examples/declarative/extending/valuesource/person.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/attached/person.h (renamed from examples/declarative/extending/valuesource/person.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/binding/binding.pro (renamed from examples/declarative/extending/binding/binding.pro)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/binding/binding.qrc (renamed from examples/declarative/extending/binding/binding.qrc)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.cpp (renamed from examples/declarative/extending/binding/birthdayparty.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.h (renamed from examples/declarative/extending/binding/birthdayparty.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/binding/example.qml (renamed from examples/declarative/extending/binding/example.qml)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.cpp (renamed from examples/declarative/extending/binding/happybirthdaysong.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.h (renamed from examples/declarative/extending/binding/happybirthdaysong.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/binding/main.cpp (renamed from examples/declarative/extending/binding/main.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/binding/person.cpp (renamed from examples/declarative/extending/binding/person.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/binding/person.h (renamed from examples/declarative/extending/binding/person.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.cpp (renamed from examples/declarative/extending/grouped/birthdayparty.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.h (renamed from examples/declarative/extending/coercion/birthdayparty.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro (renamed from examples/declarative/extending/coercion/coercion.pro)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc (renamed from examples/declarative/extending/coercion/coercion.qrc)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/coercion/example.qml (renamed from examples/declarative/extending/coercion/example.qml)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/coercion/main.cpp (renamed from examples/declarative/extending/coercion/main.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/coercion/person.cpp (renamed from examples/declarative/extending/coercion/person.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/coercion/person.h (renamed from examples/declarative/extending/coercion/person.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/default/birthdayparty.cpp (renamed from examples/declarative/extending/default/birthdayparty.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/default/birthdayparty.h (renamed from examples/declarative/extending/default/birthdayparty.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/default/default.pro (renamed from examples/declarative/extending/default/default.pro)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/default/default.qrc (renamed from examples/declarative/extending/default/default.qrc)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/default/example.qml (renamed from examples/declarative/extending/default/example.qml)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/default/main.cpp (renamed from examples/declarative/extending/default/main.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/default/person.cpp (renamed from examples/declarative/extending/default/person.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/default/person.h (renamed from examples/declarative/extending/default/person.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/extended/example.qml (renamed from examples/declarative/extending/extended/example.qml)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/extended/extended.pro (renamed from examples/declarative/extending/extended/extended.pro)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/extended/extended.qrc (renamed from examples/declarative/extending/extended/extended.qrc)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/extended/lineedit.cpp (renamed from examples/declarative/extending/extended/lineedit.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/extended/lineedit.h (renamed from examples/declarative/extending/extended/lineedit.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/extended/main.cpp (renamed from examples/declarative/extending/extended/main.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.cpp (renamed from examples/declarative/extending/coercion/birthdayparty.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.h (renamed from examples/declarative/extending/grouped/birthdayparty.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/grouped/example.qml (renamed from examples/declarative/extending/grouped/example.qml)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro (renamed from examples/declarative/extending/grouped/grouped.pro)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/grouped/grouped.qrc (renamed from examples/declarative/extending/grouped/grouped.qrc)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/grouped/main.cpp (renamed from examples/declarative/extending/grouped/main.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/grouped/person.cpp (renamed from examples/declarative/extending/signal/person.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/grouped/person.h (renamed from examples/declarative/extending/grouped/person.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp (renamed from examples/declarative/extending/properties/birthdayparty.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h (renamed from examples/declarative/extending/properties/birthdayparty.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/properties/example.qml (renamed from examples/declarative/extending/properties/example.qml)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/properties/main.cpp (renamed from examples/declarative/extending/properties/main.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/properties/person.cpp (renamed from examples/declarative/extending/properties/person.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/properties/person.h (renamed from examples/declarative/extending/properties/person.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/properties/properties.pro (renamed from examples/declarative/extending/properties/properties.pro)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/properties/properties.qrc (renamed from examples/declarative/extending/properties/properties.qrc)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/referenceexamples.pro (renamed from examples/declarative/extending/extending.pro)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/referenceexamples.qmlproject (renamed from examples/declarative/tvtennis/tvtennis.qmlproject)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.cpp (renamed from examples/declarative/extending/signal/birthdayparty.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.h (renamed from examples/declarative/extending/signal/birthdayparty.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/signal/example.qml (renamed from examples/declarative/extending/signal/example.qml)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/signal/main.cpp (renamed from examples/declarative/extending/signal/main.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/signal/person.cpp (renamed from examples/declarative/extending/grouped/person.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/signal/person.h (renamed from examples/declarative/extending/signal/person.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/signal/signal.pro (renamed from examples/declarative/extending/signal/signal.pro)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/signal/signal.qrc (renamed from examples/declarative/extending/signal/signal.qrc)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.cpp (renamed from examples/declarative/extending/valuesource/birthdayparty.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.h (renamed from examples/declarative/extending/valuesource/birthdayparty.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/valuesource/example.qml (renamed from examples/declarative/extending/valuesource/example.qml)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp (renamed from examples/declarative/extending/valuesource/happybirthdaysong.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h (renamed from examples/declarative/extending/valuesource/happybirthdaysong.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp (renamed from examples/declarative/extending/valuesource/main.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/valuesource/person.cpp (renamed from examples/declarative/extending/attached/person.cpp)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/valuesource/person.h (renamed from examples/declarative/extending/attached/person.h)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro (renamed from examples/declarative/extending/valuesource/valuesource.pro)0
-rw-r--r--examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.qrc (renamed from examples/declarative/extending/valuesource/valuesource.qrc)0
-rw-r--r--examples/declarative/declarative.pro59
-rw-r--r--examples/declarative/fillmode/content/QtLogo.qml30
-rw-r--r--examples/declarative/fillmode/content/qt-logo.pngbin5149 -> 0 bytes-rw-r--r--examples/declarative/fillmode/fillmode.qml22
-rw-r--r--examples/declarative/i18n/i18n.qmlproject (renamed from examples/declarative/tic-tac-toe/tic-tac-toe.qmlproject)0
-rw-r--r--examples/declarative/imageelements/borderimage/borderimage.qml (renamed from examples/declarative/border-image/border-image.qml)0
-rw-r--r--examples/declarative/imageelements/borderimage/borderimage.qmlproject (renamed from examples/declarative/tabwidget/tabwidget.qmlproject)0
-rw-r--r--examples/declarative/imageelements/borderimage/content/MyBorderImage.qml (renamed from examples/declarative/border-image/content/MyBorderImage.qml)0
-rw-r--r--examples/declarative/imageelements/borderimage/content/ShadowRectangle.qml (renamed from examples/declarative/border-image/content/ShadowRectangle.qml)0
-rw-r--r--examples/declarative/imageelements/borderimage/content/bw.png (renamed from examples/declarative/border-image/content/bw.png)bin1357 -> 1357 bytes-rw-r--r--examples/declarative/imageelements/borderimage/content/colors-round.sci (renamed from examples/declarative/border-image/content/colors-round.sci)0
-rw-r--r--examples/declarative/imageelements/borderimage/content/colors-stretch.sci (renamed from examples/declarative/border-image/content/colors-stretch.sci)0
-rw-r--r--examples/declarative/imageelements/borderimage/content/colors.png (renamed from examples/declarative/border-image/content/colors.png)bin1655 -> 1655 bytes-rw-r--r--examples/declarative/imageelements/borderimage/content/shadow.png (renamed from examples/declarative/border-image/content/shadow.png)bin588 -> 588 bytes-rw-r--r--examples/declarative/imageelements/borderimage/shadows.qml (renamed from examples/declarative/border-image/shadows.qml)0
-rw-r--r--examples/declarative/imageelements/image/face_fit.qml (renamed from examples/declarative/aspectratio/face_fit.qml)0
-rw-r--r--examples/declarative/imageelements/image/face_fit_animated.qml (renamed from examples/declarative/aspectratio/face_fit_animated.qml)0
-rw-r--r--examples/declarative/imageelements/image/image.qmlproject (renamed from examples/declarative/sql/sql.qmlproject)0
-rw-r--r--examples/declarative/imageelements/image/pics/face.png (renamed from examples/declarative/aspectratio/pics/face.png)bin15408 -> 15408 bytes-rw-r--r--examples/declarative/imageelements/image/scale_and_crop.qml (renamed from examples/declarative/aspectratio/scale_and_crop.qml)0
-rw-r--r--examples/declarative/imageelements/image/scale_and_crop_simple.qml (renamed from examples/declarative/aspectratio/scale_and_crop_simple.qml)0
-rw-r--r--examples/declarative/imageelements/image/scale_and_sidecrop.qml (renamed from examples/declarative/aspectratio/scale_and_sidecrop.qml)0
-rw-r--r--examples/declarative/imageelements/image/scale_to_fit.qml (renamed from examples/declarative/aspectratio/scale_to_fit.qml)0
-rw-r--r--examples/declarative/imageelements/image/scale_to_fit_simple.qml (renamed from examples/declarative/aspectratio/scale_to_fit_simple.qml)0
-rw-r--r--examples/declarative/imageelements/imageelements.qmlproject (renamed from examples/declarative/spinner/spinner.qmlproject)0
-rw-r--r--examples/declarative/images/content/lemonade.jpgbin6645 -> 0 bytes-rw-r--r--examples/declarative/images/images.qml72
-rw-r--r--examples/declarative/keyinteraction/focus/Core/ContextMenu.qml (renamed from examples/declarative/focus/Core/ContextMenu.qml)0
-rw-r--r--examples/declarative/keyinteraction/focus/Core/GridMenu.qml (renamed from examples/declarative/focus/Core/GridMenu.qml)0
-rw-r--r--examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml (renamed from examples/declarative/focus/Core/ListViewDelegate.qml)0
-rw-r--r--examples/declarative/keyinteraction/focus/Core/ListViews.qml (renamed from examples/declarative/focus/Core/ListViews.qml)0
-rw-r--r--examples/declarative/keyinteraction/focus/Core/images/arrow.png (renamed from examples/declarative/focus/Core/images/arrow.png)bin583 -> 583 bytes-rw-r--r--examples/declarative/keyinteraction/focus/Core/images/qt-logo.png (renamed from examples/declarative/focus/Core/images/qt-logo.png)bin5149 -> 5149 bytes-rw-r--r--examples/declarative/keyinteraction/focus/Core/qmldir (renamed from examples/declarative/focus/Core/qmldir)0
-rw-r--r--examples/declarative/keyinteraction/focus/focus.qml (renamed from examples/declarative/focus/focus.qml)0
-rw-r--r--examples/declarative/keyinteraction/focus/focus.qmlproject (renamed from examples/declarative/focus/focus.qmlproject)0
-rw-r--r--examples/declarative/keyinteraction/keyinteraction.qmlproject (renamed from examples/declarative/slideswitch/slideswitch.qmlproject)0
-rw-r--r--examples/declarative/modelviews/gridview/gridview-example.qml (renamed from examples/declarative/gridview/gridview-example.qml)0
-rw-r--r--examples/declarative/modelviews/gridview/gridview.qmlproject (renamed from examples/declarative/gridview/gridview.qmlproject)0
-rw-r--r--examples/declarative/modelviews/gridview/pics/AddressBook_48.png (renamed from examples/declarative/gridview/pics/AddressBook_48.png)bin3350 -> 3350 bytes-rw-r--r--examples/declarative/modelviews/gridview/pics/AudioPlayer_48.png (renamed from examples/declarative/gridview/pics/AudioPlayer_48.png)bin3806 -> 3806 bytes-rw-r--r--examples/declarative/modelviews/gridview/pics/Camera_48.png (renamed from examples/declarative/gridview/pics/Camera_48.png)bin3540 -> 3540 bytes-rw-r--r--examples/declarative/modelviews/gridview/pics/DateBook_48.png (renamed from examples/declarative/gridview/pics/DateBook_48.png)bin2610 -> 2610 bytes-rw-r--r--examples/declarative/modelviews/gridview/pics/EMail_48.png (renamed from examples/declarative/gridview/pics/EMail_48.png)bin3655 -> 3655 bytes-rw-r--r--examples/declarative/modelviews/gridview/pics/TodoList_48.png (renamed from examples/declarative/gridview/pics/TodoList_48.png)bin3429 -> 3429 bytes-rw-r--r--examples/declarative/modelviews/gridview/pics/VideoPlayer_48.png (renamed from examples/declarative/gridview/pics/VideoPlayer_48.png)bin4151 -> 4151 bytes-rw-r--r--examples/declarative/modelviews/listview/content/ClickAutoRepeating.qml (renamed from examples/declarative/listview/content/ClickAutoRepeating.qml)0
-rw-r--r--examples/declarative/modelviews/listview/content/MediaButton.qml (renamed from examples/declarative/listview/content/MediaButton.qml)0
-rw-r--r--examples/declarative/modelviews/listview/content/pics/add.png (renamed from examples/declarative/listview/content/pics/add.png)bin1577 -> 1577 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/archive-insert.png (renamed from examples/declarative/listview/content/pics/archive-insert.png)bin896 -> 896 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/archive-remove.png (renamed from examples/declarative/listview/content/pics/archive-remove.png)bin1074 -> 1074 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/button-pressed.png (renamed from examples/declarative/listview/content/pics/button-pressed.png)bin571 -> 571 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/button.png (renamed from examples/declarative/listview/content/pics/button.png)bin564 -> 564 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/del.png (renamed from examples/declarative/listview/content/pics/del.png)bin1661 -> 1661 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/fruit-salad.jpg (renamed from examples/declarative/listview/content/pics/fruit-salad.jpg)bin17952 -> 17952 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/go-down.png (renamed from examples/declarative/listview/content/pics/go-down.png)bin892 -> 892 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/go-up.png (renamed from examples/declarative/listview/content/pics/go-up.png)bin929 -> 929 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/hamburger.jpg (renamed from examples/declarative/listview/content/pics/hamburger.jpg)bin8572 -> 8572 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/lemonade.jpg (renamed from examples/declarative/listview/content/pics/lemonade.jpg)bin6645 -> 6645 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/list-add.png (renamed from examples/declarative/listview/content/pics/list-add.png)bin907 -> 907 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/list-remove.png (renamed from examples/declarative/listview/content/pics/list-remove.png)bin498 -> 498 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/moreDown.png (renamed from examples/declarative/listview/content/pics/moreDown.png)bin217 -> 217 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/moreUp.png (renamed from examples/declarative/listview/content/pics/moreUp.png)bin212 -> 212 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/pancakes.jpg (renamed from examples/declarative/listview/content/pics/pancakes.jpg)bin9163 -> 9163 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/trash.png (renamed from examples/declarative/listview/content/pics/trash.png)bin989 -> 989 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/vegetable-soup.jpg (renamed from examples/declarative/listview/content/pics/vegetable-soup.jpg)bin8639 -> 8639 bytes-rw-r--r--examples/declarative/modelviews/listview/dummydata/MyPetsModel.qml (renamed from examples/declarative/listview/dummydata/MyPetsModel.qml)0
-rw-r--r--examples/declarative/modelviews/listview/dummydata/Recipes.qml (renamed from examples/declarative/listview/dummydata/Recipes.qml)0
-rw-r--r--examples/declarative/modelviews/listview/dynamic.qml (renamed from examples/declarative/listview/dynamic.qml)2
-rw-r--r--examples/declarative/modelviews/listview/highlight.qml (renamed from examples/declarative/listview/highlight.qml)0
-rw-r--r--examples/declarative/modelviews/listview/itemlist.qml (renamed from examples/declarative/listview/itemlist.qml)0
-rw-r--r--examples/declarative/modelviews/listview/listview-example.qml (renamed from examples/declarative/listview/listview-example.qml)0
-rw-r--r--examples/declarative/modelviews/listview/listview.qmlproject (renamed from examples/declarative/listview/listview.qmlproject)0
-rw-r--r--examples/declarative/modelviews/listview/recipes.qml (renamed from examples/declarative/listview/recipes.qml)0
-rw-r--r--examples/declarative/modelviews/listview/sections.qml (renamed from examples/declarative/listview/sections.qml)0
-rw-r--r--examples/declarative/modelviews/modelviews.pro7
-rw-r--r--examples/declarative/modelviews/modelviews.qmlproject (renamed from examples/declarative/searchbox/searchbox.qmlproject)0
-rw-r--r--examples/declarative/modelviews/objectlistmodel/dataobject.cpp (renamed from examples/declarative/objectlistmodel/dataobject.cpp)0
-rw-r--r--examples/declarative/modelviews/objectlistmodel/dataobject.h (renamed from examples/declarative/objectlistmodel/dataobject.h)0
-rw-r--r--examples/declarative/modelviews/objectlistmodel/main.cpp (renamed from examples/declarative/objectlistmodel/main.cpp)0
-rw-r--r--examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro (renamed from examples/declarative/objectlistmodel/objectlistmodel.pro)0
-rw-r--r--examples/declarative/modelviews/objectlistmodel/objectlistmodel.qmlproject (renamed from examples/declarative/objectlistmodel/objectlistmodel.qmlproject)0
-rw-r--r--examples/declarative/modelviews/objectlistmodel/objectlistmodel.qrc (renamed from examples/declarative/objectlistmodel/objectlistmodel.qrc)0
-rw-r--r--examples/declarative/modelviews/objectlistmodel/view.qml (renamed from examples/declarative/objectlistmodel/view.qml)0
-rw-r--r--examples/declarative/modelviews/package/Delegate.qml (renamed from examples/declarative/package/Delegate.qml)0
-rw-r--r--examples/declarative/modelviews/package/package.qmlproject (renamed from examples/declarative/package/package.qmlproject)0
-rw-r--r--examples/declarative/modelviews/package/view.qml (renamed from examples/declarative/package/view.qml)0
-rw-r--r--examples/declarative/modelviews/parallax/parallax.qml (renamed from examples/declarative/parallax/parallax.qml)4
-rw-r--r--examples/declarative/modelviews/parallax/parallax.qmlproject (renamed from examples/declarative/parallax/parallax.qmlproject)0
-rw-r--r--examples/declarative/modelviews/parallax/pics/background.jpg (renamed from examples/declarative/parallax/pics/background.jpg)bin209814 -> 209814 bytes-rw-r--r--examples/declarative/modelviews/parallax/pics/face-smile.png (renamed from examples/declarative/dynamic/images/face-smile.png)bin15408 -> 15408 bytes-rw-r--r--examples/declarative/modelviews/parallax/pics/home-page.svg (renamed from examples/declarative/parallax/pics/home-page.svg)0
-rw-r--r--examples/declarative/modelviews/parallax/pics/shadow.png (renamed from examples/declarative/animations/images/shadow.png)bin425 -> 425 bytes-rw-r--r--examples/declarative/modelviews/parallax/pics/yast-joystick.png (renamed from examples/declarative/parallax/pics/yast-joystick.png)bin2723 -> 2723 bytes-rw-r--r--examples/declarative/modelviews/parallax/pics/yast-wol.png (renamed from examples/declarative/parallax/pics/yast-wol.png)bin3769 -> 3769 bytes-rw-r--r--examples/declarative/modelviews/parallax/qml/ParallaxView.qml (renamed from examples/declarative/parallax/qml/ParallaxView.qml)0
-rw-r--r--examples/declarative/modelviews/parallax/qml/Smiley.qml (renamed from examples/declarative/parallax/qml/Smiley.qml)0
-rw-r--r--examples/declarative/modelviews/stringlistmodel/main.cpp (renamed from examples/declarative/stringlistmodel/main.cpp)0
-rw-r--r--examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro (renamed from examples/declarative/stringlistmodel/stringlistmodel.pro)0
-rw-r--r--examples/declarative/modelviews/stringlistmodel/stringlistmodel.qrc (renamed from examples/declarative/stringlistmodel/stringlistmodel.qrc)0
-rw-r--r--examples/declarative/modelviews/stringlistmodel/view.qml (renamed from examples/declarative/stringlistmodel/view.qml)0
-rw-r--r--examples/declarative/modelviews/webview/alerts.html (renamed from examples/declarative/webview/alerts.html)0
-rw-r--r--examples/declarative/modelviews/webview/alerts.qml (renamed from examples/declarative/webview/alerts.qml)0
-rw-r--r--examples/declarative/modelviews/webview/autosize.qml (renamed from examples/declarative/webview/autosize.qml)0
-rw-r--r--examples/declarative/modelviews/webview/content/FieldText.qml (renamed from examples/declarative/webview/content/FieldText.qml)0
-rw-r--r--examples/declarative/modelviews/webview/content/Mapping/Map.qml (renamed from examples/declarative/webview/content/Mapping/Map.qml)0
-rwxr-xr-xexamples/declarative/modelviews/webview/content/Mapping/map.html (renamed from examples/declarative/webview/content/Mapping/map.html)0
-rw-r--r--examples/declarative/modelviews/webview/content/SpinSquare.qml (renamed from examples/declarative/webview/content/SpinSquare.qml)0
-rw-r--r--examples/declarative/modelviews/webview/content/pics/cancel.png (renamed from examples/declarative/webview/content/pics/cancel.png)bin1038 -> 1038 bytes-rw-r--r--examples/declarative/modelviews/webview/content/pics/ok.png (renamed from examples/declarative/webview/content/pics/ok.png)bin655 -> 655 bytes-rw-r--r--examples/declarative/modelviews/webview/googleMaps.qml (renamed from examples/declarative/webview/googleMaps.qml)0
-rw-r--r--examples/declarative/modelviews/webview/inline-html.qml (renamed from examples/declarative/webview/inline-html.qml)0
-rw-r--r--examples/declarative/modelviews/webview/newwindows.html (renamed from examples/declarative/webview/newwindows.html)0
-rw-r--r--examples/declarative/modelviews/webview/newwindows.qml (renamed from examples/declarative/webview/newwindows.qml)0
-rw-r--r--examples/declarative/modelviews/webview/transparent.qml (renamed from examples/declarative/webview/transparent.qml)0
-rw-r--r--examples/declarative/modelviews/webview/webview.qmlproject (renamed from examples/declarative/scrollbar/scrollbar.qmlproject)0
-rw-r--r--examples/declarative/positioners/Button.qml (renamed from examples/declarative/layouts/positioners/Button.qml)0
-rw-r--r--examples/declarative/positioners/add.png (renamed from examples/declarative/layouts/positioners/add.png)bin1577 -> 1577 bytes-rw-r--r--examples/declarative/positioners/del.png (renamed from examples/declarative/layouts/positioners/del.png)bin1661 -> 1661 bytes-rw-r--r--examples/declarative/positioners/positioners.qml (renamed from examples/declarative/layouts/positioners/positioners.qml)0
-rw-r--r--examples/declarative/positioners/positioners.qmlproject (renamed from examples/declarative/layouts/positioners/positioners.qmlproject)0
-rw-r--r--examples/declarative/positioners/positioners.qmlproject.user (renamed from examples/declarative/layouts/positioners/positioners.qmlproject.user)0
-rw-r--r--examples/declarative/sqllocalstorage/hello.qml (renamed from examples/declarative/sql/hello.qml)0
-rw-r--r--examples/declarative/sqllocalstorage/sqllocalstorage.qmlproject (renamed from examples/declarative/progressbar/progressbar.qmlproject)0
-rw-r--r--examples/declarative/text/fonts/availableFonts.qml (renamed from examples/declarative/fonts/availableFonts.qml)0
-rw-r--r--examples/declarative/text/fonts/banner.qml (renamed from examples/declarative/fonts/banner.qml)0
-rw-r--r--examples/declarative/text/fonts/fonts.qml (renamed from examples/declarative/fonts/fonts.qml)0
-rw-r--r--examples/declarative/text/fonts/fonts.qmlproject (renamed from examples/declarative/fonts/fonts.qmlproject)0
-rw-r--r--examples/declarative/text/fonts/fonts/tarzeau_ocr_a.ttf (renamed from examples/declarative/fonts/fonts/tarzeau_ocr_a.ttf)bin24544 -> 24544 bytes-rw-r--r--examples/declarative/text/fonts/hello.qml (renamed from examples/declarative/fonts/hello.qml)0
-rw-r--r--examples/declarative/text/text.qmlproject (renamed from examples/declarative/mousearea/mousearea.qmlproject)0
-rw-r--r--examples/declarative/threading/threadedlistmodel/dataloader.js (renamed from examples/declarative/listmodel-threaded/dataloader.js)0
-rw-r--r--examples/declarative/threading/threadedlistmodel/threadedlistmodel.qmlproject (renamed from examples/declarative/listmodel-threaded/listmodel-threaded.qmlproject)0
-rw-r--r--examples/declarative/threading/threadedlistmodel/timedisplay.qml (renamed from examples/declarative/listmodel-threaded/timedisplay.qml)0
-rw-r--r--examples/declarative/threading/threading.qmlproject (renamed from examples/declarative/images/images.qmlproject)0
-rw-r--r--examples/declarative/threading/workerscript/workerscript.js (renamed from examples/declarative/workerscript/workerscript.js)0
-rw-r--r--examples/declarative/threading/workerscript/workerscript.qml (renamed from examples/declarative/workerscript/workerscript.qml)0
-rw-r--r--examples/declarative/threading/workerscript/workerscript.qmlproject (renamed from examples/declarative/gestures/gestures.qmlproject)0
-rw-r--r--examples/declarative/touchinteraction/gestures/experimental-gestures.qml (renamed from examples/declarative/gestures/experimental-gestures.qml)0
-rw-r--r--examples/declarative/touchinteraction/gestures/gestures.qmlproject (renamed from examples/declarative/flipable/flipable.qmlproject)0
-rw-r--r--examples/declarative/touchinteraction/mousearea/mouse.qml (renamed from examples/declarative/mousearea/mouse.qml)0
-rw-r--r--examples/declarative/touchinteraction/mousearea/mousearea.qmlproject (renamed from examples/declarative/fillmode/fillmode.qmlproject)0
-rw-r--r--examples/declarative/touchinteraction/touchinteraction.qmlproject (renamed from examples/declarative/extending/extending.qmlproject)0
-rw-r--r--examples/declarative/toys/clocks/clocks.qml (renamed from examples/declarative/clocks/clocks.qml)0
-rw-r--r--examples/declarative/toys/clocks/clocks.qmlproject (renamed from examples/declarative/clocks/clocks.qmlproject)0
-rw-r--r--examples/declarative/toys/clocks/content/Clock.qml (renamed from examples/declarative/clocks/content/Clock.qml)0
-rw-r--r--examples/declarative/toys/clocks/content/background.png (renamed from examples/declarative/clocks/content/background.png)bin46895 -> 46895 bytes-rwxr-xr-xexamples/declarative/toys/clocks/content/center.png (renamed from examples/declarative/clocks/content/center.png)bin765 -> 765 bytes-rwxr-xr-xexamples/declarative/toys/clocks/content/clock-night.png (renamed from examples/declarative/clocks/content/clock-night.png)bin23359 -> 23359 bytes-rwxr-xr-xexamples/declarative/toys/clocks/content/clock.png (renamed from examples/declarative/clocks/content/clock.png)bin20653 -> 20653 bytes-rwxr-xr-xexamples/declarative/toys/clocks/content/hour.png (renamed from examples/declarative/clocks/content/hour.png)bin625 -> 625 bytes-rwxr-xr-xexamples/declarative/toys/clocks/content/minute.png (renamed from examples/declarative/clocks/content/minute.png)bin625 -> 625 bytes-rwxr-xr-xexamples/declarative/toys/clocks/content/second.png (renamed from examples/declarative/clocks/content/second.png)bin303 -> 303 bytes-rw-r--r--examples/declarative/toys/dial/content/Dial.qml (renamed from examples/declarative/dial/content/Dial.qml)0
-rw-r--r--examples/declarative/toys/dial/content/background.png (renamed from examples/declarative/dial/content/background.png)bin35876 -> 35876 bytes-rw-r--r--examples/declarative/toys/dial/content/needle.png (renamed from examples/declarative/dial/content/needle.png)bin342 -> 342 bytes-rw-r--r--examples/declarative/toys/dial/content/needle_shadow.png (renamed from examples/declarative/dial/content/needle_shadow.png)bin632 -> 632 bytes-rw-r--r--examples/declarative/toys/dial/content/overlay.png (renamed from examples/declarative/dial/content/overlay.png)bin3564 -> 3564 bytes-rw-r--r--examples/declarative/toys/dial/dial-example.qml (renamed from examples/declarative/dial/dial-example.qml)0
-rw-r--r--examples/declarative/toys/dial/dial.qmlproject (renamed from examples/declarative/dial/dial.qmlproject)0
-rw-r--r--examples/declarative/toys/dynamic/dynamic.qml (renamed from examples/declarative/dynamic/dynamic.qml)0
-rw-r--r--examples/declarative/toys/dynamic/dynamic.qmlproject (renamed from examples/declarative/dynamic/dynamic.qmlproject)0
-rw-r--r--examples/declarative/toys/dynamic/images/NOTE (renamed from examples/declarative/dynamic/images/NOTE)0
-rw-r--r--examples/declarative/toys/dynamic/images/face-smile.png (renamed from examples/declarative/animations/images/face-smile.png)bin15408 -> 15408 bytes-rw-r--r--examples/declarative/toys/dynamic/images/moon.png (renamed from examples/declarative/dynamic/images/moon.png)bin1757 -> 1757 bytes-rw-r--r--examples/declarative/toys/dynamic/images/rabbit_brown.png (renamed from examples/declarative/dynamic/images/rabbit_brown.png)bin1245 -> 1245 bytes-rw-r--r--examples/declarative/toys/dynamic/images/rabbit_bw.png (renamed from examples/declarative/dynamic/images/rabbit_bw.png)bin1759 -> 1759 bytes-rw-r--r--examples/declarative/toys/dynamic/images/star.png (renamed from examples/declarative/animations/images/star.png)bin349 -> 349 bytes-rw-r--r--examples/declarative/toys/dynamic/images/sun.png (renamed from examples/declarative/animations/images/sun.png)bin8153 -> 8153 bytes-rw-r--r--examples/declarative/toys/dynamic/images/tree_s.png (renamed from examples/declarative/dynamic/images/tree_s.png)bin3406 -> 3406 bytes-rw-r--r--examples/declarative/toys/dynamic/qml/Button.qml (renamed from examples/declarative/dynamic/qml/Button.qml)0
-rw-r--r--examples/declarative/toys/dynamic/qml/PaletteItem.qml (renamed from examples/declarative/dynamic/qml/PaletteItem.qml)0
-rw-r--r--examples/declarative/toys/dynamic/qml/PerspectiveItem.qml (renamed from examples/declarative/dynamic/qml/PerspectiveItem.qml)0
-rw-r--r--examples/declarative/toys/dynamic/qml/Sun.qml (renamed from examples/declarative/dynamic/qml/Sun.qml)0
-rw-r--r--examples/declarative/toys/dynamic/qml/itemCreation.js (renamed from examples/declarative/dynamic/qml/itemCreation.js)0
-rw-r--r--examples/declarative/toys/tic-tac-toe/content/Button.qml (renamed from examples/declarative/tic-tac-toe/content/Button.qml)0
-rw-r--r--examples/declarative/toys/tic-tac-toe/content/TicTac.qml (renamed from examples/declarative/tic-tac-toe/content/TicTac.qml)0
-rw-r--r--examples/declarative/toys/tic-tac-toe/content/pics/board.png (renamed from examples/declarative/tic-tac-toe/content/pics/board.png)bin12258 -> 12258 bytes-rw-r--r--examples/declarative/toys/tic-tac-toe/content/pics/o.png (renamed from examples/declarative/tic-tac-toe/content/pics/o.png)bin1470 -> 1470 bytes-rw-r--r--examples/declarative/toys/tic-tac-toe/content/pics/x.png (renamed from examples/declarative/tic-tac-toe/content/pics/x.png)bin1331 -> 1331 bytes-rw-r--r--examples/declarative/toys/tic-tac-toe/content/tic-tac-toe.js (renamed from examples/declarative/tic-tac-toe/content/tic-tac-toe.js)0
-rw-r--r--examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml (renamed from examples/declarative/tic-tac-toe/tic-tac-toe.qml)0
-rw-r--r--examples/declarative/toys/tic-tac-toe/tic-tac-toe.qmlproject (renamed from examples/declarative/connections/connections.qmlproject)0
-rw-r--r--examples/declarative/toys/toys.qmlproject (renamed from examples/declarative/border-image/border-image.qmlproject)0
-rw-r--r--examples/declarative/toys/tvtennis/tvtennis.qml (renamed from examples/declarative/tvtennis/tvtennis.qml)0
-rw-r--r--examples/declarative/toys/tvtennis/tvtennis.qmlproject (renamed from examples/declarative/aspectratio/aspectratio.qmlproject)0
-rw-r--r--examples/declarative/toys/velocity/Day.qml (renamed from examples/declarative/velocity/Day.qml)0
-rw-r--r--examples/declarative/toys/velocity/cork.jpg (renamed from examples/declarative/velocity/cork.jpg)bin149337 -> 149337 bytes-rw-r--r--examples/declarative/toys/velocity/note-yellow.png (renamed from examples/declarative/velocity/note-yellow.png)bin54559 -> 54559 bytes-rw-r--r--examples/declarative/toys/velocity/tack.png (renamed from examples/declarative/velocity/tack.png)bin7282 -> 7282 bytes-rw-r--r--examples/declarative/toys/velocity/velocity.qml (renamed from examples/declarative/velocity/velocity.qml)0
-rw-r--r--examples/declarative/toys/velocity/velocity.qmlproject (renamed from examples/declarative/animations/animations.qmlproject)0
-rw-r--r--examples/declarative/tutorials/extending/extending.pro9
-rw-r--r--examples/declarative/tutorials/tutorials.pro5
-rw-r--r--examples/declarative/ui-components/flipable/content/5_heart.png (renamed from examples/declarative/flipable/content/5_heart.png)bin3872 -> 3872 bytes-rw-r--r--examples/declarative/ui-components/flipable/content/9_club.png (renamed from examples/declarative/flipable/content/9_club.png)bin6135 -> 6135 bytes-rw-r--r--examples/declarative/ui-components/flipable/content/Card.qml (renamed from examples/declarative/flipable/content/Card.qml)0
-rw-r--r--examples/declarative/ui-components/flipable/content/back.png (renamed from examples/declarative/flipable/content/back.png)bin1418 -> 1418 bytes-rw-r--r--examples/declarative/ui-components/flipable/flipable-example.qml (renamed from examples/declarative/flipable/flipable-example.qml)0
-rw-r--r--examples/declarative/ui-components/flipable/flipable.qmlproject16
-rw-r--r--examples/declarative/ui-components/progressbar/content/ProgressBar.qml (renamed from examples/declarative/progressbar/content/ProgressBar.qml)0
-rw-r--r--examples/declarative/ui-components/progressbar/content/background.png (renamed from examples/declarative/progressbar/content/background.png)bin426 -> 426 bytes-rw-r--r--examples/declarative/ui-components/progressbar/progressbar.qmlproject16
-rw-r--r--examples/declarative/ui-components/progressbar/progressbars.qml (renamed from examples/declarative/progressbar/progressbars.qml)0
-rw-r--r--examples/declarative/ui-components/scrollbar/ScrollBar.qml (renamed from examples/declarative/scrollbar/ScrollBar.qml)0
-rw-r--r--examples/declarative/ui-components/scrollbar/display.qml (renamed from examples/declarative/scrollbar/display.qml)0
-rw-r--r--examples/declarative/ui-components/scrollbar/pics/niagara_falls.jpg (renamed from examples/declarative/scrollbar/pics/niagara_falls.jpg)bin604121 -> 604121 bytes-rw-r--r--examples/declarative/ui-components/scrollbar/scrollbar.qmlproject16
-rw-r--r--examples/declarative/ui-components/searchbox/SearchBox.qml (renamed from examples/declarative/searchbox/SearchBox.qml)0
-rw-r--r--examples/declarative/ui-components/searchbox/images/edit-clear-locationbar-rtl.png (renamed from examples/declarative/searchbox/images/edit-clear-locationbar-rtl.png)bin429 -> 429 bytes-rw-r--r--examples/declarative/ui-components/searchbox/images/lineedit-bg-focus.png (renamed from examples/declarative/searchbox/images/lineedit-bg-focus.png)bin526 -> 526 bytes-rw-r--r--examples/declarative/ui-components/searchbox/images/lineedit-bg.png (renamed from examples/declarative/searchbox/images/lineedit-bg.png)bin426 -> 426 bytes-rw-r--r--examples/declarative/ui-components/searchbox/main.qml (renamed from examples/declarative/searchbox/main.qml)0
-rw-r--r--examples/declarative/ui-components/searchbox/searchbox.qmlproject16
-rw-r--r--examples/declarative/ui-components/slideswitch/content/Switch.qml (renamed from examples/declarative/slideswitch/content/Switch.qml)0
-rw-r--r--examples/declarative/ui-components/slideswitch/content/background.svg (renamed from examples/declarative/slideswitch/content/background.svg)0
-rw-r--r--examples/declarative/ui-components/slideswitch/content/knob.svg (renamed from examples/declarative/slideswitch/content/knob.svg)0
-rw-r--r--examples/declarative/ui-components/slideswitch/slideswitch.qml (renamed from examples/declarative/slideswitch/slideswitch.qml)0
-rw-r--r--examples/declarative/ui-components/slideswitch/slideswitch.qmlproject16
-rw-r--r--examples/declarative/ui-components/spinner/content/Spinner.qml (renamed from examples/declarative/spinner/content/Spinner.qml)0
-rw-r--r--examples/declarative/ui-components/spinner/content/spinner-bg.png (renamed from examples/declarative/spinner/content/spinner-bg.png)bin345 -> 345 bytes-rw-r--r--examples/declarative/ui-components/spinner/content/spinner-select.png (renamed from examples/declarative/spinner/content/spinner-select.png)bin320 -> 320 bytes-rw-r--r--examples/declarative/ui-components/spinner/main.qml (renamed from examples/declarative/spinner/main.qml)0
-rw-r--r--examples/declarative/ui-components/spinner/spinner.qmlproject16
-rw-r--r--examples/declarative/ui-components/tabwidget/TabWidget.qml (renamed from examples/declarative/tabwidget/TabWidget.qml)0
-rw-r--r--examples/declarative/ui-components/tabwidget/tab.png (renamed from examples/declarative/tabwidget/tab.png)bin507 -> 507 bytes-rw-r--r--examples/declarative/ui-components/tabwidget/tabs.qml (renamed from examples/declarative/tabwidget/tabs.qml)0
-rw-r--r--examples/declarative/ui-components/tabwidget/tabwidget.qmlproject16
-rw-r--r--examples/declarative/ui-components/ui-components.qmlproject16
-rw-r--r--examples/declarative/xml/xml.qmlproject16
-rw-r--r--examples/declarative/xml/xmldata/daringfireball.qml (renamed from examples/declarative/xmldata/daringfireball.qml)0
-rw-r--r--examples/declarative/xml/xmldata/xmldata.qmlproject16
-rw-r--r--examples/declarative/xml/xmldata/yahoonews.qml (renamed from examples/declarative/xmldata/yahoonews.qml)0
-rw-r--r--examples/declarative/xml/xmlhttprequest/test.qml (renamed from examples/declarative/xmlhttprequest/test.qml)0
-rw-r--r--examples/declarative/xml/xmlhttprequest/test.xml (renamed from examples/declarative/xmlhttprequest/test.xml)0
-rw-r--r--examples/declarative/xml/xmlhttprequest/xmlhttprequest.qmlproject16
-rw-r--r--src/declarative/graphicsitems/qdeclarativeborderimage.cpp4
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflickable.cpp2
-rw-r--r--src/declarative/graphicsitems/qdeclarativelistview.cpp2
-rw-r--r--src/declarative/qml/qdeclarativeengine.cpp4
-rw-r--r--src/declarative/qml/qdeclarativeextensionplugin.cpp2
-rw-r--r--src/declarative/util/qdeclarativelistmodel.cpp4
-rw-r--r--src/declarative/util/qdeclarativepackage.cpp4
-rw-r--r--src/declarative/util/qdeclarativexmllistmodel.cpp2
396 files changed, 483 insertions, 413 deletions
diff --git a/doc/src/declarative/example-slideswitch.qdoc b/doc/src/declarative/example-slideswitch.qdoc
index c14208e..27b7f38 100644
--- a/doc/src/declarative/example-slideswitch.qdoc
+++ b/doc/src/declarative/example-slideswitch.qdoc
@@ -45,7 +45,7 @@
This example shows how to create a reusable switch component in QML.
-The code for this example can be found in the \c $QTDIR/examples/declarative/slideswitch directory.
+The code for this example can be found in the \c $QTDIR/examples/declarative/ui-components/slideswitch directory.
\section1 Overview
@@ -61,12 +61,12 @@ The elements that composed the switch are:
\endlist
\section1 Switch.qml
-\snippet examples/declarative/slideswitch/content/Switch.qml 0
+\snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 0
\section1 Walkthrough
\section2 Interface
-\snippet examples/declarative/slideswitch/content/Switch.qml 1
+\snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 1
This property is the interface of the switch. By default, the switch is off and this property is \c false.
It can be used to activate/disactivate the switch or to query its current state.
@@ -81,14 +81,14 @@ Text { text: "The switch is on"; visible: mySwitch.on == true }
the text will only be visible when the switch is on.
\section2 Images and user interaction
-\snippet examples/declarative/slideswitch/content/Switch.qml 4
+\snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 4
First, we create the background image of the switch.
In order for the switch to toggle when the user clicks on the background, we add a \l{MouseArea} as a child item of the image.
A \c MouseArea has a \c onClicked property that is triggered when the item is clicked. For the moment we will just call a
\c toggle() function. We will see what this function does in a moment.
-\snippet examples/declarative/slideswitch/content/Switch.qml 5
+\snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 5
Then, we place the image of the knob on top of the background.
The interaction here is a little more complex. We want the knob to move with the finger when it is clicked. That is what the \c drag
@@ -96,7 +96,7 @@ property of the \c MouseArea is for. We also want to toggle the switch if the kn
in the \c dorelease() function that is called in the \c onReleased property.
\section2 States
-\snippet examples/declarative/slideswitch/content/Switch.qml 6
+\snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 6
We define the two states of the switch:
\list
@@ -110,13 +110,13 @@ For more information on states see \l{qmlstates}{QML States}.
We add two JavaScript functions to our switch:
-\snippet examples/declarative/slideswitch/content/Switch.qml 2
+\snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 2
This first function is called when the background image or the knob are clicked. We simply want the switch to toggle between the two
states (\e on and \e off).
-\snippet examples/declarative/slideswitch/content/Switch.qml 3
+\snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 3
This second function is called when the knob is released and we want to make sure that the knob does not end up between states
(neither \e on nor \e off). If it is the case call the \c toggle() function otherwise we do nothing.
@@ -124,7 +124,7 @@ This second function is called when the knob is released and we want to make sur
For more information on scripts see \l{Integrating JavaScript}.
\section2 Transition
-\snippet examples/declarative/slideswitch/content/Switch.qml 7
+\snippet examples/declarative/ui-components/slideswitch/content/Switch.qml 7
At this point, when the switch toggles between the two states the knob will instantly change its \c x position between 1 and 78.
In order for the the knob to move smoothly we add a transition that will animate the \c x property with an easing curve for a duration of 200ms.
@@ -133,5 +133,5 @@ For more information on transitions see \l{state-transitions}{QML Transitions}.
\section1 Usage
The switch can be used in a QML file, like this:
-\snippet examples/declarative/slideswitch/slideswitch.qml 0
+\snippet examples/declarative/ui-components/slideswitch/slideswitch.qml 0
*/
diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index 481617e..cdc308a 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -71,50 +71,92 @@ For example, from your build directory, run:
\section1 Examples
+\section2 Animation
\list
-\o \l{declarative/animations}{Animations}
-\o \l{declarative/aspectratio}{Aspect Ratio}
-\o \l{declarative/behaviors}{Behaviors}
-\o \l{declarative/border-image}{Border Image}
-\o \l{declarative/clocks}{Clocks}
-\o \l{declarative/connections}{Connections}
-\o \l{declarative/dial}{Dial}
-\o \l{declarative/dynamic}{Dynamic}
-\o \l{declarative/extending}{Extending}
-\o \l{declarative/fillmode}{Fillmode}
-\o \l{declarative/flipable}{Flipable}
-\o \l{declarative/focus}{Focus}
-\o \l{declarative/fonts}{Fonts}
-\o \l{declarative/gridview}{GridView}
-\o \l{declarative/imageprovider}{Image Provider}
-\o \l{declarative/images}{Images}
-\o \l{declarative/layouts}{Layouts}
-\o \l{declarative/listmodel-threaded}{ListModel Threaded}
-\o \l{declarative/listview}{ListView}
-\o \l{declarative/mousearea}{Mouse Area}
-\o \l{declarative/objectlistmodel}{Object ListModel}
-\o \l{declarative/package}{Package}
-\o \l{declarative/parallax}{Parallax}
-\o \l{declarative/plugins}{Plugins}
-\o \l{declarative/progressbar}{Progress Bars}
-\o \l{declarative/proxywidgets}{Proxy Widgets}
-\o \l{declarative/scrollbar}{Scrollbar}
-\o \l{declarative/searchbox}{Search Box}
-\o \l{declarative/slideswitch}{Slide Switch}
-\o \l{declarative/sql}{SQL}
-\o \l{declarative/states}{States}
-\o \l{declarative/stringlistmodel}{String ListModel}
-\o \l{declarative/tabwidget}{Tab Widget}
-\o \l{declarative/tic-tac-toe}{Tic-Tac-Toe}
-\o \l{declarative/tvtennis}{TV Tennis}
-\o \l{declarative/velocity}{Velocity}
-\o \l{declarative/webview}{WebView}
-\o \l{declarative/workerscript}{WorkerScript}
-\o \l{declarative/xmldata}{XML Data}
-\o \l{declarative/xmlhttprequest}{XMLHttpRequest}
+\o \l{declarative/animation/basics}{Basics}
+\o \l{declarative/animation/behaviors}{Behaviors}
+\o \l{declarative/animation/easing}{Easing}
+\o \l{declarative/animation/states}{States}
+\endlist
+
+\section2 Image Elements
+\list
+\o \l{declarative/imageelements/borderimage}{BorderImage}
+\o \l{declarative/imageelements/image}{Image}
+\endlist
+
+\section2 \l{declarative/positioners}{Positioners}
+
+\section2 Key Interaction
+\list
+\o \l{declarative/keyinteraction/focus}{Focus}
+\endlist
+\section2 Touch Interaction
+\list
+\o \l{declarative/touchinteraction/gestures}{Gestures}
+\o \l{declarative/touchinteraction/mousearea}{MouseArea}
+\endlist
+
+\section2 UI Components
+\list
+\o \l{declarative/ui-components/flipable}{Flipable}
+\o \l{declarative/ui-components/progressbar}{Progress bar}
+\o \l{declarative/ui-components/scrollbar}{Scroll bar}
+\o \l{declarative/ui-components/searchbox}{Search box}
+\o \l{declarative/ui-components/slideswitch}{Slide switch}
+\o \l{declarative/ui-components/spinner}{Spinner}
+\o \l{declarative/ui-components/tabwidget}{Tab widget}
\endlist
+\section2 Models and Views
+\list
+\o \l{declarative/modelviews/gridview}{GridView}
+\o \l{declarative/modelviews/listview}{ListView}
+\o \l{declarative/modelviews/objectlistmodel}{Object list model}
+\o \l{declarative/modelviews/package}{Package}
+\o \l{declarative/modelviews/parallax}{Parallax}
+\o \l{declarative/modelviews/stringlistmodel}{String list model}
+\o \l{declarative/modelviews/webview}{WebView}
+\endlist
+
+\section2 XML
+\list
+\o \l{declarative/xml/xmldata}{XML data}
+\o \l{declarative/xml/xmlhttprequest}{XmlHttpRequest}
+\endlist
+
+\section2 \l{declarative/i18n}{Internationalization (i18n)}
+
+\section2 Threading
+\list
+\o \l{declarative/threading/threadedlistmodel}{Threaded ListModel}
+\o \l{declarative/threading/workerscript}{WorkerScript}
+\endlist
+
+\section2 \l{declarative/sqllocalstorage}{SQL Local Storage}
+
+\section2 C++ Extensions
+\list
+\o \l{declarative/cppextensions/referenceexamples}{Reference examples} (discussed in \l {Extending QML in C++})
+\o \l{declarative/cppextensions/plugins}{Plugins}
+\o \l{declarative/cppextensions/proxywidgets}{QtWidgets}
+\o \l{declarative/cppextensions/qgraphicslayouts}{QGraphicsLayouts}
+\o \l{declarative/cppextensions/imageprovider}{Image provider}
+\o \l{declarative/cppextensions/proxyviewer}{Network access manager factory}
+\endlist
+
+\section2 Toys
+\list
+\o \l{declarative/toys/clocks}{Clocks}
+\o \l{declarative/toys/dial}{Dial}
+\o \l{declarative/toys/dynamic}{Dynamic}
+\o \l{declarative/toys/tic-tac-toe}{Tic Tac Toe}
+\o \l{declarative/toys/tvtennis}{TV Tennis}
+\o \l{declarative/toys/velocity}{Velocity}
+\endlist
+
+
\section1 Demos
\list
@@ -127,3 +169,4 @@ For example, from your build directory, run:
\endlist
*/
+
diff --git a/doc/src/declarative/extending-examples.qdoc b/doc/src/declarative/extending-examples.qdoc
index 611dac1..577ab78 100644
--- a/doc/src/declarative/extending-examples.qdoc
+++ b/doc/src/declarative/extending-examples.qdoc
@@ -40,13 +40,13 @@
****************************************************************************/
/*!
-\example declarative/extending/adding
+\example declarative/cppextensions/referenceexamples/adding
\title Extending QML - Adding Types Example
The Adding Types Example shows how to add a new element type, \c Person, to QML.
The \c Person type can be used from QML like this:
-\snippet examples/declarative/extending/adding/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/adding/example.qml 0
\section1 Declare the Person class
@@ -55,11 +55,11 @@ with the two properties we want accessible on the QML type - name and shoeSize.
Although in this example we use the same name for the C++ class as the QML
element, the C++ class can be named differently, or appear in a namespace.
-\snippet examples/declarative/extending/adding/person.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/adding/person.h 0
\section1 Define the Person class
-\snippet examples/declarative/extending/adding/person.cpp 0
+\snippet examples/declarative/cppextensions/referenceexamples/adding/person.cpp 0
The Person class implementation is quite basic. The property accessors simply
return members of the object instance.
@@ -75,7 +75,7 @@ loads and runs the QML snippet shown at the beginning of this page.
*/
/*!
-\example declarative/extending/properties
+\example declarative/cppextensions/referenceexamples/properties
\title Extending QML - Object and List Property Types Example
This example builds on:
@@ -88,16 +88,16 @@ properties in QML. This example adds a BirthdayParty element that specifies
a birthday party, consisting of a celebrant and a list of guests. People are
specified using the People QML type built in the previous example.
-\snippet examples/declarative/extending/properties/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/properties/example.qml 0
\section1 Declare the BirthdayParty
The BirthdayParty class is declared like this:
-\snippet examples/declarative/extending/properties/birthdayparty.h 0
-\snippet examples/declarative/extending/properties/birthdayparty.h 1
-\snippet examples/declarative/extending/properties/birthdayparty.h 2
-\snippet examples/declarative/extending/properties/birthdayparty.h 3
+\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h 1
+\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h 2
+\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h 3
The class contains a member to store the celebrant object, and also a
QList<Person *> member.
@@ -114,7 +114,7 @@ scenarios.
The implementation of BirthdayParty property accessors is straight forward.
-\snippet examples/declarative/extending/properties/birthdayparty.cpp 0
+\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp 0
\section1 Running the example
@@ -123,7 +123,7 @@ loads and runs the QML snippet shown at the beginning of this page.
*/
/*!
-\example declarative/extending/coercion
+\example declarative/cppextensions/referenceexamples/coercion
\title Extending QML - Inheritance and Coercion Example
This example builds on:
@@ -136,11 +136,11 @@ The Inheritance and Coercion Example shows how to use base classes to assign
elements of more than one type to a property. It specializes the Person element
developed in the previous examples into two elements - a \c Boy and a \c Girl.
-\snippet examples/declarative/extending/coercion/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/coercion/example.qml 0
\section1 Declare Boy and Girl
-\snippet examples/declarative/extending/coercion/person.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/coercion/person.h 0
The Person class remains unaltered in this example and the Boy and Girl C++
classes are trivial extensions of it. As an example, the inheritance used here
@@ -155,7 +155,7 @@ previous example. However, as we have repurposed the People class as a common
base for Boy and Girl, we want to prevent it from being instantiated from QML
directly - an explicit Boy or Girl should be instantiated instead.
-\snippet examples/declarative/extending/coercion/main.cpp 0
+\snippet examples/declarative/cppextensions/referenceexamples/coercion/main.cpp 0
While we want to disallow instantiating Person from within QML, it still needs
to be registered with the QML engine, so that it can be used as a property type
@@ -165,7 +165,7 @@ and other types can be coerced to it.
The implementation of Boy and Girl are trivial.
-\snippet examples/declarative/extending/coercion/person.cpp 1
+\snippet examples/declarative/cppextensions/referenceexamples/coercion/person.cpp 1
All that is necessary is to implement the constructor, and to register the types
and their QML name with the QML engine.
@@ -175,7 +175,7 @@ and their QML name with the QML engine.
The BirthdayParty element has not changed since the previous example. The
celebrant and guests property still use the People type.
-\snippet examples/declarative/extending/coercion/birthdayparty.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.h 0
However, as all three types, Person, Boy and Girl, have been registered with the
QML system, on assignment QML automatically (and type-safely) converts the Boy
@@ -186,7 +186,7 @@ loads and runs the QML snippet shown at the beginning of this page.
*/
/*!
-\example declarative/extending/default
+\example declarative/cppextensions/referenceexamples/default
\title Extending QML - Default Property Example
This example builds on:
@@ -200,14 +200,14 @@ The Default Property Example is a minor modification of the
\l {Extending QML - Inheritance and Coercion Example} that simplifies the
specification of a BirthdayParty through the use of a default property.
-\snippet examples/declarative/extending/default/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/default/example.qml 0
\section1 Declaring the BirthdayParty class
The only difference between this example and the last, is the addition of the
\c DefaultProperty class info annotation.
-\snippet examples/declarative/extending/default/birthdayparty.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/default/birthdayparty.h 0
The default property specifies the property to assign to whenever an explicit
property is not specified, in the case of the BirthdayParty element the guest
@@ -222,7 +222,7 @@ loads and runs the QML snippet shown at the beginning of this page.
*/
/*!
-\example declarative/extending/grouped
+\example declarative/cppextensions/referenceexamples/grouped
\title Extending QML - Grouped Properties Example
This example builds on:
@@ -236,7 +236,7 @@ This example builds on:
*/
/*!
-\example declarative/extending/grouped
+\example declarative/cppextensions/referenceexamples/grouped
\title Extending QML - Attached Properties Example
This example builds on:
@@ -251,7 +251,7 @@ This example builds on:
*/
/*!
-\example declarative/extending/signal
+\example declarative/cppextensions/referenceexamples/signal
\title Extending QML - Signal Support Example
This example builds on:
@@ -267,7 +267,7 @@ This example builds on:
*/
/*!
-\example declarative/extending/valuesource
+\example declarative/cppextensions/referenceexamples/valuesource
\title Extending QML - Property Value Source Example
This example builds on:
@@ -284,7 +284,7 @@ This example builds on:
*/
/*!
-\example declarative/extending/binding
+\example declarative/cppextensions/referenceexamples/binding
\title Extending QML - Binding Example
This example builds on:
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index 1c159e4..5b695f7 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -56,7 +56,7 @@ QML for their own independent use.
\section1 Adding Types
\target adding-types
-\snippet examples/declarative/extending/adding/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/adding/example.qml 0
The QML snippet shown above instantiates one \c Person instance and sets
the \c name and \c shoeSize properties on it. Everything in QML ultimately comes down
@@ -121,7 +121,7 @@ the \c Person type.
\section1 Object and List Property Types
-\snippet examples/declarative/extending/properties/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/properties/example.qml 0
The QML snippet shown above assigns a \c Person object to the \c BirthdayParty's
\c host property, and assigns three \c Person objects to the guests property.
@@ -136,7 +136,7 @@ Properties that are pointers to objects or Qt interfaces are declared with the
Q_PROPERTY() macro, just like other properties. The \c host property
declaration looks like this:
-\snippet examples/declarative/extending/properties/birthdayparty.h 1
+\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h 1
As long as the property type, in this case \c Person, is registered with QML the
property can be assigned.
@@ -165,14 +165,14 @@ As with object properties, the type \a T must be registered with QML.
The \c guest property declaration looks like this:
-\snippet examples/declarative/extending/properties/birthdayparty.h 2
+\snippet examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h 2
\l {Extending QML - Object and List Property Types Example} shows the complete
code used to create the \c BirthdayParty type.
\section1 Inheritance and Coercion
-\snippet examples/declarative/extending/coercion/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/coercion/example.qml 0
The QML snippet shown above assigns a \c Boy object to the \c BirthdayParty's
\c host property, and assigns three other objects to the \c guests property.
@@ -214,7 +214,7 @@ code used to create the \c Boy and \c Girl types.
\section1 Default Property
-\snippet examples/declarative/extending/default/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/default/example.qml 0
The QML snippet shown above assigns a collection of objects to the
\c BirthdayParty's default property.
@@ -246,7 +246,7 @@ specify a default property.
\section1 Grouped Properties
-\snippet examples/declarative/extending/grouped/example.qml 1
+\snippet examples/declarative/cppextensions/referenceexamples/grouped/example.qml 1
The QML snippet shown above assigns a number of properties to the \c Boy object,
including four properties using the grouped property syntax.
@@ -259,7 +259,7 @@ different types through implementation reuse.
A grouped property block is implemented as a read-only object property. The
\c shoe property shown is declared like this:
-\snippet examples/declarative/extending/grouped/person.h 1
+\snippet examples/declarative/cppextensions/referenceexamples/grouped/person.h 1
The \c ShoeDescription type declares the properties available to the grouped
property block - in this case the \c size, \c color, \c brand and \c price properties.
@@ -271,7 +271,7 @@ implement the \c shoe property grouping.
\section1 Attached Properties
-\snippet examples/declarative/extending/attached/example.qml 1
+\snippet examples/declarative/cppextensions/referenceexamples/attached/example.qml 1
The QML snippet shown above assigns a date to the \c rsvp property using the attached
property syntax.
@@ -393,8 +393,8 @@ this situation, but it must not crash.
\section1 Signal Support
-\snippet examples/declarative/extending/signal/example.qml 0
-\snippet examples/declarative/extending/signal/example.qml 1
+\snippet examples/declarative/cppextensions/referenceexamples/signal/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/signal/example.qml 1
The QML snippet shown above associates the evaluation of a JavaScript expression
with the emission of a Qt signal.
@@ -406,7 +406,7 @@ signal name: "on" is prepended, and the first letter of the signal name upper
cased. For example, the signal used in the example above has the following
C++ signature:
-\snippet examples/declarative/extending/signal/birthdayparty.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.h 0
In classes with multiple signals with the same name, only the final signal
is accessible as a signal property. Note that signals with the same name
@@ -424,8 +424,8 @@ implement the onPartyStarted signal property.
\section1 Property Value Sources
-\snippet examples/declarative/extending/valuesource/example.qml 0
-\snippet examples/declarative/extending/valuesource/example.qml 1
+\snippet examples/declarative/cppextensions/referenceexamples/valuesource/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/valuesource/example.qml 1
The QML snippet shown above applies a property value source to the \c announcment property.
A property value source generates a value for a property that changes over time.
@@ -440,7 +440,7 @@ The example shown here is rather contrived: the \c announcment property of the
the \c HappyBirthdaySong value source generates the lyrics of the song
"Happy Birthday".
-\snippet examples/declarative/extending/valuesource/birthdayparty.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.h 0
Normally, assigning an object to a string property would not be allowed. In
the case of a property value source, rather than assigning the object instance
@@ -453,9 +453,9 @@ QDeclarativePropertyValueSource::setTarget(), that the QML engine invokes when
associating the property value source with a property. The relevant part of
the \c HappyBirthdaySong type declaration looks like this:
-\snippet examples/declarative/extending/valuesource/happybirthdaysong.h 0
-\snippet examples/declarative/extending/valuesource/happybirthdaysong.h 1
-\snippet examples/declarative/extending/valuesource/happybirthdaysong.h 2
+\snippet examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h 1
+\snippet examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h 2
In all other respects, property value sources are regular QML types. They must
be registered with the QML engine using the same macros as other types, and can
@@ -471,8 +471,8 @@ implement the \c HappyBirthdaySong property value source.
\section1 Property Binding
-\snippet examples/declarative/extending/binding/example.qml 0
-\snippet examples/declarative/extending/binding/example.qml 1
+\snippet examples/declarative/cppextensions/referenceexamples/binding/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/binding/example.qml 1
The QML snippet shown above uses a property binding to ensure the
\c HappyBirthdaySong's \c name property remains up to date with the \c host.
@@ -492,7 +492,7 @@ the property's value. QML relies on the presence of a
Here is the \c host property declaration:
-\snippet examples/declarative/extending/binding/birthdayparty.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.h 0
The NOTIFY attribute is followed by a signal name. It is the responsibility of
the class implementer to ensure that whenever the property's value changes, the
@@ -531,7 +531,7 @@ subsequently change. The most common case of this is when a type uses
only freed when the object is deleted. In these cases, the CONSTANT attribute
may be added to the property declaration instead of a NOTIFY signal.
-\snippet examples/declarative/extending/binding/person.h 0
+\snippet examples/declarative/cppextensions/referenceexamples/binding/person.h 0
Extreme care must be taken here or applications using your type may misbehave.
The CONSTANT attribute should only be used for properties whose value is set,
@@ -543,7 +543,7 @@ include NOTIFY signals for use in binding.
\section1 Extension Objects
-\snippet examples/declarative/extending/extended/example.qml 0
+\snippet examples/declarative/cppextensions/referenceexamples/extended/example.qml 0
The QML snippet shown above adds a new property to an existing C++ type without
modifying its source code.
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index bc9830a..2a83e30 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -382,7 +382,7 @@ of QDeclarativeEngine::offlineStoragePath(), currently as SQLite databases.
The API can be used from JavaScript functions in your QML:
-\quotefile declarative/sql/hello.qml
+\quotefile declarative/sqllocalstorage/hello.qml
The API conforms to the Synchronous API of the HTML5 Web Database API,
\link http://www.w3.org/TR/2009/WD-webdatabase-20091029/ W3C Working Draft 29 October 2009\endlink.
diff --git a/doc/src/declarative/integrating.qdoc b/doc/src/declarative/integrating.qdoc
index 972976f..83380a1 100644
--- a/doc/src/declarative/integrating.qdoc
+++ b/doc/src/declarative/integrating.qdoc
@@ -110,7 +110,7 @@ of QML UIs:
\section2 Loading QGraphicsWidget objects in QML
An alternative approach is to expose your existing QGraphicsWidget objects to
-QML and construct your scene in QML instead. See the \l {declarative/layouts/graphicsLayouts}{graphics layouts example}
+QML and construct your scene in QML instead. See the \l {declarative/cppextensions/qgraphicslayouts}{graphics layouts example}
which shows how to expose Qt's graphics layout classes to QML in order
to use QGraphicsWidget with classes like QGraphicsLinearLayout and QGraphicsGridLayout.
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 93e4a46..22113ee 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -40,79 +40,89 @@
****************************************************************************/
/*!
- \title Animations
- \example declarative/animations
+ \title Animation basics
+ \example declarative/animation/basics
This example shows how to use animations in QML.
*/
/*!
- \title AspectRatio
- \example declarative/aspectratio
+ \title Behaviors
+ \example declarative/animation/behaviors
+*/
- This example shows how to implement different aspect ratios in QML.
+/*!
+ \title Easing types
+ \example declarative/animation/easing
+
+ This example shows the different easing modes available for animations.
*/
/*!
- \example declarative/behaviors
- \title Behaviors
+ \title States
+ \example declarative/animation/states
*/
/*!
\title Border Image
- \example declarative/border-image
+ \example declarative/imageelements/borderimage
This example shows how to use a BorderImage in QML.
*/
/*!
- \title Clocks
- \example declarative/clocks
+ \title Image
+ \example declarative/imageelements/image
- This example shows how to create a Clock component and reuse it in a grid.
+ This example shows uses of the \l Image element in QML.
*/
/*!
- \title Connections
- \example declarative/connections
-
- This example shows how to use a Connection element in QML.
+ \title Reference examples
+ \example declarative/cppextensions/referenceexamples
*/
/*!
- \title Dial
- \example declarative/dial
+ \title Plugins
+ \example declarative/cppextensions/plugins
+*/
- This example shows how to implement a dial in QML.
+/*!
+ \title QtWidgets
+ \example declarative/cppextensions/proxywidgets
*/
/*!
- \title Dynamic
- \example declarative/dynamic
+ \title QGraphicsLayouts
+ \example declarative/cppextensions/qgraphicslayouts
+*/
- This example shows how to create dynamic objects QML.
+/*!
+ \title Image Provider
+ \example declarative/cppextensions/imageprovider
*/
/*!
- \example declarative/extending
- \title Extending
+ \title Network access manager
+ \example declarative/cppextensions/proxyviewer
*/
/*!
- \example declarative/fillmode
- \title Fillmode
+ \title Internationlization
+ \example declarative/i18n
*/
/*!
- \title Flipable
- \example declarative/flipable
+ \title Positioners
+ \example declarative/positioners
- This example shows how to use a Flipable element in QML.
+ This example shows how to use positioner elements such as Row, Column,
+ Grid and Flow.
*/
/*!
\title Focus
- \example declarative/focus
+ \example declarative/keyinteraction/focus
This example shows how to handle keys and focus in QML.
@@ -120,141 +130,149 @@
*/
/*!
- \example declarative/fonts
- \title Fonts
+ \title GridView
+ \example declarative/modelviews/gridview
*/
/*!
- \example declarative/gridview
- \title GridView
+ \title ListView
+ \example declarative/modelviews/listview
*/
/*!
- \example declarative/imageprovider
- \title Image Provider
+ \title Object ListModel
+ \example declarative/modelviews/objectlistmodel
*/
/*!
- \example declarative/images
- \title Images
+ \title Package
+ \example declarative/modelviews/package
*/
/*!
- \example declarative/layouts
- \title Layouts
+ \title Parallax
+ \example declarative/modelviews/parallax
*/
/*!
- \example declarative/listmodel-threaded
- \title ListModel Threaded
+ \title String ListModel
+ \example declarative/modelviews/stringlistmodel
*/
/*!
- \example declarative/listview
- \title ListView
+ \title WebView
+ \example declarative/modelviews/webview
*/
/*!
- \example declarative/mousearea
- \title Mouse Area
+ \title SQL Local Storage
+ \example declarative/sqllocalstorage
*/
/*!
- \example declarative/objectlistmodel
- \title Object ListModel
+ \title Fonts
+ \example declarative/text/fonts
*/
/*!
- \example declarative/package
- \title Package
+ \title Threaded ListModel
+ \example declarative/threading/threadedlistmodel
*/
/*!
- \example declarative/parallax
- \title Parallax
+ \title WorkerScript
+ \example declarative/threading/workerscript
*/
/*!
- \example declarative/plugins
- \title Plugins
+ \title Clocks
+ \example declarative/toys/clocks
+
+ This example shows how to create a Clock component and reuse it in a grid.
*/
/*!
- \example declarative/progressbar
- \title Progress Bars
+ \title Dial
+ \example declarative/toys/dial
+
+ This example shows how to implement a dial in QML.
*/
/*!
- \example declarative/proxywidgets
- \title Proxy Widgets
+ \title Dynamic
+ \example declarative/toys/dynamic
+
+ This example shows how to create dynamic objects QML.
*/
/*!
- \example declarative/scrollbar
- \title Scrollbar
+ \title Tic-Tac-Toe
+ \example declarative/toys/tic-tac-toe
*/
/*!
- \example declarative/searchbox
- \title Search Box
+ \title TV Tennis
+ \example declarative/toys/tvtennis
*/
/*!
- \example declarative/slideswitch
- \title Slide Switch
+ \title Velocity
+ \example declarative/toys/velocity
*/
/*!
- \example declarative/sql
- \title SQL
+ \title Gestures
+ \example declarative/touchinteraction/gestures
*/
/*!
- \example declarative/states
- \title States
+ \title Mouse Area
+ \example declarative/touchinteraction/mousearea
*/
/*!
- \example declarative/stringlistmodel
- \title String ListModel
+ \title Flipable
+ \example declarative/ui-components/flipable
+
+ This example shows how to use a Flipable element in QML.
*/
/*!
- \example declarative/tabwidget
- \title Tab Widget
+ \title Progress Bars
+ \example declarative/ui-components/progressbar
*/
/*!
- \example declarative/tic-tac-toe
- \title Tic-Tac-Toe
+ \title Scrollbar
+ \example declarative/ui-components/scrollbar
*/
/*!
- \example declarative/tvtennis
- \title TV Tennis
+ \title Search Box
+ \example declarative/ui-components/searchbox
*/
/*!
- \example declarative/velocity
- \title Velocity
+ \title Slide Switch
+ \example declarative/ui-components/slideswitch
*/
/*!
- \example declarative/webview
- \title WebView
+ \title Spinner
+ \example declarative/ui-components/spinner
*/
/*!
- \example declarative/workerscript
- \title WorkerScript
+ \title Tab Widget
+ \example declarative/ui-components/tabwidget
*/
/*!
- \example declarative/xmldata
\title XML Data
+ \example declarative/xml/xmldata
*/
/*!
- \example declarative/xmlhttprequest
\title XMLHttpRequest
+ \example declarative/xml/xmlhttprequest
*/
diff --git a/doc/src/snippets/declarative/border-image.qml b/doc/src/snippets/declarative/borderimage.qml
index 9c4247e..9c4247e 100644
--- a/doc/src/snippets/declarative/border-image.qml
+++ b/doc/src/snippets/declarative/borderimage.qml
diff --git a/examples/declarative/xmlhttprequest/xmlhttprequest.qmlproject b/examples/declarative/animation/animation.qmlproject
index d4909f8..d4909f8 100644
--- a/examples/declarative/xmlhttprequest/xmlhttprequest.qmlproject
+++ b/examples/declarative/animation/animation.qmlproject
diff --git a/examples/declarative/xmldata/xmldata.qmlproject b/examples/declarative/animation/basics/basics.qmlproject
index d4909f8..d4909f8 100644
--- a/examples/declarative/xmldata/xmldata.qmlproject
+++ b/examples/declarative/animation/basics/basics.qmlproject
diff --git a/examples/declarative/animations/color-animation.qml b/examples/declarative/animation/basics/color-animation.qml
index 61737e9..61737e9 100644
--- a/examples/declarative/animations/color-animation.qml
+++ b/examples/declarative/animation/basics/color-animation.qml
diff --git a/examples/declarative/parallax/pics/face-smile.png b/examples/declarative/animation/basics/images/face-smile.png
index 3d66d72..3d66d72 100644
--- a/examples/declarative/parallax/pics/face-smile.png
+++ b/examples/declarative/animation/basics/images/face-smile.png
Binary files differ
diff --git a/examples/declarative/animations/images/moon.png b/examples/declarative/animation/basics/images/moon.png
index 9407b2b..9407b2b 100644
--- a/examples/declarative/animations/images/moon.png
+++ b/examples/declarative/animation/basics/images/moon.png
Binary files differ
diff --git a/examples/declarative/parallax/pics/shadow.png b/examples/declarative/animation/basics/images/shadow.png
index 8270565..8270565 100644
--- a/examples/declarative/parallax/pics/shadow.png
+++ b/examples/declarative/animation/basics/images/shadow.png
Binary files differ
diff --git a/examples/declarative/dynamic/images/star.png b/examples/declarative/animation/basics/images/star.png
index 27ef924..27ef924 100644
--- a/examples/declarative/dynamic/images/star.png
+++ b/examples/declarative/animation/basics/images/star.png
Binary files differ
diff --git a/examples/declarative/dynamic/images/sun.png b/examples/declarative/animation/basics/images/sun.png
index 7713ca5..7713ca5 100644
--- a/examples/declarative/dynamic/images/sun.png
+++ b/examples/declarative/animation/basics/images/sun.png
Binary files differ
diff --git a/examples/declarative/animations/property-animation.qml b/examples/declarative/animation/basics/property-animation.qml
index 87ac8ec..87ac8ec 100644
--- a/examples/declarative/animations/property-animation.qml
+++ b/examples/declarative/animation/basics/property-animation.qml
diff --git a/examples/declarative/behaviors/SideRect.qml b/examples/declarative/animation/behaviors/SideRect.qml
index d32bd7b..d32bd7b 100644
--- a/examples/declarative/behaviors/SideRect.qml
+++ b/examples/declarative/animation/behaviors/SideRect.qml
diff --git a/examples/declarative/behaviors/behavior-example.qml b/examples/declarative/animation/behaviors/behavior-example.qml
index 1f17b81..1f17b81 100644
--- a/examples/declarative/behaviors/behavior-example.qml
+++ b/examples/declarative/animation/behaviors/behavior-example.qml
diff --git a/examples/declarative/behaviors/behaviors.qmlproject b/examples/declarative/animation/behaviors/behaviors.qmlproject
index d4909f8..d4909f8 100644
--- a/examples/declarative/behaviors/behaviors.qmlproject
+++ b/examples/declarative/animation/behaviors/behaviors.qmlproject
diff --git a/examples/declarative/animations/easing.qml b/examples/declarative/animation/easing/easing.qml
index 939d43b..939d43b 100644
--- a/examples/declarative/animations/easing.qml
+++ b/examples/declarative/animation/easing/easing.qml
diff --git a/examples/declarative/workerscript/workerscript.qmlproject b/examples/declarative/animation/easing/easing.qmlproject
index d4909f8..d4909f8 100644
--- a/examples/declarative/workerscript/workerscript.qmlproject
+++ b/examples/declarative/animation/easing/easing.qmlproject
diff --git a/examples/declarative/states/states.qml b/examples/declarative/animation/states/states.qml
index 4429e78..4429e78 100644
--- a/examples/declarative/states/states.qml
+++ b/examples/declarative/animation/states/states.qml
diff --git a/examples/declarative/states/states.qmlproject b/examples/declarative/animation/states/states.qmlproject
index d4909f8..d4909f8 100644
--- a/examples/declarative/states/states.qmlproject
+++ b/examples/declarative/animation/states/states.qmlproject
diff --git a/examples/declarative/states/transitions.qml b/examples/declarative/animation/states/transitions.qml
index ccc7060..ccc7060 100644
--- a/examples/declarative/states/transitions.qml
+++ b/examples/declarative/animation/states/transitions.qml
diff --git a/examples/declarative/states/user.png b/examples/declarative/animation/states/user.png
index dd7d7a2..dd7d7a2 100644
--- a/examples/declarative/states/user.png
+++ b/examples/declarative/animation/states/user.png
Binary files differ
diff --git a/examples/declarative/connections/connections-example.qml b/examples/declarative/connections/connections-example.qml
deleted file mode 100644
index e65a280..0000000
--- a/examples/declarative/connections/connections-example.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-import Qt 4.7
-import "content"
-
-Rectangle {
- id: window
-
- property int angle: 0
-
- width: 640; height: 480
- color: "#646464"
-
- Image {
- id: image
- source: "content/bg1.jpg"
- anchors.centerIn: parent
- rotation: window.angle
-
- Behavior on rotation {
- NumberAnimation { easing.type: Easing.OutCubic; duration: 300 }
- }
- }
-
- Button {
- id: leftButton
- image: "content/rotate-left.png"
- anchors { left: parent.left; bottom: parent.bottom; leftMargin: 10; bottomMargin: 10 }
- }
-
- Button {
- id: rightButton
- image: "content/rotate-right.png"
- anchors { right: parent.right; bottom: parent.bottom; rightMargin: 10; bottomMargin: 10 }
- }
-
- Connections { target: leftButton; onClicked: window.angle -= 90 }
- Connections { target: rightButton; onClicked: window.angle += 90 }
-}
diff --git a/examples/declarative/connections/content/Button.qml b/examples/declarative/connections/content/Button.qml
deleted file mode 100644
index f95afbb..0000000
--- a/examples/declarative/connections/content/Button.qml
+++ /dev/null
@@ -1,12 +0,0 @@
-import Qt 4.7
-
-Item {
- id: button
- width: 48; height: 48
-
- property alias image: icon.source
- signal clicked
-
- Image { id: icon }
- MouseArea { anchors.fill: icon; onClicked: button.clicked() }
-}
diff --git a/examples/declarative/connections/content/bg1.jpg b/examples/declarative/connections/content/bg1.jpg
deleted file mode 100644
index dfc7cee..0000000
--- a/examples/declarative/connections/content/bg1.jpg
+++ /dev/null
Binary files differ
diff --git a/examples/declarative/connections/content/rotate-left.png b/examples/declarative/connections/content/rotate-left.png
deleted file mode 100644
index c30387e..0000000
--- a/examples/declarative/connections/content/rotate-left.png
+++ /dev/null
Binary files differ
diff --git a/examples/declarative/connections/content/rotate-right.png b/examples/declarative/connections/content/rotate-right.png
deleted file mode 100644
index 1b05674..0000000
--- a/examples/declarative/connections/content/rotate-right.png
+++ /dev/null
Binary files differ
diff --git a/examples/declarative/cppextensions/cppextensions.pro b/examples/declarative/cppextensions/cppextensions.pro
new file mode 100644
index 0000000..caa6092
--- /dev/null
+++ b/examples/declarative/cppextensions/cppextensions.pro
@@ -0,0 +1,10 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+ imageprovider \
+ plugins \
+ proxyviewer \
+ proxywidgets \
+ qgraphicslayouts \
+ referenceexamples
+
diff --git a/examples/declarative/webview/webview.qmlproject b/examples/declarative/cppextensions/cppextensions.qmlproject
index d4909f8..d4909f8 100644
--- a/examples/declarative/webview/webview.qmlproject
+++ b/examples/declarative/cppextensions/cppextensions.qmlproject
diff --git a/examples/declarative/imageprovider/ImageProviderCore/qmldir b/examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir
index 1028590..1028590 100644
--- a/examples/declarative/imageprovider/ImageProviderCore/qmldir
+++ b/examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir
diff --git a/examples/declarative/imageprovider/imageprovider-example.qml b/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
index d774112..d774112 100644
--- a/examples/declarative/imageprovider/imageprovider-example.qml
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
diff --git a/examples/declarative/imageprovider/imageprovider.cpp b/examples/declarative/cppextensions/imageprovider/imageprovider.cpp
index 4c4aa94..4c4aa94 100644
--- a/examples/declarative/imageprovider/imageprovider.cpp
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider.cpp
diff --git a/examples/declarative/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
index 945a301..945a301 100644
--- a/examples/declarative/imageprovider/imageprovider.pro
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
diff --git a/examples/declarative/imageprovider/imageprovider.qmlproject b/examples/declarative/cppextensions/imageprovider/imageprovider.qmlproject
index d4909f8..d4909f8 100644
--- a/examples/declarative/imageprovider/imageprovider.qmlproject
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider.qmlproject
diff --git a/examples/declarative/plugins/README b/examples/declarative/cppextensions/plugins/README
index fe519f8..fe519f8 100644
--- a/examples/declarative/plugins/README
+++ b/examples/declarative/cppextensions/plugins/README
diff --git a/examples/declarative/plugins/com/nokia/TimeExample/Clock.qml b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
index 0048372..0048372 100644
--- a/examples/declarative/plugins/com/nokia/TimeExample/Clock.qml
+++ b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
diff --git a/examples/declarative/plugins/com/nokia/TimeExample/center.png b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/center.png
index 7fbd802..7fbd802 100644
--- a/examples/declarative/plugins/com/nokia/TimeExample/center.png
+++ b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/center.png
Binary files differ
diff --git a/examples/declarative/plugins/com/nokia/TimeExample/clock.png b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/clock.png
index 462edac..462edac 100644
--- a/examples/declarative/plugins/com/nokia/TimeExample/clock.png
+++ b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/clock.png
Binary files differ
diff --git a/examples/declarative/plugins/com/nokia/TimeExample/hour.png b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/hour.png
index f8061a1..f8061a1 100644
--- a/examples/declarative/plugins/com/nokia/TimeExample/hour.png
+++ b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/hour.png
Binary files differ
diff --git a/examples/declarative/plugins/com/nokia/TimeExample/minute.png b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/minute.png
index 1297ec7..1297ec7 100644
--- a/examples/declarative/plugins/com/nokia/TimeExample/minute.png
+++ b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/minute.png
Binary files differ
diff --git a/examples/declarative/plugins/com/nokia/TimeExample/qmldir b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir
index e9ef115..e9ef115 100644
--- a/examples/declarative/plugins/com/nokia/TimeExample/qmldir
+++ b/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir
diff --git a/examples/declarative/plugins/plugin.cpp b/examples/declarative/cppextensions/plugins/plugin.cpp
index fb51b0c..fb51b0c 100644
--- a/examples/declarative/plugins/plugin.cpp
+++ b/examples/declarative/cppextensions/plugins/plugin.cpp
diff --git a/examples/declarative/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro
index b501ae3..b501ae3 100644
--- a/examples/declarative/plugins/plugins.pro
+++ b/examples/declarative/cppextensions/plugins/plugins.pro
diff --git a/examples/declarative/plugins/plugins.qml b/examples/declarative/cppextensions/plugins/plugins.qml
index 449cd9a..449cd9a 100644
--- a/examples/declarative/plugins/plugins.qml
+++ b/examples/declarative/cppextensions/plugins/plugins.qml
diff --git a/examples/declarative/plugins/plugins.qmlproject b/examples/declarative/cppextensions/plugins/plugins.qmlproject
index d4909f8..d4909f8 100644
--- a/examples/declarative/plugins/plugins.qmlproject
+++ b/examples/declarative/cppextensions/plugins/plugins.qmlproject
diff --git a/examples/declarative/proxyviewer/main.cpp b/examples/declarative/cppextensions/proxyviewer/main.cpp
index b82d2c9..b82d2c9 100644
--- a/examples/declarative/proxyviewer/main.cpp
+++ b/examples/declarative/cppextensions/proxyviewer/main.cpp
diff --git a/examples/declarative/proxyviewer/proxyviewer.pro b/examples/declarative/cppextensions/proxyviewer/proxyviewer.pro
index b6bfa7f..b6bfa7f 100644
--- a/examples/declarative/proxyviewer/proxyviewer.pro
+++ b/examples/declarative/cppextensions/proxyviewer/proxyviewer.pro
diff --git a/examples/declarative/proxyviewer/proxyviewer.qrc b/examples/declarative/cppextensions/proxyviewer/proxyviewer.qrc
index 17e9301..17e9301 100644
--- a/examples/declarative/proxyviewer/proxyviewer.qrc
+++ b/examples/declarative/cppextensions/proxyviewer/proxyviewer.qrc
diff --git a/examples/declarative/proxyviewer/view.qml b/examples/declarative/cppextensions/proxyviewer/view.qml
index 7f1bdef..7f1bdef 100644
--- a/examples/declarative/proxyviewer/view.qml
+++ b/examples/declarative/cppextensions/proxyviewer/view.qml
diff --git a/examples/declarative/proxywidgets/ProxyWidgets/qmldir b/examples/declarative/cppextensions/proxywidgets/ProxyWidgets/qmldir
index e55267c..e55267c 100644
--- a/examples/declarative/proxywidgets/ProxyWidgets/qmldir
+++ b/examples/declarative/cppextensions/proxywidgets/ProxyWidgets/qmldir
diff --git a/examples/declarative/proxywidgets/README b/examples/declarative/cppextensions/proxywidgets/README
index f50fa22..f50fa22 100644
--- a/examples/declarative/proxywidgets/README
+++ b/examples/declarative/cppextensions/proxywidgets/README
diff --git a/examples/declarative/proxywidgets/proxywidgets.cpp b/examples/declarative/cppextensions/proxywidgets/proxywidgets.cpp
index 067eb2c..067eb2c 100644
--- a/examples/declarative/proxywidgets/proxywidgets.cpp
+++ b/examples/declarative/cppextensions/proxywidgets/proxywidgets.cpp
diff --git a/examples/declarative/proxywidgets/proxywidgets.pro b/examples/declarative/cppextensions/proxywidgets/proxywidgets.pro
index cb07d80..cb07d80 100644
--- a/examples/declarative/proxywidgets/proxywidgets.pro
+++ b/examples/declarative/cppextensions/proxywidgets/proxywidgets.pro
diff --git a/examples/declarative/proxywidgets/proxywidgets.qml b/examples/declarative/cppextensions/proxywidgets/proxywidgets.qml
index 88de37f..88de37f 100644
--- a/examples/declarative/proxywidgets/proxywidgets.qml
+++ b/examples/declarative/cppextensions/proxywidgets/proxywidgets.qml
diff --git a/examples/declarative/proxywidgets/proxywidgets.qmlproject b/examples/declarative/cppextensions/proxywidgets/proxywidgets.qmlproject
index d4909f8..d4909f8 100644
--- a/examples/declarative/proxywidgets/proxywidgets.qmlproject
+++ b/examples/declarative/cppextensions/proxywidgets/proxywidgets.qmlproject
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.cpp b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.cpp
index 25cf994..25cf994 100644
--- a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.cpp
+++ b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.cpp
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.pro b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro
index e5d91b2..e5d91b2 100644
--- a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.pro
+++ b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qml b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qml
index fcd78d5..fcd78d5 100644
--- a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qml
+++ b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qml
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qrc b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qrc
index a199f8d..a199f8d 100644
--- a/examples/declarative/layouts/graphicsLayouts/graphicslayouts.qrc
+++ b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qrc
diff --git a/examples/declarative/layouts/graphicsLayouts/graphicslayouts_p.h b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts_p.h
index ea9c614..ea9c614 100644
--- a/examples/declarative/layouts/graphicsLayouts/graphicslayouts_p.h
+++ b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts_p.h
diff --git a/examples/declarative/layouts/graphicsLayouts/main.cpp b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/main.cpp
index 89b69bf..89b69bf 100644
--- a/examples/declarative/layouts/graphicsLayouts/main.cpp
+++ b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/main.cpp
diff --git a/examples/declarative/layouts/layoutItem/layoutItem.pro b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.pro
index 4a3fc73..4a3fc73 100644
--- a/examples/declarative/layouts/layoutItem/layoutItem.pro
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.pro
diff --git a/examples/declarative/layouts/layoutItem/layoutItem.qml b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qml
index 460c564..460c564 100644
--- a/examples/declarative/layouts/layoutItem/layoutItem.qml
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qml
diff --git a/examples/declarative/layouts/layoutItem/layoutItem.qrc b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qrc
index deb0fba..deb0fba 100644
--- a/examples/declarative/layouts/layoutItem/layoutItem.qrc
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qrc
diff --git a/examples/declarative/layouts/layoutItem/main.cpp b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/main.cpp
index a104251..a104251 100644
--- a/examples/declarative/layouts/layoutItem/main.cpp
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/main.cpp
diff --git a/examples/declarative/velocity/velocity.qmlproject b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.qmlproject
index d4909f8..d4909f8 100644
--- a/examples/declarative/velocity/velocity.qmlproject
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.qmlproject
diff --git a/examples/declarative/extending/adding/adding.pro b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro
index 6072de4..6072de4 100644
--- a/examples/declarative/extending/adding/adding.pro
+++ b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro
diff --git a/examples/declarative/extending/adding/adding.qrc b/examples/declarative/cppextensions/referenceexamples/adding/adding.qrc
index e2fa01d..e2fa01d 100644
--- a/examples/declarative/extending/adding/adding.qrc
+++ b/examples/declarative/cppextensions/referenceexamples/adding/adding.qrc
diff --git a/examples/declarative/extending/adding/example.qml b/examples/declarative/cppextensions/referenceexamples/adding/example.qml
index dc891e7..dc891e7 100644
--- a/examples/declarative/extending/adding/example.qml
+++ b/examples/declarative/cppextensions/referenceexamples/adding/example.qml
diff --git a/examples/declarative/extending/adding/main.cpp b/examples/declarative/cppextensions/referenceexamples/adding/main.cpp
index 7b33895..7b33895 100644
--- a/examples/declarative/extending/adding/main.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/adding/main.cpp
diff --git a/examples/declarative/extending/adding/person.cpp b/examples/declarative/cppextensions/referenceexamples/adding/person.cpp
index cdf08e0..cdf08e0 100644
--- a/examples/declarative/extending/adding/person.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/adding/person.cpp
diff --git a/examples/declarative/extending/adding/person.h b/examples/declarative/cppextensions/referenceexamples/adding/person.h
index d6de9a9..d6de9a9 100644
--- a/examples/declarative/extending/adding/person.h
+++ b/examples/declarative/cppextensions/referenceexamples/adding/person.h
diff --git a/examples/declarative/extending/attached/attached.pro b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro
index f6d76ed..f6d76ed 100644
--- a/examples/declarative/extending/attached/attached.pro
+++ b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro
diff --git a/examples/declarative/extending/attached/attached.qrc b/examples/declarative/cppextensions/referenceexamples/attached/attached.qrc
index e2fa01d..e2fa01d 100644
--- a/examples/declarative/extending/attached/attached.qrc
+++ b/examples/declarative/cppextensions/referenceexamples/attached/attached.qrc
diff --git a/examples/declarative/extending/attached/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.cpp
index 7fa1748..7fa1748 100644
--- a/examples/declarative/extending/attached/birthdayparty.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.cpp
diff --git a/examples/declarative/extending/attached/birthdayparty.h b/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.h
index 1c66f8c..1c66f8c 100644
--- a/examples/declarative/extending/attached/birthdayparty.h
+++ b/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.h
diff --git a/examples/declarative/extending/attached/example.qml b/examples/declarative/cppextensions/referenceexamples/attached/example.qml
index 50f0a32..50f0a32 100644
--- a/examples/declarative/extending/attached/example.qml
+++ b/examples/declarative/cppextensions/referenceexamples/attached/example.qml
diff --git a/examples/declarative/extending/attached/main.cpp b/examples/declarative/cppextensions/referenceexamples/attached/main.cpp
index f1055ae..f1055ae 100644
--- a/examples/declarative/extending/attached/main.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/attached/main.cpp
diff --git a/examples/declarative/extending/valuesource/person.cpp b/examples/declarative/cppextensions/referenceexamples/attached/person.cpp
index 0a9e508..0a9e508 100644
--- a/examples/declarative/extending/valuesource/person.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/attached/person.cpp
diff --git a/examples/declarative/extending/valuesource/person.h b/examples/declarative/cppextensions/referenceexamples/attached/person.h
index 2f444c5..2f444c5 100644
--- a/examples/declarative/extending/valuesource/person.h
+++ b/examples/declarative/cppextensions/referenceexamples/attached/person.h
diff --git a/examples/declarative/extending/binding/binding.pro b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro
index 896ce25..896ce25 100644
--- a/examples/declarative/extending/binding/binding.pro
+++ b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro
diff --git a/examples/declarative/extending/binding/binding.qrc b/examples/declarative/cppextensions/referenceexamples/binding/binding.qrc
index e2fa01d..e2fa01d 100644
--- a/examples/declarative/extending/binding/binding.qrc
+++ b/examples/declarative/cppextensions/referenceexamples/binding/binding.qrc
diff --git a/examples/declarative/extending/binding/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.cpp
index 000bb1f..000bb1f 100644
--- a/examples/declarative/extending/binding/birthdayparty.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.cpp
diff --git a/examples/declarative/extending/binding/birthdayparty.h b/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.h
index c3f033e..c3f033e 100644
--- a/examples/declarative/extending/binding/birthdayparty.h
+++ b/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.h
diff --git a/examples/declarative/extending/binding/example.qml b/examples/declarative/cppextensions/referenceexamples/binding/example.qml
index 82eb3be..82eb3be 100644
--- a/examples/declarative/extending/binding/example.qml
+++ b/examples/declarative/cppextensions/referenceexamples/binding/example.qml
diff --git a/examples/declarative/extending/binding/happybirthdaysong.cpp b/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.cpp
index a40e7fb..a40e7fb 100644
--- a/examples/declarative/extending/binding/happybirthdaysong.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.cpp
diff --git a/examples/declarative/extending/binding/happybirthdaysong.h b/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.h
index e825b86..e825b86 100644
--- a/examples/declarative/extending/binding/happybirthdaysong.h
+++ b/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.h
diff --git a/examples/declarative/extending/binding/main.cpp b/examples/declarative/cppextensions/referenceexamples/binding/main.cpp
index 2495676..2495676 100644
--- a/examples/declarative/extending/binding/main.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/binding/main.cpp
diff --git a/examples/declarative/extending/binding/person.cpp b/examples/declarative/cppextensions/referenceexamples/binding/person.cpp
index 9a2248f..9a2248f 100644
--- a/examples/declarative/extending/binding/person.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/binding/person.cpp
diff --git a/examples/declarative/extending/binding/person.h b/examples/declarative/cppextensions/referenceexamples/binding/person.h
index 2a68da0..2a68da0 100644
--- a/examples/declarative/extending/binding/person.h
+++ b/examples/declarative/cppextensions/referenceexamples/binding/person.h
diff --git a/examples/declarative/extending/grouped/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.cpp
index 4f415a3..4f415a3 100644
--- a/examples/declarative/extending/grouped/birthdayparty.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.cpp
diff --git a/examples/declarative/extending/coercion/birthdayparty.h b/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.h
index ee77e9a..ee77e9a 100644
--- a/examples/declarative/extending/coercion/birthdayparty.h
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.h
diff --git a/examples/declarative/extending/coercion/coercion.pro b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro
index c8daed8..c8daed8 100644
--- a/examples/declarative/extending/coercion/coercion.pro
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro
diff --git a/examples/declarative/extending/coercion/coercion.qrc b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc
index e2fa01d..e2fa01d 100644
--- a/examples/declarative/extending/coercion/coercion.qrc
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc
diff --git a/examples/declarative/extending/coercion/example.qml b/examples/declarative/cppextensions/referenceexamples/coercion/example.qml
index 7b45950..7b45950 100644
--- a/examples/declarative/extending/coercion/example.qml
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/example.qml
diff --git a/examples/declarative/extending/coercion/main.cpp b/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp
index 2c7b545..2c7b545 100644
--- a/examples/declarative/extending/coercion/main.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp
diff --git a/examples/declarative/extending/coercion/person.cpp b/examples/declarative/cppextensions/referenceexamples/coercion/person.cpp
index 5b5203a..5b5203a 100644
--- a/examples/declarative/extending/coercion/person.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/person.cpp
diff --git a/examples/declarative/extending/coercion/person.h b/examples/declarative/cppextensions/referenceexamples/coercion/person.h
index 1c95da7..1c95da7 100644
--- a/examples/declarative/extending/coercion/person.h
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/person.h
diff --git a/examples/declarative/extending/default/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.cpp
index 4f415a3..4f415a3 100644
--- a/examples/declarative/extending/default/birthdayparty.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.cpp
diff --git a/examples/declarative/extending/default/birthdayparty.h b/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.h
index 9741040..9741040 100644
--- a/examples/declarative/extending/default/birthdayparty.h
+++ b/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.h
diff --git a/examples/declarative/extending/default/default.pro b/examples/declarative/cppextensions/referenceexamples/default/default.pro
index 32aff0b..32aff0b 100644
--- a/examples/declarative/extending/default/default.pro
+++ b/examples/declarative/cppextensions/referenceexamples/default/default.pro
diff --git a/examples/declarative/extending/default/default.qrc b/examples/declarative/cppextensions/referenceexamples/default/default.qrc
index e2fa01d..e2fa01d 100644
--- a/examples/declarative/extending/default/default.qrc
+++ b/examples/declarative/cppextensions/referenceexamples/default/default.qrc
diff --git a/examples/declarative/extending/default/example.qml b/examples/declarative/cppextensions/referenceexamples/default/example.qml
index c0f3cbb..c0f3cbb 100644
--- a/examples/declarative/extending/default/example.qml
+++ b/examples/declarative/cppextensions/referenceexamples/default/example.qml
diff --git a/examples/declarative/extending/default/main.cpp b/examples/declarative/cppextensions/referenceexamples/default/main.cpp
index 2ffd180..2ffd180 100644
--- a/examples/declarative/extending/default/main.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/default/main.cpp
diff --git a/examples/declarative/extending/default/person.cpp b/examples/declarative/cppextensions/referenceexamples/default/person.cpp
index 69216d3..69216d3 100644
--- a/examples/declarative/extending/default/person.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/default/person.cpp
diff --git a/examples/declarative/extending/default/person.h b/examples/declarative/cppextensions/referenceexamples/default/person.h
index 3e56860..3e56860 100644
--- a/examples/declarative/extending/default/person.h
+++ b/examples/declarative/cppextensions/referenceexamples/default/person.h
diff --git a/examples/declarative/extending/extended/example.qml b/examples/declarative/cppextensions/referenceexamples/extended/example.qml
index 985ce20..985ce20 100644
--- a/examples/declarative/extending/extended/example.qml
+++ b/examples/declarative/cppextensions/referenceexamples/extended/example.qml
diff --git a/examples/declarative/extending/extended/extended.pro b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
index 97af286..97af286 100644
--- a/examples/declarative/extending/extended/extended.pro
+++ b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
diff --git a/examples/declarative/extending/extended/extended.qrc b/examples/declarative/cppextensions/referenceexamples/extended/extended.qrc
index e2fa01d..e2fa01d 100644
--- a/examples/declarative/extending/extended/extended.qrc
+++ b/examples/declarative/cppextensions/referenceexamples/extended/extended.qrc
diff --git a/examples/declarative/extending/extended/lineedit.cpp b/examples/declarative/cppextensions/referenceexamples/extended/lineedit.cpp
index 0e521ec..0e521ec 100644
--- a/examples/declarative/extending/extended/lineedit.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/extended/lineedit.cpp
diff --git a/examples/declarative/extending/extended/lineedit.h b/examples/declarative/cppextensions/referenceexamples/extended/lineedit.h
index 3a464b0..3a464b0 100644
--- a/examples/declarative/extending/extended/lineedit.h
+++ b/examples/declarative/cppextensions/referenceexamples/extended/lineedit.h
diff --git a/examples/declarative/extending/extended/main.cpp b/examples/declarative/cppextensions/referenceexamples/extended/main.cpp
index ca7242d..ca7242d 100644
--- a/examples/declarative/extending/extended/main.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/extended/main.cpp
diff --git a/examples/declarative/extending/coercion/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.cpp
index 4f415a3..4f415a3 100644
--- a/examples/declarative/extending/coercion/birthdayparty.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.cpp
diff --git a/examples/declarative/extending/grouped/birthdayparty.h b/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.h
index 31d21b2..31d21b2 100644
--- a/examples/declarative/extending/grouped/birthdayparty.h
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.h
diff --git a/examples/declarative/extending/grouped/example.qml b/examples/declarative/cppextensions/referenceexamples/grouped/example.qml
index 91b7a06..91b7a06 100644
--- a/examples/declarative/extending/grouped/example.qml
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/example.qml
diff --git a/examples/declarative/extending/grouped/grouped.pro b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro
index 576e1d2..576e1d2 100644
--- a/examples/declarative/extending/grouped/grouped.pro
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro
diff --git a/examples/declarative/extending/grouped/grouped.qrc b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.qrc
index e2fa01d..e2fa01d 100644
--- a/examples/declarative/extending/grouped/grouped.qrc
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.qrc
diff --git a/examples/declarative/extending/grouped/main.cpp b/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp
index baf32cf..baf32cf 100644
--- a/examples/declarative/extending/grouped/main.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp
diff --git a/examples/declarative/extending/signal/person.cpp b/examples/declarative/cppextensions/referenceexamples/grouped/person.cpp
index 0a9e508..0a9e508 100644
--- a/examples/declarative/extending/signal/person.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/person.cpp
diff --git a/examples/declarative/extending/grouped/person.h b/examples/declarative/cppextensions/referenceexamples/grouped/person.h
index a031e69..a031e69 100644
--- a/examples/declarative/extending/grouped/person.h
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/person.h
diff --git a/examples/declarative/extending/properties/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp
index 27d17a1..27d17a1 100644
--- a/examples/declarative/extending/properties/birthdayparty.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp
diff --git a/examples/declarative/extending/properties/birthdayparty.h b/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h
index 39ce9ba..39ce9ba 100644
--- a/examples/declarative/extending/properties/birthdayparty.h
+++ b/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h
diff --git a/examples/declarative/extending/properties/example.qml b/examples/declarative/cppextensions/referenceexamples/properties/example.qml
index 35abdd6..35abdd6 100644
--- a/examples/declarative/extending/properties/example.qml
+++ b/examples/declarative/cppextensions/referenceexamples/properties/example.qml
diff --git a/examples/declarative/extending/properties/main.cpp b/examples/declarative/cppextensions/referenceexamples/properties/main.cpp
index 85e9584..85e9584 100644
--- a/examples/declarative/extending/properties/main.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/properties/main.cpp
diff --git a/examples/declarative/extending/properties/person.cpp b/examples/declarative/cppextensions/referenceexamples/properties/person.cpp
index 92c54f5..92c54f5 100644
--- a/examples/declarative/extending/properties/person.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/properties/person.cpp
diff --git a/examples/declarative/extending/properties/person.h b/examples/declarative/cppextensions/referenceexamples/properties/person.h
index 0029b09..0029b09 100644
--- a/examples/declarative/extending/properties/person.h
+++ b/examples/declarative/cppextensions/referenceexamples/properties/person.h
diff --git a/examples/declarative/extending/properties/properties.pro b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro
index a8f4301..a8f4301 100644
--- a/examples/declarative/extending/properties/properties.pro
+++ b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro
diff --git a/examples/declarative/extending/properties/properties.qrc b/examples/declarative/cppextensions/referenceexamples/properties/properties.qrc
index e2fa01d..e2fa01d 100644
--- a/examples/declarative/extending/properties/properties.qrc
+++ b/examples/declarative/cppextensions/referenceexamples/properties/properties.qrc
diff --git a/examples/declarative/extending/extending.pro b/examples/declarative/cppextensions/referenceexamples/referenceexamples.pro
index 169c7ab..169c7ab 100644
--- a/examples/declarative/extending/extending.pro
+++ b/examples/declarative/cppextensions/referenceexamples/referenceexamples.pro
diff --git a/examples/declarative/tvtennis/tvtennis.qmlproject b/examples/declarative/cppextensions/referenceexamples/referenceexamples.qmlproject
index d4909f8..d4909f8 100644
--- a/examples/declarative/tvtennis/tvtennis.qmlproject
+++ b/examples/declarative/cppextensions/referenceexamples/referenceexamples.qmlproject
diff --git a/examples/declarative/extending/signal/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.cpp
index 740c8c9..740c8c9 100644
--- a/examples/declarative/extending/signal/birthdayparty.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.cpp
diff --git a/examples/declarative/extending/signal/birthdayparty.h b/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.h
index ae4dd39..ae4dd39 100644
--- a/examples/declarative/extending/signal/birthdayparty.h
+++ b/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.h
diff --git a/examples/declarative/extending/signal/example.qml b/examples/declarative/cppextensions/referenceexamples/signal/example.qml
index 83d6a23..83d6a23 100644
--- a/examples/declarative/extending/signal/example.qml
+++ b/examples/declarative/cppextensions/referenceexamples/signal/example.qml
diff --git a/examples/declarative/extending/signal/main.cpp b/examples/declarative/cppextensions/referenceexamples/signal/main.cpp
index 453f688..453f688 100644
--- a/examples/declarative/extending/signal/main.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/signal/main.cpp
diff --git a/examples/declarative/extending/grouped/person.cpp b/examples/declarative/cppextensions/referenceexamples/signal/person.cpp
index 0a9e508..0a9e508 100644
--- a/examples/declarative/extending/grouped/person.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/signal/person.cpp
diff --git a/examples/declarative/extending/signal/person.h b/examples/declarative/cppextensions/referenceexamples/signal/person.h
index 2f444c5..2f444c5 100644
--- a/examples/declarative/extending/signal/person.h
+++ b/examples/declarative/cppextensions/referenceexamples/signal/person.h
diff --git a/examples/declarative/extending/signal/signal.pro b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro
index 6367a38..6367a38 100644
--- a/examples/declarative/extending/signal/signal.pro
+++ b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro
diff --git a/examples/declarative/extending/signal/signal.qrc b/examples/declarative/cppextensions/referenceexamples/signal/signal.qrc
index e2fa01d..e2fa01d 100644
--- a/examples/declarative/extending/signal/signal.qrc
+++ b/examples/declarative/cppextensions/referenceexamples/signal/signal.qrc
diff --git a/examples/declarative/extending/valuesource/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.cpp
index b915f4f..b915f4f 100644
--- a/examples/declarative/extending/valuesource/birthdayparty.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.cpp
diff --git a/examples/declarative/extending/valuesource/birthdayparty.h b/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.h
index 5f25781..5f25781 100644
--- a/examples/declarative/extending/valuesource/birthdayparty.h
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.h
diff --git a/examples/declarative/extending/valuesource/example.qml b/examples/declarative/cppextensions/referenceexamples/valuesource/example.qml
index 5b8c8af..5b8c8af 100644
--- a/examples/declarative/extending/valuesource/example.qml
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/example.qml
diff --git a/examples/declarative/extending/valuesource/happybirthdaysong.cpp b/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp
index 8ea5c2b..8ea5c2b 100644
--- a/examples/declarative/extending/valuesource/happybirthdaysong.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp
diff --git a/examples/declarative/extending/valuesource/happybirthdaysong.h b/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h
index 3d07909..3d07909 100644
--- a/examples/declarative/extending/valuesource/happybirthdaysong.h
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h
diff --git a/examples/declarative/extending/valuesource/main.cpp b/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp
index 00840ee..00840ee 100644
--- a/examples/declarative/extending/valuesource/main.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp
diff --git a/examples/declarative/extending/attached/person.cpp b/examples/declarative/cppextensions/referenceexamples/valuesource/person.cpp
index 0a9e508..0a9e508 100644
--- a/examples/declarative/extending/attached/person.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/person.cpp
diff --git a/examples/declarative/extending/attached/person.h b/examples/declarative/cppextensions/referenceexamples/valuesource/person.h
index 2f444c5..2f444c5 100644
--- a/examples/declarative/extending/attached/person.h
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/person.h
diff --git a/examples/declarative/extending/valuesource/valuesource.pro b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro
index 0626c98..0626c98 100644
--- a/examples/declarative/extending/valuesource/valuesource.pro
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro
diff --git a/examples/declarative/extending/valuesource/valuesource.qrc b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.qrc
index e2fa01d..e2fa01d 100644
--- a/examples/declarative/extending/valuesource/valuesource.qrc
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.qrc
diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro
index 913b2b0..e3d922c 100644
--- a/examples/declarative/declarative.pro
+++ b/examples/declarative/declarative.pro
@@ -2,53 +2,28 @@ TEMPLATE = subdirs
# These examples contain some C++ and need to be built
SUBDIRS = \
- extending \
- imageprovider \
- objectlistmodel \
- stringlistmodel \
- proxyviewer \
- plugins \
- proxywidgets
+ cppextensions \
+ modelviews \
+ tutorials
# plugins uses a 'Time' class that conflicts with symbian e32std.h also defining a class of the same name
symbian:SUBDIRS -= plugins
# These examples contain no C++ and can simply be copied
sources.files = \
- animations \
- aspectratio \
- behaviors \
- border-image \
- clocks \
- connections \
- dial \
- dynamic \
- effects \
- fillmode \
- focus \
- fonts \
- gridview \
- layouts \
- listview \
- mousearea \
- package \
- parallax \
- progressbar \
- scrollbar \
- searchbox \
- slideswitch \
- spinner \
- sql \
- states \
- tabwidget \
- tic-tac-toe \
- tutorials \
- tvtennis \
- velocity \
- webview \
- workerlistmodel \
- workerscript \
- xmldata \
- xmlhttprequest
+ animation \
+ cppextensions \
+ i18n \
+ imageelements \
+ keyinteraction \
+ positioners \
+ sqllocalstorage \
+ text \
+ threading \
+ touchinteraction \
+ toys \
+ ui-components \
+ xml
+
sources.path = $$[QT_INSTALL_EXAMPLES]/declarative
INSTALLS += sources
diff --git a/examples/declarative/fillmode/content/QtLogo.qml b/examples/declarative/fillmode/content/QtLogo.qml
deleted file mode 100644
index 6dd714d..0000000
--- a/examples/declarative/fillmode/content/QtLogo.qml
+++ /dev/null
@@ -1,30 +0,0 @@
-import Qt 4.7
-
-Item {
- id: qtLogo
-
- property alias fillMode: image.fillMode
- property alias label: labelText.text
-
- width: ((window.width - 20) - ((grid.columns - 1) * grid.spacing)) / grid.columns
- height: ((window.height - 20) - ((grid.rows - 1) * grid.spacing)) / grid.rows
-
- Column {
- anchors.fill: parent
-
- Rectangle {
- height: qtLogo.height - 30; width: qtLogo.width
- border.color: "black"; clip: true
-
- Image {
- id: image
- anchors.fill: parent; smooth: true; source: "qt-logo.png"
- }
- }
-
- Text {
- id: labelText; anchors.horizontalCenter: parent.horizontalCenter
- height: 30; verticalAlignment: Text.AlignVCenter
- }
- }
-}
diff --git a/examples/declarative/fillmode/content/qt-logo.png b/examples/declarative/fillmode/content/qt-logo.png
deleted file mode 100644