Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (23 commits)
  Added missing license header.
  Adjust pathes once again.
  Fixed a link
  Fixed a link
  Split behavior and wigglytext examples
  Rename files to show up in docs.
  Whitespace changes and added depends.
  Fix up examples.
  Fixed some linking issues.
  Removed unecessary files from folders.
  Fixes for the manifest and links.
  Changed some of the short descriptions for WebView examples.
  Removed unecessary duplicate files.
  Fix link to WebView examples.
  Fix link to ListView and WebView example pages.
  Fixed lists to be ordered lists and added curly brackets
  Change the links to behavior examples.
  Fix warning about unbalanced parantheses.
  Fix abstractitemmodel compilation error.
  Split ListView and WebView examples.
  ...

248 files changed, 266 insertions, 5152 deletions

diff --git a/doc/doc.pri b/doc/doc.pri
index 2480b07f87..c51a621be2 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -30,10 +30,10 @@ $$unixstyle {
     COPYWEBKITGUIDE = $$replace(COPYWEBKITGUIDE, "/", "\\")
     COPYWEBKITTARGA = $$replace(COPYWEBKITTARGA, "/", "\\")
     COPYWEBKITTARGB = $$replace(COPYWEBKITTARGB, "/", "\\")
-    EXAMPLESMANIFEST = $$replace(EXAMPLESMANIFEST,  "/", "\\"))
-    DEMOSMANIFEST  = $$replace(DEMOSMANIFEST,  "/", "\\"))
-    EXAMPLESMANIFESTTARGET = $$replace(EXAMPLESMANIFESTTARGET,  "/", "\\"))
-    DEMOSMANIFESTTARGET = $$replace(DEMOSMANIFESTTARGET,  "/", "\\"))
+    EXAMPLESMANIFEST = $$replace(EXAMPLESMANIFEST,  "/", "\\")
+    DEMOSMANIFEST  = $$replace(DEMOSMANIFEST,  "/", "\\")
+    EXAMPLESMANIFESTTARGET = $$replace(EXAMPLESMANIFESTTARGET,  "/", "\\")
+    DEMOSMANIFESTTARGET = $$replace(DEMOSMANIFESTTARGET,  "/", "\\")
 }
 ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf
 QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc
index 4ec1503bcf..2176db16b1 100644
--- a/doc/src/declarative/animation.qdoc
+++ b/doc/src/declarative/animation.qdoc
@@ -141,7 +141,7 @@ There are several methods of assigning behavior animations to properties. The
 \c{Behavior on <property>} declaration is a convenient way of assigning a
 behavior animation onto a property.
 
-See the \l {declarative/animation/behaviors}{Behaviors example} for a
+See the \l {declarative/animation/behaviors/behavior-example}{Behaviors example} for a
 demonstration of behavioral animations.
 
 \section1 Playing Animations in Parallel or in Sequence
diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index 1003b2269b..303511ec7f 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -116,10 +116,12 @@ The examples can be found in Qt's \c examples/declarative directory.
 
 \section2 Animation
 \list
-\o \l{declarative/animation/basics}{Basics}
-\o \l{declarative/animation/behaviors}{Behaviors}
+\o \l{declarative/animation/basics/color-animation}{Color Animation}
+\o \l{declarative/animation/behaviors/behavior-example}{Behaviors}
 \o \l{declarative/animation/easing}{Easing}
+\o \l{declarative/animation/basics/property-animation}{Property Animation}
 \o \l{declarative/animation/states}{States}
+\o \l{declarative/animation/behaviors/wigglytext}{Wiggly Text}
 \endlist
 
 \section2 Image Elements
@@ -173,7 +175,7 @@ The examples can be found in Qt's \c examples/declarative directory.
 \section2 Models and Views
 \list
 \o \l{declarative/modelviews/gridview}{GridView}
-\o \l{declarative/modelviews/listview}{ListView}
+\o \l{Models and Views: ListView Examples}{ListView}
 \o \l{declarative/modelviews/pathview}{PathView}
 \o \l{declarative/modelviews/package}{Package}
 \o \l{declarative/modelviews/parallax}{Parallax}
@@ -183,7 +185,7 @@ The examples can be found in Qt's \c examples/declarative directory.
 \o \l{declarative/modelviews/objectlistmodel}{Object ListModel}
 \o \l{declarative/modelviews/abstractitemmodel}{AbstractItemModel}
 
-\o \l{declarative/modelviews/webview}{WebView}
+\o \l{Models and Views: WebView Examples}{WebView}
 \endlist
 
 \section2 XML
diff --git a/doc/src/examples/qml-calculator.qdoc b/doc/src/examples/qml-calculator.qdoc
index edc87e29b7..96efe26652 100644
--- a/doc/src/examples/qml-calculator.qdoc
+++ b/doc/src/examples/qml-calculator.qdoc
@@ -28,10 +28,9 @@
 /*!
     \title Calculator
     \example demos/declarative/calculator
+    \depends helper/qmlapplicationviewer
 
     \brief The Qt Quick Calculator demo shows how to write a simple calculator application in QML and JavaScript.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-calculator-example.png
 */
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 52fa2e4b77..f8c59f3c4f 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -27,27 +27,26 @@
 
 /*!
     \title Animation: Basics Example
-    \example declarative/animation/basics
-
-    \brief This example shows how to create and combine \l{QML Animation}{animations} in QML.
-
-    \depends helper/qmlapplicationviewer
+    \example declarative/animation/basics/color-animation
+	 \depends helper/qmlapplicationviewer
+    
+	 \brief This example shows how to create and combine \l{QML Animation}{animations} in QML.
 
     \table
     \row
     \o \image qml-coloranim-example.png
     \row
     \o color-animation.qml
-    \endtable
+    \endtable  
+*/
 
 /*!
     \title Animation: Basics Property Animation Example
     \example declarative/animation/basics/property-animation
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to create and combine \l{QML Animation}{animations} in QML.
 
-    \depends helper/qmlapplicationviewer
-
     \table
     \row
     \o \image qml-propertyanim-example.png
@@ -57,24 +56,31 @@
 */
 
 /*!
-    \title Animation: Behavior Examples
-    \example declarative/animation/behaviors
+    \title Animation: Behavior Example
+    \example declarative/animation/behaviors/behavior-example
+    \depends helper/qmlapplicationviewer
+
+    \brief This example shows how to use QML behaviors.
 
-    \brief This example shows how to use QML behaviors. 
+    \image qml-behaviors-example.png
+*/
 
+/*!
+    \title Animation: Wiggly Text Example
+    \example declarative/animation/behaviors/wigglytext
     \depends helper/qmlapplicationviewer
 
-    \image qml-behaviors-example.png
+    \brief This example shows how to animate text.
+
 */
 
 /*!
     \title Animation: Easing Example
     \example declarative/animation/easing
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows the different easing modes available for \l{QML Animation}{animations}.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-easing-example.png
 */
 
@@ -82,13 +88,16 @@
     \title Animation: States Example
     \example declarative/animation/states
 
-    \brief These examples show how to use \l{States}{states} and \l{Transitions}{transitions}.
+    \brief These examples show how to use states and transitions.
 
     \depends helper/qmlapplicationviewer
 
     The \c states.qml example shows how an item can change between states, and \c transitions.qml
     shows how these state changes can be animated.
 
+    \note Due to deployment configurations transitions.qml is opened by default when running this example.
+    states.qml can be opened by editing the main.cpp file.
+
     \table
     \row
     \o \image qml-states-example.png
@@ -118,15 +127,15 @@
     \row
     \o borderimage.qml
     \endtable
+*/
 
 /*!
     \title Image Elements: Shadows Image Example
     \example declarative/imageelements/shadows
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to use the BorderImage element.
 
-    \depends helper/qmlapplicationviewer
-
     \table
     \row
     \o \image qml-borderimage-shadows-example.png
@@ -138,10 +147,10 @@
 /*!
     \title Image Elements: Image Example
     \example declarative/imageelements/image
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to use the \l Image element and its \l{Image::fillMode}{fillModes}.
 
-    \depends helper/qmlapplicationviewer
 
     \image qml-image-example.png
 */
@@ -261,11 +270,10 @@
     \title Internationalization Example
     \example declarative/i18n
     \ingroup internationalization
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to enable text translation in QML.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-i18n-example.png
 
     \section1 Introduction
@@ -303,6 +311,7 @@
 /*!
     \title Right-to-left User Interfaces: Text Alignment Example
     \example declarative/righttoleft/textalignment
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how the horizontal alignment of \l Text,
     \l TextInput and \l TextEdit is affected by the reading direction
@@ -312,14 +321,13 @@
     shown at the bottom of the example to toggle between different
     horizontal alignment options.
 
-    \depends helper/qmlapplicationviewer
-
     \sa {QML Right-to-left User Interfaces}
 */
 
 /*!
     \title Right-to-left User Interfaces: Layout Direction Example
     \example declarative/righttoleft/layoutdirection
+    \depends helper/qmlapplicationviewer
 
     \ brief This example shows how to control the horizontal layout direction of
     \l Row, \l Grid and \l Flow positioners, and \l ListView and \l GridView
@@ -328,8 +336,6 @@
     Click on the gray buttons shown at the bottom of the example
     to toggle the layout direction of the shown elements.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-righttoleft-layoutdirection-example.png
 
     \sa {QML Right-to-left User Interfaces}
@@ -339,6 +345,7 @@
 /*!
     \title Right-to-left User Interfaces: Layout Mirroring Example
     \example declarative/righttoleft/layoutmirroring
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to mirror the application layouts
     using \l LayoutMirroring attached property.
@@ -346,8 +353,6 @@
     Click on the grey button shown at the bottom of the example to
     enable or disable the layout mirroring.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-righttoleft-layoutmirroring-example.png
 
     \sa {QML Right-to-left User Interfaces}
@@ -356,121 +361,132 @@
 /*!
     \title Positioners Example
     \example declarative/positioners
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to use positioner elements such as \l Row, \l Column,
     \l Grid and \l Flow.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-positioners-example.png
 */
 
 /*!
     \title Key Interaction: Focus Example
     \example declarative/keyinteraction/focus
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to handle keyboard input and focus in QML.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-focus-example.png
 */
 
 /*!
     \title Models and Views: AbstractItemModel Example
     \example declarative/modelviews/abstractitemmodel
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to use a QAbstractItemModel subclass as a model in QML.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-abstractitemmodel-example.png
 */
 
 /*!
     \title Models and Views: GridView Example
     \example declarative/modelviews/gridview
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to use the GridView element.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-gridview-example.png
 */
 
 /*!
-    \title Models and Views: ListView Example
-    \example declarative/modelviews/listview
+    \title Models and Views: ListView Examples
+    \page qml-listview-examples.html
+
+	\list
+   \o \l {Models and Views: Dynamic List ListView Example}
+   \o \l {Models and Views: Expanding Delegate ListView Example}
+   \o \l {Models and Views: Highlight ListView Example}
+   \o \l {Models and Views: Highlight Ranges ListView Example}
+   \o  \l {Models and Views: Sections ListView Example}
+	\endlist
+    
+*/
+
+/*!
+    \title Models and Views: Dynamic List ListView Example
+    \example declarative/modelviews/listview/dynamiclist
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how items can be dynamically added to
     and removed from a ListModel, and how these list
     modifications can be animated.
 
-    \depends helper/qmlapplicationviewer
-
     \table
     \row
     \o \image qml-listview-dynamiclist-example.png
     \row
     \o dynamiclist.qml
     \endtable
+*/
 
 /*!
     \title Models and Views: Expanding Delegate ListView Example
     \example declarative/modelviews/listview/expandingdelegates
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to create a dynamic delegate, which
     expands when selected.
 
-    \depends helper/qmlapplicationviewer
-
-
     \table
     \row
     \o \image qml-listview-expandingdelegates-example.png
     \row
     \o expandingdelegates.qml
     \endtable
+*/
 
 /*!
     \title Models and Views: Highlight ListView Example
     \example declarative/modelviews/listview/highlight
+    \depends helper/qmlapplicationviewer
+
 
     \brief This example shows how to highlight one item
     inside a ListView element.
 
-    \depends helper/qmlapplicationviewer
-
     \table
     \row
     \o \image qml-listview-highlight-example.png
     \row
     \o highlight.qml
     \endtable
+*/
 
 /*!
     \title Models and Views: Highlight Ranges ListView Example
     \example declarative/modelviews/listview/highlightranges
+    \depends helper/qmlapplicationviewer
+
 
     \brief This example shows how to highlight ranges within a
     ListView element.
 
-    \depends helper/qmlapplicationviewer
-
     \table
     \row
     \o \image qml-listview-highlightranges-example.png
     \row
     \o highlightranges.qml
     \endtable
+*/
 
 /*!
     \title Models and Views: Sections ListView Example
     \example declarative/modelviews/listview/sections
+    \depends helper/qmlapplicationviewer
 
-    \brief This example shows how to use the ListView element.
 
-    \depends helper/qmlapplicationviewer
+    \brief This example shows how to use the ListView element.
 
     \table
     \row
@@ -483,137 +499,146 @@
 /*!
     \title Models and Views: PathView Example
     \example declarative/modelviews/pathview
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to use the PathView element.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-pathview-example.png
 */
 
 /*!
     \title Models and Views: Object ListModel Example
     \example declarative/modelviews/objectlistmodel
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to use a QList<QObject*> as a model in QML.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-objectlistmodel-example.png
 */
 
 /*!
     \title Models and Views: Package Example
     \example declarative/modelviews/package
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to use the \l Package element.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-package-example.png
 */
 
 /*!
     \title Models and Views: Parallax Example
     \example declarative/modelviews/parallax
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to combine and switch between views.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-parallax-example.png
 */
 
 /*!
     \title Models and Views: String ListModel Example
     \example declarative/modelviews/stringlistmodel
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to use a QStringList as a model in QML.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-stringlistmodel-example.png
 */
 
 /*!
     \title Models and Views: VisualItemModel Example
     \example declarative/modelviews/visualitemmodel
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to use the VisualItemModel element.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-visualitemmodel-example.png
 */
 
 /*!
-    \title Models and Views: WebView Example
-    \example declarative/modelviews/webview
-
+    \title Models and Views: WebView Examples
+    \page qml-webview-examples.html
+    
     \brief These examples show how to use the WebView element.
+   
+    \list
+    \o \l {Models and Views: Alert WebView Example}
+    \o \l {Models and Views: Autosize WebView Example}
+    \o \l {Models and Views: GoogleMaps WebView Example}
+    \o \l {Models and Views: Inline HTML WebView Example}
+    \o  \l {Models and Views: New Windows WebView Example}
+	\endlist
 
+    
+*/
+/*!
+    \title Models and Views: Alert WebView Example
+    \example declarative/modelviews/webview/alerts
     \depends helper/qmlapplicationviewer
 
+    \brief This example shows how to create an alert in the WebView element.
+
     \table
     \row
     \o \image qml-webview-alert-example.png
     \row
     \o alert.qml
     \endtable
+*/
 
 /*!
     \title Models and Views: Autosize WebView Example
     \example declarative/modelviews/webview/autosize
-
-    \brief These examples show how to use the WebView element.
-
     \depends helper/qmlapplicationviewer
 
+    \brief This example show how to use autosizing in the WebView element.
+
     \table
     \row
     \o \image qml-webview-autosize-example.png
     \row
     \o autosize.qml
     \endtable
+*/
 
 /*!
     \title Models and Views: GoogleMaps WebView Example
     \example declarative/modelviews/webview/googlemaps
-
-    \brief These examples show how to use the WebView element.
-
     \depends helper/qmlapplicationviewer
 
+    \brief This example shows how to use a web service API and the WebView element.
+
     \table
     \row
     \o \image qml-webview-googlemaps-example.png
     \row
     \o googlemaps.qml
     \endtable
+*/
 
 /*!
     \title Models and Views: Inline HTML WebView Example
     \example declarative/modelviews/webview/inlinehtml
-
-    \brief These examples show how to use the WebView element.
-
     \depends helper/qmlapplicationviewer
 
+    \brief This example shows how to use inline HTML with the WebView element.
+
     \table
     \row
     \o \image qml-webview-inlinehtml-example.png
     \row
     \o inlinehtml.qml
     \endtable
+*/
 
 /*!
     \title Models and Views: New Windows WebView Example
     \example declarative/modelviews/webview/newwindows
-
-    \brief These examples show how to use the WebView element.
-
     \depends helper/qmlapplicationviewer
 
+    \brief These examples show how to create new windows in the WebView element.
+
     \table
     \row
     \o \image qml-webview-newwindows-example.png
@@ -622,78 +647,74 @@
     \endtable
 */
 
-
 /*!
     \title Screen Orientation
     \example declarative/screenorientation
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to implement screen orientation support for your application.
-
-    \depends helper/qmlapplicationviewer
 */
 
 /*!
     \title SQL Local Storage Example
     \example declarative/sqllocalstorage
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to use the SQL Local Storage API in QML.
-
-    \depends helper/qmlapplicationviewer
 */
 
 /*!
     \title Text: Fonts Example
     \example declarative/text/fonts
+    \depends helper/qmlapplicationviewer
 
     \brief These examples show how to discover available fonts from QML.
 
-    \depends helper/qmlapplicationviewer
-
     \table
     \row
     \o \image qml-fonts-availableFonts-example.png
     \row
     \o availableFonts.qml
     \endtable
+*/
 
 /*!
     \title Text: Banner Fonts Example
     \example declarative/text/fonts/banner
+    \depends helper/qmlapplicationviewer
 
     \brief These example shows how to manipulate text in various ways.
 
-    \depends helper/qmlapplicationviewer
-
     \table
     \row
     \o \image qml-fonts-banner-example.png
     \row
     \o banner.qml
     \endtable
+*/
 
 /*!
     \title Text: Fonts Example
     \example declarative/text/fonts/fonts
+    \depends helper/qmlapplicationviewer
 
     \brief These examples shows how to display a text with multiple fonts.
 
-    \depends helper/qmlapplicationviewer
-
     \table
     \row
     \o \image qml-fonts-fonts-example.png
     \row
     \o fonts.qml
     \endtable
+*/
 
 /*!
     \title Text: Hello Fonts Example
     \example declarative/text/fonts/hello
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to manipulate text in various ways.
 
-    \depends helper/qmlapplicationviewer
-
     \table
     \row
     \o \image qml-fonts-hello-example.png
@@ -705,41 +726,37 @@
 /*!
     \title Text: Text Selection Example
     \example declarative/text/textselection
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how text selection, copy and paste operations
     can be implemented on top of the TextEdit element.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-textselection-example.png
 */
 
 /*!
     \title Threading: Threaded ListModel Example
     \example declarative/threading/threadedlistmodel
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to use a ListModel from multiple threads using
     WorkerScript.
-
-    \depends helper/qmlapplicationviewer
 */
 
 /*!
     \title Threading: WorkerScript Example
     \example declarative/threading/workerscript
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to use the WorkerScript element for threading in QML.
-
-    \depends helper/qmlapplicationviewer
 */
 
 /*!
     \title Toys: Clocks Example
     \example declarative/toys/clocks
+    \depends helper/qmlapplicationviewer
 
     \brief This example displays a set of clocks with different times for different cities.
-
-    \depends helper/qmlapplicationviewer
     
     Each clock is created by combining \l Image elements with \l Rotation transforms 
     and \l SpringAnimation behaviors.
@@ -750,83 +767,76 @@
 /*!
     \title Toys: Corkboards Example
     \example declarative/toys/corkboards
+    \depends helper/qmlapplicationviewer
 
     \brief This example presents a flickable set of interactive corkboards. It is created
     through a combination of elements like \l ListModel, \l Repeater and \l TextEdit
     together with rotation and scaling transforms, animation and mouse interaction.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-corkboards-example.png
 */
 
 /*!
     \title Toys: Dynamic Scene Example
     \example declarative/toys/dynamicscene
+    \depends helper/qmlapplicationviewer
 
     \brief This example presents an interactive drag-and-drop scene. It demonstrates
     how to use QML's \l{Dynamic Object Creation} support to dynamically create and
     destroy objects.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-dynamicscene-example.png
 */
 
 /*!
     \title Toys: Tic-Tac-Toe Example
     \example declarative/toys/tic-tac-toe
+    \depends helper/qmlapplicationviewer
 
     \brief This example presents a simple implementation of Tic Tac Toe.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-tic-tac-toe-example.png
 */
 
 /*!
     \title Toys: TV Tennis Example
     \example declarative/toys/tvtennis
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to use animation components such as \l SpringAnimation,
     \l SequentialAnimation and \l PropertyAction to create a game of TV tennis.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-tvtennis-example.png
 */
 
 /*!
     \title Touch Interaction: Gestures Example
     \example declarative/touchinteraction/gestures
-
-    \brief This example shows how to use the GestureArea element.
     \depends helper/qmlapplicationviewer
 
+    \brief This example shows how to use the GestureArea element.
 */
 
 /*!
     \title Touch Interaction: MouseArea Example
     \example declarative/touchinteraction/mousearea
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to use the MouseArea element to access information
     about mouse input.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-mousearea-example.png
 */
 
 /*!
     \title UI Components: Dial Control Example
     \example declarative/ui-components/dialcontrol
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to create a dial-type control. It combines
     \l Image elements with \l Rotation transforms and \l SpringAnimation behaviors
     to produce an interactive speedometer-type dial.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-dialcontrol-example.png
 */
 
@@ -838,102 +848,92 @@
 
     \brief This example shows how to use the \l Flipable element.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-flipable-example.png
 */
 
 /*!
     \title UI Components: Progress Bars Example
     \example declarative/ui-components/progressbar
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to create a progress bar.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-progressbar-example.png
 */
 
 /*!
     \title UI Components: Scroll Bar Example
     \example declarative/ui-components/scrollbar
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to create scroll bars for a \l Flickable element
     using the \l {Flickable::visibleArea.xPosition}{Flickable::visibleArea}
     properties.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-scrollbar-example.png
 */
 
 /*!
     \title UI Components: Search Box Example
     \example declarative/ui-components/searchbox
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to combine TextInput, FocusScope and BorderImage
     elements to display multiple text input fields.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-searchbox-example.png
 */
 
 /*!
     \title UI Components: Slide Switch Example
     \example declarative/ui-components/slideswitch
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to create a slide switch control.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-slideswitch-example.png
 */
 
 /*!
     \title UI Components: Spinner Example
     \example declarative/ui-components/spinner
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to create a spinner-type component using the PathView element.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-spinner-example.png
 */
 
 /*!
     \title UI Components: Tab Widget Example
     \example declarative/ui-components/tabwidget
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to create a tab widget. It also demonstrates how
     \l {Property aliases}{property aliases} and
     \l {Introduction to the QML Language#Default Properties}{default properties} can be used to collect and
     assemble the child items declared within an \l Item.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-tabwidget-example.png
 */
 
 /*!
     \title XML: XMLHttpRequest Example
     \example declarative/xml/xmlhttprequest
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to use the \l XmlHttpRequest API in QML.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-xmlhttprequest-example.png
 */
 
 /*!
     \title Labs: Shader Effects
     \example declarative/shadereffects
+    \depends helper/qmlapplicationviewer
 
     \brief This example shows how to create visual effects by using OpenGL shading language together with QML using \l ShaderEffectItem and \l ShaderEffectSource APIs.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-shadereffects-example.png
 */
 
diff --git a/doc/src/examples/qml-folderlistmodel.qdoc b/doc/src/examples/qml-folderlistmodel.qdoc
index 2d73db8175..a1adc8a0f8 100644
--- a/doc/src/examples/qml-folderlistmodel.qdoc
+++ b/doc/src/examples/qml-folderlistmodel.qdoc
@@ -29,9 +29,9 @@
 
 \title FolderListModel - a C++ model plugin
 \example src/imports/folderlistmodel
+\depends helper/qmlapplicationviewer
 
 \brief The FolderListModel plugin example shows how to make a C++ model available to QML.
-\depends helper/qmlapplicationviewer
 
 It presents
 a simple file list for a single folder (directory) and allows the presented
diff --git a/doc/src/examples/qml-minehunt.qdoc b/doc/src/examples/qml-minehunt.qdoc
index 66c7dd342f..3f24c83948 100644
--- a/doc/src/examples/qml-minehunt.qdoc
+++ b/doc/src/examples/qml-minehunt.qdoc
@@ -28,6 +28,7 @@
 /*!
     \title Minehunt
     \example demos/declarative/minehunt
+    \depends helper/qmlapplicationviewer
 
     \brief The Qt Quick Minehunt demo shows how to create a simple Minehunt game, using QML for the
     UI and C++ for the game logic.
diff --git a/doc/src/examples/qml-photoviewer.qdoc b/doc/src/examples/qml-photoviewer.qdoc
index 65b3774839..5fc02c46ce 100644
--- a/doc/src/examples/qml-photoviewer.qdoc
+++ b/doc/src/examples/qml-photoviewer.qdoc
@@ -28,10 +28,9 @@
 /*!
     \title Photo Viewer
     \example demos/declarative/photoviewer
+    \depends helper/qmlapplicationviewer
 
     \brief The Qt Quick Photo Viewer demo shows how to write a Flickr photo viewer application in QML.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-photoviewer-demo.png
 */
diff --git a/doc/src/examples/qml-rssnews.qdoc b/doc/src/examples/qml-rssnews.qdoc
index 8b2691f914..46cc9fc653 100644
--- a/doc/src/examples/qml-rssnews.qdoc
+++ b/doc/src/examples/qml-rssnews.qdoc
@@ -28,10 +28,9 @@
 /*!
     \title RSS News
     \example demos/declarative/rssnews
+    \depends helper/qmlapplicationviewer
 
     \brief The Qt Quick RSS News demo shows how to write a RSS news reader in QML.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-rssnews-demo.png
 */
diff --git a/doc/src/examples/qml-samegame.qdoc b/doc/src/examples/qml-samegame.qdoc
index 8c4c75bb54..3ffed3bd0a 100644
--- a/doc/src/examples/qml-samegame.qdoc
+++ b/doc/src/examples/qml-samegame.qdoc
@@ -28,11 +28,10 @@
 /*!
     \title Same Game
     \example demos/declarative/samegame
+    \depends helper/qmlapplicationviewer
 
     \brief The Qt Quick Same Game demo shows how to write a 'Same Game' game in QML, using Javascript
     for all the game logic.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-samegame-demo.png
 */
diff --git a/doc/src/examples/qml-snake.qdoc b/doc/src/examples/qml-snake.qdoc
index 8a27711a31..0fa5bfbeba 100644
--- a/doc/src/examples/qml-snake.qdoc
+++ b/doc/src/examples/qml-snake.qdoc
@@ -28,6 +28,7 @@
 /*!
     \title Snake
     \example demos/declarative/snake
+    \depends helper/qmlapplicationviewer
 
     \brief The Qt Quick Snake demo shows how to write a Snake game in QML, controlled by the
     keyboard as well as the mouse.
diff --git a/doc/src/examples/qml-twitter.qdoc b/doc/src/examples/qml-twitter.qdoc
index 50495e9155..073dd6411d 100644
--- a/doc/src/examples/qml-twitter.qdoc
+++ b/doc/src/examples/qml-twitter.qdoc
@@ -28,11 +28,10 @@
 /*!
     \title Twitter Mobile
     \example demos/declarative/twitter
-
-    \brief The Qt Quick Twitter Mobile demo shows how to write a mobile Twitter search client in QML. Use it to
-    see what people think about Qt Quick!
-
     \depends helper/qmlapplicationviewer
 
+    \brief The Qt Quick Twitter Mobile demo shows how to write a mobile Twitter search client in QML.
+    Use it to see what people think about Qt Quick!
+
     \image qml-twitter-demo.png
 */
diff --git a/doc/src/examples/qml-webbrowser.qdoc b/doc/src/examples/qml-webbrowser.qdoc
index a130dd7fce..fc9d47f290 100644
--- a/doc/src/examples/qml-webbrowser.qdoc
+++ b/doc/src/examples/qml-webbrowser.qdoc
@@ -28,13 +28,12 @@
 /*!
     \title Qt Quick Web Browser
     \example demos/declarative/webbrowser
+    \depends helper/qmlapplicationviewer
 
     \brief The Qt Quick Web Browser demo shows how to write a simple web browser in QML by combining the
     WebView element with other components including scroll bars, 
     \l Flickable views and TextInput fields.
 
-    \depends helper/qmlapplicationviewer
-
     \image qml-webbrowser-demo.png
 */
 
diff --git a/examples/declarative/animation/animation.pro b/examples/declarative/animation/animation.pro
index eb66ff5a02..a71df66de1 100644
--- a/examples/declarative/animation/animation.pro
+++ b/examples/declarative/animation/animation.pro
@@ -1,8 +1,8 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    basics/property-animation/propertyanimation.pro \
-    basics/color-animation/coloranimation.pro \
+    basics/property-animation \
+    basics/color-animation \
     easing \
-    behaviors/behavior-example/behaviorexample.pro \
+    behaviors/behavior-example \
     states
diff --git a/examples/declarative/animation/basics/color-animation/coloranimation.png b/examples/declarative/animation/basics/color-animation/color-animation.png
index 707d5c4e85..707d5c4e85 100644
--- a/examples/declarative/animation/basics/color-animation/coloranimation.png
+++ b/examples/declarative/animation/basics/color-animation/color-animation.png
diff --git a/examples/declarative/animation/basics/color-animation/color-animation.pro b/examples/declarative/animation/basics/color-animation/color-animation.pro
new file mode 100644
index 0000000000..0272cdb27e
--- /dev/null
+++ b/examples/declarative/animation/basics/color-animation/color-animation.pro
@@ -0,0 +1,51 @@
+# Add more folders to ship with the application, here
+folder_01.source = qml/color-animation
+folder_01.target = qml
+DEPLOYMENTFOLDERS = folder_01
+
+# Additional import path used to resolve QML modules in Creator's code model
+QML_IMPORT_PATH =
+
+# Avoid auto screen rotation
+#DEFINES += ORIENTATIONLOCK
+
+# Needs to be defined for Symbian
+#DEFINES += NETWORKACCESS
+
+symbian:TARGET.UID3 = 0xE959F610
+
+# Smart Installer package's UID
+# This UID is from the protected range 
+# and therefore the package will fail to install if self-signed
+# By default qmake uses the unprotected range value if unprotected UID is defined for the application
+# and 0x2002CCCF value if protected UID is given to the application
+#symbian:DEPLOYMENT.installer_header = 0x2002CCCF
+
+# Define QMLJSDEBUGGER to allow debugging of QML in debug builds
+# (This might significantly increase build time)
+# DEFINES += QMLJSDEBUGGER
+
+# If your application uses the Qt Mobility libraries, uncomment
+# the following lines and add the respective components to the 
+# MOBILITY variable. 
+# CONFIG += mobility
+# MOBILITY +=
+
+# The .cpp file which was generated for your project. Feel free to hack it.
+SOURCES += main.cpp
+
+# Please do not modify the following two lines. Required for deployment.
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/basics/color-animation
+exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
+else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
+qtcAddDeployment()
+
+OTHER_FILES += \
+    qtc_packaging/debian_harmattan/rules \
+    qtc_packaging/debian_harmattan/README \
+    qtc_packaging/debian_harmattan/manifest.aegis \
+    qtc_packaging/debian_harmattan/copyright \
+    qtc_packaging/debian_harmattan/control \
+    qtc_packaging/debian_harmattan/compat \
+    qtc_packaging/debian_harmattan/changelog
+
diff --git a/examples/declarative/animation/basics/color-animation/coloranimation.svg b/examples/declarative/animation/basics/color-animation/color-animation.svg
index 566acfada0..566acfada0 100644
--- a/examples/declarative/animation/basics/color-animation/coloranimation.svg
+++ b/examples/declarative/animation/basics/color-animation/color-animation.svg
diff --git a/examples/declarative/animation/basics/color-animation/coloranimation.desktop b/examples/declarative/animation/basics/color-animation/coloranimation.desktop
deleted file mode 100644
index b6df2d04c4..0000000000
--- a/examples/declarative/animation/basics/color-animation/coloranimation.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=color-animation
-Exec=/opt/usr/bin/color-animation
-Icon=color-animation
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/animation/basics/property-animation/propertyanimation.png b/examples/declarative/animation/basics/property-animation/property-animation.png
index 707d5c4e85..707d5c4e85 100644
--- a/examples/declarative/animation/basics/property-animation/propertyanimation.png
+++ b/examples/declarative/animation/basics/property-animation/property-animation.png
diff --git a/examples/declarative/animation/basics/property-animation/propertyanimation.pro b/examples/declarative/animation/basics/property-animation/property-animation.pro
index 82341e51a7..82341e51a7 100644
--- a/examples/declarative/animation/basics/property-animation/propertyanimation.pro
+++ b/examples/declarative/animation/basics/property-animation/property-animation.pro
diff --git a/examples/declarative/animation/basics/property-animation/propertyanimation.svg b/examples/declarative/animation/basics/property-animation/property-animation.svg
index 566acfada0..566acfada0 100644
--- a/examples/declarative/animation/basics/property-animation/propertyanimation.svg
+++ b/examples/declarative/animation/basics/property-animation/property-animation.svg
diff --git a/examples/declarative/animation/basics/property-animation/propertyanimation.desktop b/examples/declarative/animation/basics/property-animation/propertyanimation.desktop
deleted file mode 100644
index 6155c2f79b..0000000000
--- a/examples/declarative/animation/basics/property-animation/propertyanimation.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=property-animation
-Exec=/opt/usr/bin/property-animation
-Icon=property-animation
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/README b/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/README
deleted file mode 100644
index 3f1e89dd6a..0000000000
--- a/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/README
+++ /dev/null
@@ -1,6 +0,0 @@
-The Debian Package propertyanimation
-----------------------------
-
-Comments regarding the Package
-
- -- Daniel Molkentin <danimo@unknown>  Thu, 18 Nov 2010 16:22:35 +0100
diff --git a/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/changelog b/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/changelog
deleted file mode 100644
index 4e1c4df9bc..0000000000
--- a/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-propertyanimation (0.0.1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Daniel Molkentin <danimo@unknown>  Thu, 18 Nov 2010 16:22:35 +0100
diff --git a/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/compat b/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/compat
deleted file mode 100644
index 7f8f011eb7..0000000000
--- a/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/control b/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/control
deleted file mode 100644
index cc2e5efa6d..0000000000
--- a/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: propertyanimation
-Section: user/hidden
-Priority: optional
-Maintainer: Daniel Molkentin <danimo@unknown>
-Build-Depends: debhelper (>= 5), libqt4-dev
-Standards-Version: 3.7.3
-Homepage: <insert the upstream URL, if relevant>
-
-Package: propertyanimation
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
diff --git a/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/copyright b/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/copyright
deleted file mode 100644
index e197e3725c..0000000000
--- a/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/copyright
+++ /dev/null
@@ -1,40 +0,0 @@
-This package was debianized by Daniel Molkentin <danimo@unknown> on
-Thu, 18 Nov 2010 16:22:35 +0100.
-
-It was downloaded from <url://example.com>
-
-Upstream Author(s):
-
-    <put author's name and email here>
-    <likewise for another author>
-
-Copyright:
-
-    <Copyright (C) YYYY Name OfAuthor>
-    <likewise for another author>
-
-License:
-
-    This package is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2010, Daniel Molkentin <danimo@unknown> and
-is licensed under the GPL, see above.
-
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
diff --git a/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/rules b/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/rules
deleted file mode 100755
index e83893240c..0000000000
--- a/examples/declarative/animation/basics/property-animation/qtc_packaging/debian_fremantle/rules
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-
-
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp  
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/propertyanimation.sgml > propertyanimation.1
-
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	$(MAKE) clean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/propertyanimation.
-	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/propertyanimation install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	# dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_makeshlibs
-	dh_installdeb
-	# dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/examples/declarative/animation/behaviors/behavior-example/behaviorexample.png b/examples/declarative/animation/behaviors/behavior-example/behavior-example.png
index 707d5c4e85..707d5c4e85 100644
--- a/examples/declarative/animation/behaviors/behavior-example/behaviorexample.png
+++ b/examples/declarative/animation/behaviors/behavior-example/behavior-example.png
diff --git a/examples/declarative/animation/behaviors/behavior-example/behaviorexample.pro b/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro
index 3ea81e227e..3ea81e227e 100644
--- a/examples/declarative/animation/behaviors/behavior-example/behaviorexample.pro
+++ b/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro
diff --git a/examples/declarative/animation/behaviors/behavior-example/behaviorexample.svg b/examples/declarative/animation/behaviors/behavior-example/behavior-example.svg
index 566acfada0..566acfada0 100644
--- a/examples/declarative/animation/behaviors/behavior-example/behaviorexample.svg
+++ b/examples/declarative/animation/behaviors/behavior-example/behavior-example.svg
diff --git a/examples/declarative/animation/behaviors/behavior-example/behaviorexample.desktop b/examples/declarative/animation/behaviors/behavior-example/behaviorexample.desktop
deleted file mode 100644
index 95af0172b6..0000000000
--- a/examples/declarative/animation/behaviors/behavior-example/behaviorexample.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=behavior-example
-Exec=/opt/usr/bin/behavior-example
-Icon=behavior-example
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/Delegate/main.cpp b/examples/declarative/animation/behaviors/wigglytext/main.cpp
index 2d4c7ec80f..3407156489 100644
--- a/examples/declarative/modelviews/Delegate/main.cpp
+++ b/examples/declarative/animation/behaviors/wigglytext/main.cpp
@@ -46,8 +46,8 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
 
     QmlApplicationViewer viewer;
-    viewer.setOrientation(QmlApplicationViewer::ScreenOrientationLockLandscape);
-    viewer.setMainQmlFile(QLatin1String("qml/delegate/view.qml"));
+    viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
+    viewer.setMainQmlFile(QLatin1String("qml/behaviours/behavior-example.qml"));
     viewer.showExpanded();
 
     return app.exec();
diff --git a/examples/declarative/animation/behaviors/behavior-example/qml/behaviours/wigglytext.qml b/examples/declarative/animation/behaviors/wigglytext/qml/wigglytext/wigglytext.qml
index 6cd93abbd6..6cd93abbd6 100644
--- a/examples/declarative/animation/behaviors/behavior-example/qml/behaviours/wigglytext.qml
+++ b/examples/declarative/animation/behaviors/wigglytext/qml/wigglytext/wigglytext.qml
diff --git a/examples/declarative/modelviews/Delegate/Delegate.png b/examples/declarative/animation/behaviors/wigglytext/wigglytext.png
index 707d5c4e85..707d5c4e85 100644
--- a/examples/declarative/modelviews/Delegate/Delegate.png
+++ b/examples/declarative/animation/behaviors/wigglytext/wigglytext.png
diff --git a/examples/declarative/animation/basics/color-animation/coloranimation.pro b/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro
index 7e0f0508dc..3ad345f784 100644
--- a/examples/declarative/animation/basics/color-animation/coloranimation.pro
+++ b/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro
@@ -1,5 +1,5 @@
 # Add more folders to ship with the application, here
-folder_01.source = qml/color-animation
+folder_01.source = qml/wigglytext
 folder_01.target = qml
 DEPLOYMENTFOLDERS = folder_01
 
@@ -12,7 +12,7 @@ QML_IMPORT_PATH =
 # Needs to be defined for Symbian
 #DEFINES += NETWORKACCESS
 
-symbian:TARGET.UID3 = 0xE959F610
+symbian:TARGET.UID3 = 0xEB6022A4
 
 # Smart Installer package's UID
 # This UID is from the protected range 
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE959F610
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/basics/color-animation
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/wigglytext/wigglytext
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/Delegate/delegate.qmlproject b/examples/declarative/animation/behaviors/wigglytext/wigglytext.qmlproject
index c821f6a6d1..d38084fbef 100644
--- a/examples/declarative/modelviews/Delegate/delegate.qmlproject
+++ b/examples/declarative/animation/behaviors/wigglytext/wigglytext.qmlproject
@@ -3,13 +3,13 @@ import QmlProject 1.0
 Project {
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
-        directory: "qml/delegate"
+        directory: "qml/wigglytext"
     }
     JavaScriptFiles {
-        directory: "qml/delegate"
+        directory: "qml/wigglytext"
     }
     ImageFiles {
-        directory: "qml/delegate"
+        directory: "qml/wigglytext"
     }
     /* List of plugin directories passed to QML runtime */
     // importPaths: [ " ../exampleplugin " ]
diff --git a/examples/declarative/modelviews/Delegate/Delegate.svg b/examples/declarative/animation/behaviors/wigglytext/wigglytext.svg
index 566acfada0..566acfada0 100644
--- a/examples/declarative/modelviews/Delegate/Delegate.svg
+++ b/examples/declarative/animation/behaviors/wigglytext/wigglytext.svg
diff --git a/examples/declarative/animation/easing/easing.desktop b/examples/declarative/animation/easing/easing.desktop
deleted file mode 100644
index 56437b5efb..0000000000
--- a/examples/declarative/animation/easing/easing.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=easing
-Exec=/opt/usr/bin/easing
-Icon=easing
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/animation/states/main.cpp b/examples/declarative/animation/states/main.cpp
index 511f00ec13..4549051ccd 100644
--- a/examples/declarative/animation/states/main.cpp
+++ b/examples/declarative/animation/states/main.cpp
@@ -47,6 +47,9 @@ int main(int argc, char *argv[])
 
     QmlApplicationViewer viewer;
     viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
+
+    //Uncomment the following line to open the states.qml example and comment the transitions.qml line.
+    //viewer.setMainQmlFile(QLatin1String("qml/states/states.qml"));
     viewer.setMainQmlFile(QLatin1String("qml/states/transitions.qml"));
     viewer.showExpanded();
 
diff --git a/examples/declarative/animation/states/states.desktop b/examples/declarative/animation/states/states.desktop
deleted file mode 100644
index 31eb8d5d52..0000000000
--- a/examples/declarative/animation/states/states.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=states
-Exec=/opt/usr/bin/states
-Icon=states
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/i18n/i18n.desktop b/examples/declarative/i18n/i18n.desktop
deleted file mode 100644
index 8dd6e345da..0000000000
--- a/examples/declarative/i18n/i18n.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=i18n
-Exec=/opt/usr/bin/i18n
-Icon=i18n
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/imageelements/borderimage/borderimage.desktop b/examples/declarative/imageelements/borderimage/borderimage.desktop
deleted file mode 100644
index 35f4d2bb03..0000000000
--- a/examples/declarative/imageelements/borderimage/borderimage.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=borderimage
-Exec=/opt/usr/bin/borderimage
-Icon=borderimage
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/README b/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/README
deleted file mode 100644
index 421e6e32ba..0000000000
--- a/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/README
+++ /dev/null
@@ -1,6 +0,0 @@
-The Debian Package borderimage
-----------------------------
-
-Comments regarding the Package
-
- -- Daniel Molkentin <danimo@unknown>  Thu, 18 Nov 2010 16:13:09 +0100
diff --git a/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/changelog b/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/changelog
deleted file mode 100644
index 77071e007a..0000000000
--- a/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-borderimage (0.0.1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Daniel Molkentin <danimo@unknown>  Thu, 18 Nov 2010 16:13:09 +0100
diff --git a/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/compat b/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/compat
deleted file mode 100644
index 7f8f011eb7..0000000000
--- a/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/control b/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/control
deleted file mode 100644
index 4bdc93ef3e..0000000000
--- a/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: borderimage
-Section: user/hidden
-Priority: optional
-Maintainer: Daniel Molkentin <danimo@unknown>
-Build-Depends: debhelper (>= 5), libqt4-dev
-Standards-Version: 3.7.3
-Homepage: <insert the upstream URL, if relevant>
-
-Package: borderimage
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
diff --git a/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/copyright b/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/copyright
deleted file mode 100644
index e1c7a293e9..0000000000
--- a/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/copyright
+++ /dev/null
@@ -1,40 +0,0 @@
-This package was debianized by Daniel Molkentin <danimo@unknown> on
-Thu, 18 Nov 2010 16:13:09 +0100.
-
-It was downloaded from <url://example.com>
-
-Upstream Author(s):
-
-    <put author's name and email here>
-    <likewise for another author>
-
-Copyright:
-
-    <Copyright (C) YYYY Name OfAuthor>
-    <likewise for another author>
-
-License:
-
-    This package is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2010, Daniel Molkentin <danimo@unknown> and
-is licensed under the GPL, see above.
-
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
diff --git a/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/rules b/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/rules
deleted file mode 100755
index 3799b01dd7..0000000000
--- a/examples/declarative/imageelements/borderimage/qtc_packaging/debian_fremantle/rules
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-
-
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp  
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/borderimage.sgml > borderimage.1
-
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	$(MAKE) clean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/borderimage.
-	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/borderimage install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	# dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_makeshlibs
-	dh_installdeb
-	# dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/examples/declarative/imageelements/image/image.desktop b/examples/declarative/imageelements/image/image.desktop
deleted file mode 100644
index 6103d44733..0000000000
--- a/examples/declarative/imageelements/image/image.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=image
-Exec=/opt/usr/bin/image
-Icon=image
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/imageelements/shadows/shadows.desktop b/examples/declarative/imageelements/shadows/shadows.desktop
deleted file mode 100644
index 83acea36a1..0000000000
--- a/examples/declarative/imageelements/shadows/shadows.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=shadows
-Exec=/opt/usr/bin/shadows
-Icon=shadows
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/keyinteraction/focus/focus.desktop b/examples/declarative/keyinteraction/focus/focus.desktop
deleted file mode 100644
index 68513b3f89..0000000000
--- a/examples/declarative/keyinteraction/focus/focus.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=focus
-Exec=/opt/usr/bin/focus
-Icon=focus
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/Delegate/Delegate.desktop b/examples/declarative/modelviews/Delegate/Delegate.desktop
deleted file mode 100644
index 9815dedb52..0000000000
--- a/examples/declarative/modelviews/Delegate/Delegate.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=Delegate
-Exec=/opt/usr/bin/Delegate
-Icon=Delegate
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/Delegate/Delegate.pro b/examples/declarative/modelviews/Delegate/Delegate.pro
deleted file mode 100644
index f1b76c0ed4..0000000000
--- a/examples/declarative/modelviews/Delegate/Delegate.pro
+++ /dev/null
@@ -1,41 +0,0 @@
-# Add more folders to ship with the application, here
-folder_01.source = qml/delegate
-folder_01.target = qml
-DEPLOYMENTFOLDERS = folder_01
-
-# Additional import path used to resolve QML modules in Creator's code model
-QML_IMPORT_PATH =
-
-# Avoid auto screen rotation
-DEFINES += ORIENTATIONLOCK
-
-# Needs to be defined for Symbian
-#DEFINES += NETWORKACCESS
-
-symbian:TARGET.UID3 = 0xE5FF52C0
-
-# Smart Installer package's UID
-# This UID is from the protected range 
-# and therefore the package will fail to install if self-signed
-# By default qmake uses the unprotected range value if unprotected UID is defined for the application
-# and 0x2002CCCF value if protected UID is given to the application
-#symbian:DEPLOYMENT.installer_header = 0x2002CCCF
-
-# Define QMLJSDEBUGGER to allow debugging of QML in debug builds
-# (This might significantly increase build time)
-# DEFINES += QMLJSDEBUGGER
-
-# If your application uses the Qt Mobility libraries, uncomment
-# the following lines and add the respective components to the 
-# MOBILITY variable. 
-# CONFIG += mobility
-# MOBILITY +=
-
-# The .cpp file which was generated for your project. Feel free to hack it.
-SOURCES += main.cpp
-
-# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/Delegate
-exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
-else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
-qtcAddDeployment()
diff --git a/examples/declarative/modelviews/Delegate/qml/delegate/Delegate.qml b/examples/declarative/modelviews/Delegate/qml/delegate/Delegate.qml
deleted file mode 100644
index 2f44ab1744..0000000000
--- a/examples/declarative/modelviews/Delegate/qml/delegate/Delegate.qml
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-
-//![0]
-Package {
-    Text { id: listDelegate; width: 200; height: 25; text: 'Empty'; Package.name: 'list' }
-    Text { id: gridDelegate; width: 100; height: 50; text: 'Empty'; Package.name: 'grid' }
-
-    Rectangle {
-        id: wrapper
-        width: 200; height: 25
-        color: 'lightsteelblue'
-
-        //Text { text: display; anchors.centerIn: parent }
-        MouseArea {
-            anchors.fill: parent
-            onClicked: {
-                if (wrapper.state == 'inList')
-                    wrapper.state = 'inGrid';
-                else
-                    wrapper.state = 'inList';
-            }
-        }
-
-        state: 'inList'
-        states: [
-            State {
-                name: 'inList'
-                ParentChange { target: wrapper; parent: listDelegate }
-            },
-            State {
-                name: 'inGrid'
-                ParentChange {
-                    target: wrapper; parent: gridDelegate
-                    x: 0; y: 0; width: gridDelegate.width; height: gridDelegate.height
-                }
-            }
-        ]
-
-        transitions: [
-            Transition {
-                ParentAnimation {
-                    NumberAnimation { properties: 'x,y,width,height'; duration: 300 }
-                }
-            }
-        ]
-    }
-}
-//![0]
diff --git a/examples/declarative/modelviews/Delegate/qml/delegate/view.qml b/examples/declarative/modelviews/Delegate/qml/delegate/view.qml
deleted file mode 100644
index cbe8f0689f..0000000000
--- a/examples/declarative/modelviews/Delegate/qml/delegate/view.qml
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-
-Rectangle {
-    color: "white"
-    width: 400
-    height: 200
-
-    ListModel {
-        id: myModel
-        ListElement { display: "One" }
-        ListElement { display: "Two" }
-        ListElement { display: "Three" }
-        ListElement { display: "Four" }
-        ListElement { display: "Five" }
-        ListElement { display: "Six" }
-        ListElement { display: "Seven" }
-        ListElement { display: "Eight" }
-    }
-    //![0]
-    VisualDataModel {
-        id: visualModel
-        delegate: Delegate {}
-        model: myModel
-    }
-
-    ListView {
-        width: 200; height:200
-        model: visualModel.parts.list
-    }
-    GridView {
-        x: 200; width: 200; height:200
-        cellHeight: 50
-        model: visualModel.parts.grid
-    }
-    //![0]
-}
diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
index 3864dfce23..c751b2c1cc 100644
--- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
+++ b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
@@ -32,7 +32,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 # The .cpp file which was generated for your project. Feel free to hack it.
 SOURCES = main.cpp model.cpp
 HEADERS = model.h
-RESOURCES += abstractitemmodel.qrc
 
 # Please do not modify the following two lines. Required for deployment.
 desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/abstractitemmodel
diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.qrc b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.qrc
deleted file mode 100644
index 4ae861cb3d..0000000000
--- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>view.qml</file>
-</qresource>
-</RCC>
-
diff --git a/examples/declarative/modelviews/gridview-example/gridview.qmlproject b/examples/declarative/modelviews/gridview-example/gridview.qmlproject
deleted file mode 100644
index f70c496339..0000000000
--- a/examples/declarative/modelviews/gridview-example/gridview.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "qml/gridview-example"
-    }
-    JavaScriptFiles {
-        directory: "qml/gridview-example"
-    }
-    ImageFiles {
-        directory: "qml/gridview-example"
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/modelviews/gridview-example/gridviewexample.desktop b/examples/declarative/modelviews/gridview-example/gridviewexample.desktop
deleted file mode 100644
index 1ba59a4190..0000000000
--- a/examples/declarative/modelviews/gridview-example/gridviewexample.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=gridview-example
-Exec=/opt/usr/bin/gridview-example
-Icon=gridview-example
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/gridview/gridview-example.qml b/examples/declarative/modelviews/gridview/gridview-example.qml
deleted file mode 100644
index 85bd2f15c1..0000000000
--- a/examples/declarative/modelviews/gridview/gridview-example.qml
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-
-Rectangle {
-    width: 300; height: 400
-    color: "white"
-
-    ListModel {
-        id: appModel
-        ListElement { name: "Music"; icon: "pics/AudioPlayer_48.png" }
-        ListElement { name: "Movies"; icon: "pics/VideoPlayer_48.png" }
-        ListElement { name: "Camera"; icon: "pics/Camera_48.png" }
-        ListElement { name: "Calendar"; icon: "pics/DateBook_48.png" }
-        ListElement { name: "Messaging"; icon: "pics/EMail_48.png" }
-        ListElement { name: "Todo List"; icon: "pics/TodoList_48.png" }
-        ListElement { name: "Contacts"; icon: "pics/AddressBook_48.png" }
-    }
-
-    Component {
-        id: appDelegate
-
-        Item {
-            width: 100; height: 100
-
-            Image {
-                id: myIcon
-                y: 20; anchors.horizontalCenter: parent.horizontalCenter
-                source: icon
-            }
-            Text {
-                anchors { top: myIcon.bottom; horizontalCenter: parent.horizontalCenter }
-                text: name
-            }
-        }
-    }
-
-    Component {
-        id: appHighlight
-        Rectangle { width: 80; height: 80; color: "lightsteelblue" }
-    }
-
-    GridView {
-        anchors.fill: parent
-        cellWidth: 100; cellHeight: 100
-        highlight: appHighlight
-        focus: true
-        model: appModel
-        delegate: appDelegate
-    }
-}
diff --git a/examples/declarative/modelviews/gridview-example/gridviewexample.pro b/examples/declarative/modelviews/gridview/gridview.pro
index dce522c2d4..dce522c2d4 100644
--- a/examples/declarative/modelviews/gridview-example/gridviewexample.pro
+++ b/examples/declarative/modelviews/gridview/gridview.pro
diff --git a/examples/declarative/modelviews/gridview/gridview.qmlproject b/examples/declarative/modelviews/gridview/gridview.qmlproject
index d4909f8685..f70c496339 100644
--- a/examples/declarative/modelviews/gridview/gridview.qmlproject
+++ b/examples/declarative/modelviews/gridview/gridview.qmlproject
@@ -3,13 +3,13 @@ import QmlProject 1.0
 Project {
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
-        directory: "."
+        directory: "qml/gridview-example"
     }
     JavaScriptFiles {
-        directory: "."
+        directory: "qml/gridview-example"
     }
     ImageFiles {
-        directory: "."
+        directory: "qml/gridview-example"
     }
     /* List of plugin directories passed to QML runtime */
     // importPaths: [ " ../exampleplugin " ]
diff --git a/examples/declarative/modelviews/gridview-example/gridviewexample.svg b/examples/declarative/modelviews/gridview/gridview.svg
index 566acfada0..566acfada0 100644
--- a/examples/declarative/modelviews/gridview-example/gridviewexample.svg
+++ b/examples/declarative/modelviews/gridview/gridview.svg
diff --git a/examples/declarative/modelviews/gridview-example/gridviewexample.png b/examples/declarative/modelviews/gridview/gridviewexample.png
index 707d5c4e85..707d5c4e85 100644
--- a/examples/declarative/modelviews/gridview-example/gridviewexample.png
+++ b/examples/declarative/modelviews/gridview/gridviewexample.png
diff --git a/examples/declarative/modelviews/gridview-example/main.cpp b/examples/declarative/modelviews/gridview/main.cpp
index d6a54b9324..d6a54b9324 100644
--- a/examples/declarative/modelviews/gridview-example/main.cpp
+++ b/examples/declarative/modelviews/gridview/main.cpp
diff --git a/examples/declarative/modelviews/gridview-example/qml/gridview-example/gridview-example.qml b/examples/declarative/modelviews/gridview/qml/gridview-example/gridview-example.qml
index 85fefda273..85fefda273 100644
--- a/examples/declarative/modelviews/gridview-example/qml/gridview-example/gridview-example.qml
+++ b/examples/declarative/modelviews/gridview/qml/gridview-example/gridview-example.qml
diff --git a/examples/declarative/modelviews/gridview-example/qml/gridview-example/pics/AddressBook_48.png b/examples/declarative/modelviews/gridview/qml/gridview-example/pics/AddressBook_48.png
index 1ab7c8eec1..1ab7c8eec1 100644
--- a/examples/declarative/modelviews/gridview-example/qml/gridview-example/pics/AddressBook_48.png
+++ b/examples/declarative/modelviews/gridview/qml/gridview-example/pics/AddressBook_48.png
diff --git a/examples/declarative/modelviews/gridview-example/qml/gridview-example/pics/AudioPlayer_48.png b/examples/declarative/modelviews/gridview/qml/gridview-example/pics/AudioPlayer_48.png
index f4b8689f87..f4b8689f87 100644
--- a/examples/declarative/modelviews/gridview-example/qml/gridview-example/pics/AudioPlayer_48.png
+++ b/examples/declarative/modelviews/gridview/qml/gridview-example/pics/AudioPlayer_48.png
diff --git a/examples/declarative/modelviews/gridview-example/qml/gridview-example/pics/Camera_48.png b/examples/declarative/modelviews/gridview/qml/gridview-example/pics/Camera_48.png
index c76b524945..c76b524945 100644
--- a/examples/declarative/modelviews/gridview-example/qml/gridview-example/pics/Camera_48.png
+++ b/examples/declarative/modelviews/gridview/qml/gridview-example/pics/Camera_48.png
diff --git a/examples/declarative/modelviews/gridview-example/qml/gridview-example/pics/DateBook_48.png b/examples/declarative/modelviews/gridview/qml/gridview-example/pics/DateBook_48.png
index 58f5787fb8..58f5787fb8 100644
--- a/examples/declarative/modelviews/gridview-example/qml/gridview-example/pics/DateBook_48.png
+++ b/examples/declarative/modelviews/gridview/qml/gridview-example/pics/DateBook_48.png
diff --git a/examples/declarative/modelviews/gridview-example/qml/gridview-example/pics/EMail_48.png b/examples/declarative/modelviews/gridview/qml/gridview-example/pics/EMail_48.png
index d6d84a61be..d6d84a61be 100644
--- a/examples/declarative/modelviews/gridview-example/qml/gridview-example/pics/EMail_48.png
+++ b/examples/declarative/modelviews/gridview/qml/gridview-example/pics/EMail_48.png
diff --git a/examples/declarative/modelviews/gridview-example/qml/gridview-example/pics/TodoList_48.png b/examples/declarative/modelviews/gridview/qml/gridview-example/pics/TodoList_48.png
index 0988448d9b..0988448d9b 100644
--- a/examples/declarative/modelviews/gridview-example/qml/gridview-example/pics/TodoList_48.png
+++ b/examples/declarative/modelviews/gridview/qml/gridview-example/pics/TodoList_48.png
diff --git a/examples/declarative/modelviews/gridview-example/qml/gridview-example/pics/VideoPlayer_48.png b/examples/declarative/modelviews/gridview/qml/gridview-example/pics/VideoPlayer_48.png
index 52638c50a7..52638c50a7 100644
--- a/examples/declarative/modelviews/gridview-example/qml/gridview-example/pics/VideoPlayer_48.png
+++ b/examples/declarative/modelviews/gridview/qml/gridview-example/pics/VideoPlayer_48.png
diff --git a/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.desktop b/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.desktop
deleted file mode 100644
index d056093dfe..0000000000
--- a/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=dynamiclist
-Exec=/opt/usr/bin/dynamiclist
-Icon=dynamiclist
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.desktop b/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.desktop
deleted file mode 100644
index 6113e0004e..0000000000
--- a/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=expandingdelegates
-Exec=/opt/usr/bin/expandingdelegates
-Icon=expandingdelegates
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/README b/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/README
deleted file mode 100644
index 1ceed78db4..0000000000
--- a/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/README
+++ /dev/null
@@ -1,6 +0,0 @@
-The Debian Package expandingdelegates
-----------------------------
-
-Comments regarding the Package
-
- -- Daniel Molkentin <danimo@unknown>  Thu, 18 Nov 2010 17:28:38 +0100
diff --git a/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/changelog b/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/changelog
deleted file mode 100644
index 5161d7d624..0000000000
--- a/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-expandingdelegates (0.0.1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Daniel Molkentin <danimo@unknown>  Thu, 18 Nov 2010 17:28:38 +0100
diff --git a/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/compat b/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/compat
deleted file mode 100644
index 7f8f011eb7..0000000000
--- a/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/control b/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/control
deleted file mode 100644
index 6993cea518..0000000000
--- a/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: expandingdelegates
-Section: user/hidden
-Priority: optional
-Maintainer: Daniel Molkentin <danimo@unknown>
-Build-Depends: debhelper (>= 5), libqt4-dev
-Standards-Version: 3.7.3
-Homepage: <insert the upstream URL, if relevant>
-
-Package: expandingdelegates
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
diff --git a/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/copyright b/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/copyright
deleted file mode 100644
index 6185298041..0000000000
--- a/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/copyright
+++ /dev/null
@@ -1,40 +0,0 @@
-This package was debianized by Daniel Molkentin <danimo@unknown> on
-Thu, 18 Nov 2010 17:28:38 +0100.
-
-It was downloaded from <url://example.com>
-
-Upstream Author(s):
-
-    <put author's name and email here>
-    <likewise for another author>
-
-Copyright:
-
-    <Copyright (C) YYYY Name OfAuthor>
-    <likewise for another author>
-
-License:
-
-    This package is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2010, Daniel Molkentin <danimo@unknown> and
-is licensed under the GPL, see above.
-
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
diff --git a/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/rules b/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/rules
deleted file mode 100755
index 96213efd2b..0000000000
--- a/examples/declarative/modelviews/listview/expandingdelegates/qtc_packaging/debian_fremantle/rules
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-
-
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp  
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/expandingdelegates.sgml > expandingdelegates.1
-
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	$(MAKE) clean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/expandingdelegates.
-	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/expandingdelegates install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	# dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_makeshlibs
-	dh_installdeb
-	# dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/examples/declarative/modelviews/listview/highlight/highlight.desktop b/examples/declarative/modelviews/listview/highlight/highlight.desktop
deleted file mode 100644
index 5348e40e9c..0000000000
--- a/examples/declarative/modelviews/listview/highlight/highlight.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=highlight
-Exec=/opt/usr/bin/highlight
-Icon=highlight
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/README b/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/README
deleted file mode 100644
index 37e930ad1d..0000000000
--- a/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/README
+++ /dev/null
@@ -1,6 +0,0 @@
-The Debian Package highlight
-----------------------------
-
-Comments regarding the Package
-
- -- Daniel Molkentin <danimo@unknown>  Thu, 18 Nov 2010 17:33:55 +0100
diff --git a/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/changelog b/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/changelog
deleted file mode 100644
index 43e669b50d..0000000000
--- a/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-highlight (0.0.1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Daniel Molkentin <danimo@unknown>  Thu, 18 Nov 2010 17:33:55 +0100
diff --git a/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/compat b/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/compat
deleted file mode 100644
index 7f8f011eb7..0000000000
--- a/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/control b/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/control
deleted file mode 100644
index 0ed2ce2d00..0000000000
--- a/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: highlight
-Section: user/hidden
-Priority: optional
-Maintainer: Daniel Molkentin <danimo@unknown>
-Build-Depends: debhelper (>= 5), libqt4-dev
-Standards-Version: 3.7.3
-Homepage: <insert the upstream URL, if relevant>
-
-Package: highlight
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
diff --git a/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/copyright b/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/copyright
deleted file mode 100644
index b795943e8a..0000000000
--- a/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/copyright
+++ /dev/null
@@ -1,40 +0,0 @@
-This package was debianized by Daniel Molkentin <danimo@unknown> on
-Thu, 18 Nov 2010 17:33:55 +0100.
-
-It was downloaded from <url://example.com>
-
-Upstream Author(s):
-
-    <put author's name and email here>
-    <likewise for another author>
-
-Copyright:
-
-    <Copyright (C) YYYY Name OfAuthor>
-    <likewise for another author>
-
-License:
-
-    This package is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2010, Daniel Molkentin <danimo@unknown> and
-is licensed under the GPL, see above.
-
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
diff --git a/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/rules b/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/rules
deleted file mode 100755
index 986e3ee119..0000000000
--- a/examples/declarative/modelviews/listview/highlight/qtc_packaging/debian_fremantle/rules
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-
-
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp  
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/highlight.sgml > highlight.1
-
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	$(MAKE) clean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/highlight.
-	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/highlight install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	# dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_makeshlibs
-	dh_installdeb
-	# dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/examples/declarative/modelviews/listview/highlightranges/highlightranges.desktop b/examples/declarative/modelviews/listview/highlightranges/highlightranges.desktop
deleted file mode 100644
index 57200be95e..0000000000
--- a/examples/declarative/modelviews/listview/highlightranges/highlightranges.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=highlightranges
-Exec=/opt/usr/bin/highlightranges
-Icon=highlightranges
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/listview/listview.pro b/examples/declarative/modelviews/listview/listview.pro
new file mode 100644
index 0000000000..877eb7cdb3
--- /dev/null
+++ b/examples/declarative/modelviews/listview/listview.pro
@@ -0,0 +1,8 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    dynamiclist \
+    expandingdelegates \
+    highlight \
+    highlightranges \
+    sections
diff --git a/examples/declarative/modelviews/listview/sections/sections.desktop b/examples/declarative/modelviews/listview/sections/sections.desktop
deleted file mode 100644
index c11801e623..0000000000
--- a/examples/declarative/modelviews/listview/sections/sections.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=sections
-Exec=/opt/usr/bin/sections
-Icon=sections
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/modelviews.pro b/examples/declarative/modelviews/modelviews.pro
index b811e44dc9..00e07fec03 100644
--- a/examples/declarative/modelviews/modelviews.pro
+++ b/examples/declarative/modelviews/modelviews.pro
@@ -2,6 +2,15 @@ TEMPLATE = subdirs
 
 SUBDIRS += \
     objectlistmodel \
-    stringlistmodel
-
+    stringlistmodel \
+    abstractitemmodel \
+    gridview \
+    listview \
+    objectlistmodel \
+    package \
+    parallax \
+    pathview \
+    stringlistmodel \
+    visualitemmodel \
+    webview
 
diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
index 6d282ee41c..be38339c4a 100644
--- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
+++ b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
@@ -33,7 +33,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp \
            dataobject.cpp
 HEADERS += dataobject.h
-RESOURCES += objectlistmodel.qrc
 
 # Please do not modify the following two lines. Required for deployment.
 desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/objectlistmodel
diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.qrc b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.qrc
deleted file mode 100644
index 24560791d3..0000000000
--- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>qml/objectlistmodel/view.qml</file>
-</qresource>
-</RCC>
diff --git a/examples/declarative/modelviews/package/Delegate.desktop b/examples/declarative/modelviews/package/Delegate.desktop
deleted file mode 100644
index 8e401287bb..0000000000
--- a/examples/declarative/modelviews/package/Delegate.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=Delegate
-Exec=/opt/Delegate/bin/Delegate
-Icon=Delegate64
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/package/Delegate80.png b/examples/declarative/modelviews/package/Delegate80.png
deleted file mode 100644
index 6ad8096c45..0000000000
--- a/examples/declarative/modelviews/package/Delegate80.png
+++ /dev/null
diff --git a/examples/declarative/modelviews/package/Delegate_harmattan.desktop b/examples/declarative/modelviews/package/Delegate_harmattan.desktop
deleted file mode 100644
index 780e99feb5..0000000000
--- a/examples/declarative/modelviews/package/Delegate_harmattan.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=Delegate
-Exec=/usr/bin/single-instance /opt/Delegate/bin/Delegate
-Icon=/usr/share/icons/hicolor/80x80/apps/Delegate80.png
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/package/Delegate.pro b/examples/declarative/modelviews/package/package.pro
index 35e40e07d9..fccebb280a 100644
--- a/examples/declarative/modelviews/package/Delegate.pro
+++ b/examples/declarative/modelviews/package/package.pro
@@ -1,5 +1,5 @@
 # Add more folders to ship with the application, here
-folder_01.source = qml\Delegate
+folder_01.source = qml/package
 folder_01.target = qml
 DEPLOYMENTFOLDERS = folder_01
 
diff --git a/examples/declarative/modelviews/package/qml/Delegate/Delegate.qml b/examples/declarative/modelviews/package/qml/package/Delegate.qml
index 24abc5de75..24abc5de75 100644
--- a/examples/declarative/modelviews/package/qml/Delegate/Delegate.qml
+++ b/examples/declarative/modelviews/package/qml/package/Delegate.qml
diff --git a/examples/declarative/modelviews/package/qml/Delegate/view.qml b/examples/declarative/modelviews/package/qml/package/view.qml
index 1715ba1dfd..1715ba1dfd 100644
--- a/examples/declarative/modelviews/package/qml/Delegate/view.qml
+++ b/examples/declarative/modelviews/package/qml/package/view.qml
diff --git a/examples/declarative/modelviews/parallax/parallax.desktop b/examples/declarative/modelviews/parallax/parallax.desktop
deleted file mode 100644
index c3d8cfca90..0000000000
--- a/examples/declarative/modelviews/parallax/parallax.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=parallax
-Exec=/opt/parallax/bin/parallax
-Icon=parallax64
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/parallax/parallax_harmattan.desktop b/examples/declarative/modelviews/parallax/parallax_harmattan.desktop
deleted file mode 100644
index 2fff2552cd..0000000000
--- a/examples/declarative/modelviews/parallax/parallax_harmattan.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=parallax
-Exec=/usr/bin/single-instance /opt/parallax/bin/parallax
-Icon=/usr/share/icons/hicolor/80x80/apps/parallax80.png
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/webview/googlemaps/qml/googlemaps/inlinehtml.qml b/examples/declarative/modelviews/parallax/qml/parallax/Clock.qml
index afc1fa93d3..c230aab908 100644
--- a/examples/declarative/modelviews/webview/googlemaps/qml/googlemaps/inlinehtml.qml
+++ b/examples/declarative/modelviews/parallax/qml/parallax/Clock.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -38,18 +38,17 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
-import QtWebKit 1.0
+import QtQuick 1.1
 
-// Inline HTML with loose formatting can be
-// set on the html property.
-WebView {
-    html:"\
-        <body>
-        <table border=1>
-            <tr><th><th>One<th>Two<th>Three
-            <tr><th>1<td>X<td>1<td>X
-            <tr><th>2<td>0<td>X<td>0
-            <tr><th>3<td>X<td>1<td>X
-        </table>"
+Text {
+    Timer {
+        triggeredOnStart: true
+        onTriggered: parent.text = Qt.formatTime(new Date())
+        interval: 1000; running: visible; repeat: true;
+    }
+
+    font.pixelSize: 32
+    font.family: "sans-serif"
+    font.bold: true
+    color: "white"
 }
diff --git a/examples/declarative/modelviews/parallax/qml/parallax/parallax.qml b/examples/declarative/modelviews/parallax/qml/parallax/parallax.qml
index c518910f46..68219fe249 100644
--- a/examples/declarative/modelviews/parallax/qml/parallax/parallax.qml
+++ b/examples/declarative/modelviews/parallax/qml/parallax/parallax.qml
@@ -39,8 +39,6 @@
 ****************************************************************************/
 
 import QtQuick 1.0
-import "../../../../toys/clocks/content"  // for loading the Clock element
-//import "qml"
 
 Rectangle {
     width: 320; height: 480
@@ -65,14 +63,7 @@ Rectangle {
         Item {
             property url icon: "pics/yast-joystick.png"
             width: 320; height: 480
-
-            Loader {
-                anchors { top: parent.top; topMargin: 10; horizontalCenter: parent.horizontalCenter }
-                width: 300; height: 400
-                clip: true; 
-                source: "../../../../../../demos/declarative/samegame/samegame.qml"
-                Component.onCompleted: item.inAnotherDemo = true;
-            }
+            Image { anchors.centerIn: parent; source: "pics/samegame.png" }
         }
     }
 }
diff --git a/examples/declarative/modelviews/pathview-example/pathview.qmlproject b/examples/declarative/modelviews/pathview-example/pathview.qmlproject
deleted file mode 100644
index 71c8cb3cea..0000000000
--- a/examples/declarative/modelviews/pathview-example/pathview.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "qml/pathview-example"
-    }
-    JavaScriptFiles {
-        directory: "qml/pathview-example"
-    }
-    ImageFiles {
-        directory: "qml/pathview-example"
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/modelviews/pathview-example/pathviewexample.desktop b/examples/declarative/modelviews/pathview-example/pathviewexample.desktop
deleted file mode 100644
index 30d29e3242..0000000000
--- a/examples/declarative/modelviews/pathview-example/pathviewexample.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=pathview-example
-Exec=/opt/usr/bin/pathview-example
-Icon=pathview-example
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/pathview-example/pathviewexample.png b/examples/declarative/modelviews/pathview-example/pathviewexample.png
deleted file mode 100644
index 707d5c4e85..0000000000
--- a/examples/declarative/modelviews/pathview-example/pathviewexample.png
+++ /dev/null
diff --git a/examples/declarative/modelviews/pathview-example/pathviewexample.svg b/examples/declarative/modelviews/pathview-example/pathviewexample.svg
deleted file mode 100644
index 566acfada0..0000000000
--- a/examples/declarative/modelviews/pathview-example/pathviewexample.svg
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="44px"
-   version="1.1"
-   viewBox="0 0 44 44"
-   width="44px"
-   x="0px"
-   y="0px"
-   id="svg2"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="qt.svg">
-  <metadata
-     id="metadata18">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs16">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 22 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="44 : 22 : 1"
-       inkscape:persp3d-origin="22 : 14.666667 : 1"
-       id="perspective2836" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1020"
-     id="namedview14"
-     showgrid="false"
-     inkscape:zoom="21.454545"
-     inkscape:cx="49.412871"
-     inkscape:cy="21.894358"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3" />
-  <g
-     transform="matrix(0.18308778,0,0,0.18308778,6.6100946,3.2385199)"
-     id="g3">
-    <path
-       d="M 43.09,0.3586 C 40.94,0.0036 38.84,-0.0824 36.81,0.0776 31.968136,0.39505671 27.122677,0.73638425 22.28,1.0696 9.62,2.0816 0,12.4996 0,26.8896 l 0,169.7 14.19,13.2 28.87,-209.42 0.03,-0.011 z"
-       style="fill:#006225"
-       id="path5"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       d="m 174.4,160 c 0,12.5 -7.75,24.07 -17.57,25.77 L 14.23,209.73 V 25.93 C 14.23,9.21 27.57,-2.27 43.12,0.3 l 131.3,21.52 v 138.2 z"
-       style="fill:#80c342"
-       id="path7" />
-    <path
-       d="m 154.9,80.96 -12.96,-0.598 0,0.278 6.945,0.32 6.016,0 z"
-       style="fill:#006225"
-       id="path11" />
-    <path
-       d="m 144.6,135.6 c 0.66,0.328 1.43,0.476 2.351,0.476 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 h -6.015 c -1.821,0.832 -3.532,1.457 -5.176,1.848 z"
-       style="fill:#006225"
-       id="path13" />
-    <path
-       id="path17"
-       style="fill:#ffffff"
-       d="m 91.15,132.4 c 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -4.34,0 -7.68,2.535 -10.01,7.625 -2.52,5.543 -3.793,17.04 -3.793,34.44 0,16.82 1.238,28.75 3.734,35.75 2.356,6.672 5.879,9.976 10.5,9.976 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 m 17.98,3.75 c -4.117,9.707 -10.39,16.06 -18.99,19 0.867,4.449 2.176,7.441 3.922,9.019 1.351,1.211 3.433,1.821 6.222,1.821 0.805,0 1.668,-0.055 2.59,-0.157 v 13.12 l -5.961,0.782 c -1.758,0.23 -3.426,0.343 -5.004,0.343 -5.218,0 -9.445,-1.265 -12.62,-3.824 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 1.629,0 3.309,0.102 5.043,0.305 11.95,1.375 20.62,7.016 26.26,16.79 5.535,9.562 8.254,23.27 8.254,41.26 0,16.48 -2,29.45 -6.043,39.02 z M 130.4,45.91 l 11.52,1.238 0,20.21 12.96,0.914 0,12.68 -12.96,-0.598 0,46.33 c 0,4.032 0.445,6.625 1.34,7.789 0.8,1.067 2.046,1.594 3.71,1.594 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 v 11.65 c -5.136,2.258 -10.18,3.598 -15.12,4.02 -0.718,0.055 -1.41,0.086 -2.078,0.086 -4.48,0 -7.906,-1.301 -10.25,-3.934 -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.535 L 118.046,79.25 V 65.66 l 7.586,0.547 4.773,-20.3 z" />
-    <path
-       d="m 100.3,166 c 0.809,0 1.672,-0.055 2.59,-0.157 H 98.054 C 98.73,165.949 99.507,166 100.3,166 z"
-       style="fill:#006225"
-       id="path19" />
-    <path
-       id="path21"
-       style="fill:#006225"
-       d="m 84.85,63.98 c 2.336,5.997 3.484,16.92 3.484,32.81 0,17.7 -1.16,29.57 -3.512,35.62 -1.894,4.879 -4.527,7.902 -7.863,9.07 0.965,0.368 1.992,0.551 3.078,0.551 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -1.09,0 -2.117,0.16 -3.082,0.481 h -0.004 c 3.601,1.121 6.379,4.215 8.336,9.261 z m -2.344,114.3 c -0.113,-0.05 -0.227,-0.105 -0.336,-0.16 -0.012,-0.004 -0.023,-0.012 -0.035,-0.015 -0.102,-0.051 -0.207,-0.106 -0.309,-0.157 -0.019,-0.011 -0.039,-0.019 -0.058,-0.031 -0.09,-0.051 -0.184,-0.098 -0.278,-0.148 -0.027,-0.016 -0.054,-0.036 -0.086,-0.051 -0.082,-0.043 -0.164,-0.09 -0.242,-0.137 -0.039,-0.023 -0.078,-0.047 -0.113,-0.07 -0.07,-0.039 -0.145,-0.082 -0.215,-0.125 -0.047,-0.031 -0.094,-0.059 -0.14,-0.09 -0.059,-0.039 -0.118,-0.074 -0.176,-0.113 -0.059,-0.039 -0.114,-0.075 -0.168,-0.114 -0.051,-0.031 -0.102,-0.066 -0.149,-0.097 -0.066,-0.047 -0.132,-0.094 -0.195,-0.137 -0.039,-0.027 -0.078,-0.055 -0.113,-0.082 -0.078,-0.055 -0.153,-0.113 -0.231,-0.172 -0.023,-0.016 -0.05,-0.035 -0.078,-0.055 -0.098,-0.078 -0.199,-0.156 -0.297,-0.234 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 h -6.351 c -10.15,0.008 -18.22,3.977 -24,12.04 -6.855,9.563 -10.34,24.64 -10.34,45.07 0,18.95 2.547,33.44 7.551,43.34 4.934,9.75 12.05,15.56 21.19,17.5 1.989,9.641 5.09,16.16 9.297,19.54 3.176,2.559 7.403,3.824 12.62,3.824 0.098,0 0.199,0 0.297,-0.004 h 5.539 c -3.406,-0.05 -6.383,-0.66 -8.906,-1.828 L 82.498,178.28 z M 128.4,145.6 c -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.57 l -6.226,-0.285 v -13.59 h -6.016 v 3.035 c 0.871,3.273 1.555,6.82 2.063,10.64 l 4.164,0.192 v 51.36 c 0,6.723 1.367,11.62 4.09,14.67 2.343,2.633 5.765,3.934 10.25,3.934 h 6.015 c -4.48,0 -7.906,-1.301 -10.25,-3.934 z m 2.043,-99.66 -6.016,0 -4.668,19.88 5.911,0.422 4.773,-20.3 z" />
-  </g>
-</svg>
diff --git a/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/README b/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/README
deleted file mode 100644
index 0d8225202e..0000000000
--- a/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/README
+++ /dev/null
@@ -1,6 +0,0 @@
-The Debian Package pathviewexample
-----------------------------
-
-Comments regarding the Package
-
- -- Daniel Molkentin <danimo@unknown>  Thu, 18 Nov 2010 17:48:31 +0100
diff --git a/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/changelog b/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/changelog
deleted file mode 100644
index ab74121717..0000000000
--- a/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-pathviewexample (0.0.1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Daniel Molkentin <danimo@unknown>  Thu, 18 Nov 2010 17:48:31 +0100
diff --git a/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/compat b/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/compat
deleted file mode 100644
index 7f8f011eb7..0000000000
--- a/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/control b/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/control
deleted file mode 100644
index c931a891f2..0000000000
--- a/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: pathviewexample
-Section: user/hidden
-Priority: optional
-Maintainer: Daniel Molkentin <danimo@unknown>
-Build-Depends: debhelper (>= 5), libqt4-dev
-Standards-Version: 3.7.3
-Homepage: <insert the upstream URL, if relevant>
-
-Package: pathviewexample
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
diff --git a/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/copyright b/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/copyright
deleted file mode 100644
index f848d27ec1..0000000000
--- a/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/copyright
+++ /dev/null
@@ -1,40 +0,0 @@
-This package was debianized by Daniel Molkentin <danimo@unknown> on
-Thu, 18 Nov 2010 17:48:31 +0100.
-
-It was downloaded from <url://example.com>
-
-Upstream Author(s):
-
-    <put author's name and email here>
-    <likewise for another author>
-
-Copyright:
-
-    <Copyright (C) YYYY Name OfAuthor>
-    <likewise for another author>
-
-License:
-
-    This package is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2010, Daniel Molkentin <danimo@unknown> and
-is licensed under the GPL, see above.
-
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
diff --git a/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/rules b/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/rules
deleted file mode 100755
index c604e5dc1f..0000000000
--- a/examples/declarative/modelviews/pathview-example/qtc_packaging/debian_fremantle/rules
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-
-
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp  
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/pathviewexample.sgml > pathviewexample.1
-
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	$(MAKE) clean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/pathviewexample.
-	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/pathviewexample install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	# dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_makeshlibs
-	dh_installdeb
-	# dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/examples/declarative/modelviews/pathview-example/main.cpp b/examples/declarative/modelviews/pathview/main.cpp
index 80cd88b213..80cd88b213 100644
--- a/examples/declarative/modelviews/pathview-example/main.cpp
+++ b/examples/declarative/modelviews/pathview/main.cpp
diff --git a/examples/declarative/modelviews/pathview/pathview-example.qml b/examples/declarative/modelviews/pathview/pathview-example.qml
deleted file mode 100644
index bddab8fd3d..0000000000
--- a/examples/declarative/modelviews/pathview/pathview-example.qml
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-
-Rectangle {
-    width: 400; height: 240
-    color: "white"
-
-    ListModel {
-        id: appModel
-        ListElement { name: "Music"; icon: "pics/AudioPlayer_48.png" }
-        ListElement { name: "Movies"; icon: "pics/VideoPlayer_48.png" }
-        ListElement { name: "Camera"; icon: "pics/Camera_48.png" }
-        ListElement { name: "Calendar"; icon: "pics/DateBook_48.png" }
-        ListElement { name: "Messaging"; icon: "pics/EMail_48.png" }
-        ListElement { name: "Todo List"; icon: "pics/TodoList_48.png" }
-        ListElement { name: "Contacts"; icon: "pics/AddressBook_48.png" }
-    }
-
-    Component {
-        id: appDelegate
-        Item {
-            width: 100; height: 100
-            scale: PathView.iconScale
-
-            Image {
-                id: myIcon
-                y: 20; anchors.horizontalCenter: parent.horizontalCenter
-                source: icon
-                smooth: true
-            }
-            Text {
-                anchors { top: myIcon.bottom; horizontalCenter: parent.horizontalCenter }
-                text: name
-                smooth: true
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: view.currentIndex = index
-            }
-        }
-    }
-
-    Component {
-        id: appHighlight
-        Rectangle { width: 80; height: 80; color: "lightsteelblue" }
-    }
-
-    PathView {
-        id: view
-        anchors.fill: parent
-        highlight: appHighlight
-        preferredHighlightBegin: 0.5
-        preferredHighlightEnd: 0.5
-        focus: true
-        model: appModel
-        delegate: appDelegate
-        path: Path {
-            startX: 10
-            startY: 50
-            PathAttribute { name: "iconScale"; value: 0.5 }
-            PathQuad { x: 200; y: 150; controlX: 50; controlY: 200 }
-            PathAttribute { name: "iconScale"; value: 1.0 }
-            PathQuad { x: 390; y: 50; controlX: 350; controlY: 200 }
-            PathAttribute { name: "iconScale"; value: 0.5 }
-        }
-    }
-}
diff --git a/examples/declarative/modelviews/package/Delegate64.png b/examples/declarative/modelviews/pathview/pathview.png
index 707d5c4e85..707d5c4e85 100644
--- a/examples/declarative/modelviews/package/Delegate64.png
+++ b/examples/declarative/modelviews/pathview/pathview.png
diff --git a/examples/declarative/modelviews/pathview-example/pathviewexample.pro b/examples/declarative/modelviews/pathview/pathview.pro
index 83bae6da30..83bae6da30 100644
--- a/examples/declarative/modelviews/pathview-example/pathviewexample.pro
+++ b/examples/declarative/modelviews/pathview/pathview.pro
diff --git a/examples/declarative/modelviews/pathview/pathview.qmlproject b/examples/declarative/modelviews/pathview/pathview.qmlproject
index d4909f8685..71c8cb3cea 100644
--- a/examples/declarative/modelviews/pathview/pathview.qmlproject
+++ b/examples/declarative/modelviews/pathview/pathview.qmlproject
@@ -3,13 +3,13 @@ import QmlProject 1.0
 Project {
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {
-        directory: "."
+        directory: "qml/pathview-example"
     }
     JavaScriptFiles {
-        directory: "."
+        directory: "qml/pathview-example"
     }
     ImageFiles {
-        directory: "."
+        directory: "qml/pathview-example"
     }
     /* List of plugin directories passed to QML runtime */
     // importPaths: [ " ../exampleplugin " ]
diff --git a/examples/declarative/modelviews/package/Delegate.svg b/examples/declarative/modelviews/pathview/pathview.svg
index 566acfada0..566acfada0 100644
--- a/examples/declarative/modelviews/package/Delegate.svg
+++ b/examples/declarative/modelviews/pathview/pathview.svg
diff --git a/examples/declarative/modelviews/pathview-example/qml/pathview-example/pathview-example.qml b/examples/declarative/modelviews/pathview/qml/pathview-example/pathview-example.qml
index 267c57c869..267c57c869 100644
--- a/examples/declarative/modelviews/pathview-example/qml/pathview-example/pathview-example.qml
+++ b/examples/declarative/modelviews/pathview/qml/pathview-example/pathview-example.qml
diff --git a/examples/declarative/modelviews/pathview-example/qml/pathview-example/pics/AddressBook_48.png b/examples/declarative/modelviews/pathview/qml/pathview-example/pics/AddressBook_48.png
index 1ab7c8eec1..1ab7c8eec1 100644
--- a/examples/declarative/modelviews/pathview-example/qml/pathview-example/pics/AddressBook_48.png
+++ b/examples/declarative/modelviews/pathview/qml/pathview-example/pics/AddressBook_48.png
diff --git a/examples/declarative/modelviews/pathview-example/qml/pathview-example/pics/AudioPlayer_48.png b/examples/declarative/modelviews/pathview/qml/pathview-example/pics/AudioPlayer_48.png
index f4b8689f87..f4b8689f87 100644
--- a/examples/declarative/modelviews/pathview-example/qml/pathview-example/pics/AudioPlayer_48.png
+++ b/examples/declarative/modelviews/pathview/qml/pathview-example/pics/AudioPlayer_48.png
diff --git a/examples/declarative/modelviews/pathview-example/qml/pathview-example/pics/Camera_48.png b/examples/declarative/modelviews/pathview/qml/pathview-example/pics/Camera_48.png
index c76b524945..c76b524945 100644
--- a/examples/declarative/modelviews/pathview-example/qml/pathview-example/pics/Camera_48.png
+++ b/examples/declarative/modelviews/pathview/qml/pathview-example/pics/Camera_48.png
diff --git a/examples/declarative/modelviews/pathview-example/qml/pathview-example/pics/DateBook_48.png b/examples/declarative/modelviews/pathview/qml/pathview-example/pics/DateBook_48.png
index 58f5787fb8..58f5787fb8 100644
--- a/examples/declarative/modelviews/pathview-example/qml/pathview-example/pics/DateBook_48.png
+++ b/examples/declarative/modelviews/pathview/qml/pathview-example/pics/DateBook_48.png
diff --git a/examples/declarative/modelviews/pathview-example/qml/pathview-example/pics/EMail_48.png b/examples/declarative/modelviews/pathview/qml/pathview-example/pics/EMail_48.png
index d6d84a61be..d6d84a61be 100644
--- a/examples/declarative/modelviews/pathview-example/qml/pathview-example/pics/EMail_48.png
+++ b/examples/declarative/modelviews/pathview/qml/pathview-example/pics/EMail_48.png
diff --git a/examples/declarative/modelviews/pathview-example/qml/pathview-example/pics/TodoList_48.png b/examples/declarative/modelviews/pathview/qml/pathview-example/pics/TodoList_48.png
index 0988448d9b..0988448d9b 100644
--- a/examples/declarative/modelviews/pathview-example/qml/pathview-example/pics/TodoList_48.png
+++ b/examples/declarative/modelviews/pathview/qml/pathview-example/pics/TodoList_48.png
diff --git a/examples/declarative/modelviews/pathview-example/qml/pathview-example/pics/VideoPlayer_48.png b/examples/declarative/modelviews/pathview/qml/pathview-example/pics/VideoPlayer_48.png
index 52638c50a7..52638c50a7 100644
--- a/examples/declarative/modelviews/pathview-example/qml/pathview-example/pics/VideoPlayer_48.png
+++ b/examples/declarative/modelviews/pathview/qml/pathview-example/pics/VideoPlayer_48.png
diff --git a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.qrc b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.qrc
deleted file mode 100644
index 17e9301471..0000000000
--- a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>view.qml</file>
-</qresource>
-</RCC>
diff --git a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.desktop b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.desktop
deleted file mode 100644
index ae40ec030f..0000000000
--- a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=visualitemmodel
-Exec=/opt/usr/bin/visualitemmodel
-Icon=visualitemmodel
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/webview/alerts/alerts.desktop b/examples/declarative/modelviews/webview/alerts/alerts.desktop
deleted file mode 100644
index 80af9d2ca8..0000000000
--- a/examples/declarative/modelviews/webview/alerts/alerts.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=alerts
-Exec=/opt/usr/bin/alerts
-Icon=alerts
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/webview/alerts/qml/alerts/autosize.qml b/examples/declarative/modelviews/webview/alerts/qml/alerts/autosize.qml
deleted file mode 100644
index 7e10403f8f..0000000000
--- a/examples/declarative/modelviews/webview/alerts/qml/alerts/autosize.qml
+++ /dev/null
@@ -1,106 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-// The WebView size is determined by the width, height,
-// preferredWidth, and preferredHeight properties.
-Rectangle {
-    id: rect
-    width: 200
-    height: layout.height
-
-    Column {
-        id: layout
-        spacing: 2
-
-        WebView {
-            html: "No width defined."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-
-        WebView {
-            width: rect.width
-            html: "The width is full."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-
-        WebView {
-            width: rect.width/2
-            html: "The width is half."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-        WebView {
-            width: rect.width/2
-            html: "The_width_is_half."  // not wrapped
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-
-        WebView {
-            preferredWidth: rect.width/2
-            html: "The preferredWidth is half."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-        WebView {
-            preferredWidth: rect.width/2
-            html: "The_preferredWidth_is_half." // not wrapped
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-    }
-}
diff --git a/examples/declarative/modelviews/webview/alerts/qml/alerts/content/Mapping/Map.qml b/examples/declarative/modelviews/webview/alerts/qml/alerts/content/Mapping/Map.qml
deleted file mode 100644
index 9a865795e0..0000000000
--- a/examples/declarative/modelviews/webview/alerts/qml/alerts/content/Mapping/Map.qml
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-Item {
-    id: page
-
-    property real latitude: -34.397
-    property real longitude: 150.644
-    property string address: ""
-    property alias status: js.status
-
-    WebView {
-        id: map
-        anchors.fill: parent
-        url: "map.html"
-        pressGrabTime: 0
-        javaScriptWindowObjects: QtObject {
-            id: js
-            WebView.windowObjectName: "qml"
-            property real lat: page.latitude
-            property real lng: page.longitude
-            property string address: page.address
-            property string status: "Loading"
-
-            onAddressChanged: { 
-                if (map.url != "" && map.progress == 1) 
-                    map.evaluateJavaScript("goToAddress()") 
-            }
-        }
-
-        onLoadFinished: { evaluateJavaScript("goToAddress()"); }
-    }
-}
diff --git a/examples/declarative/modelviews/webview/alerts/qml/alerts/content/Mapping/map.html b/examples/declarative/modelviews/webview/alerts/qml/alerts/content/Mapping/map.html
deleted file mode 100644
index a98da5430f..0000000000
--- a/examples/declarative/modelviews/webview/alerts/qml/alerts/content/Mapping/map.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<html>
-<head>
-<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
-<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-<script type="text/javascript">
-  var geocoder
-  var map
-  function goToLatLng(latlng,bounds) {
-    if (map) {
-        map.setCenter(latlng)
-        map.fitBounds(bounds)
-    } else {
-        var myOptions = {
-          zoom: 8,
-          center: latlng,
-          mapTypeId: google.maps.MapTypeId.ROADMAP
-        };
-        map = new google.maps.Map(document.getElementById("map_canvas"), myOptions);
-    }
-  }
-  function initialize() {
-    geocoder = new google.maps.Geocoder();
-    if (window.qml.address) {
-        goToAddress()
-    } else {
-        goToLatLng(new google.maps.LatLng(window.qml.lat,window.qml.lng));
-    }
-    if (navigator.geolocation) {
-      navigator.geolocation.getCurrentPosition(function(position) {
-        initialLocation = new google.maps.LatLng(position.coords.latitude,position.coords.longitude);
-        window.qml.lat = initialLocation.lat;
-        window.qml.lng = initialLocation.lng;
-        goToLatLng(initialLocation);
-      });
-    }
-  }
-  function goToAddress() {
-      if (geocoder) {
-        var req = {
-            address: window.qml.address,
-        }
-        if (map)
-            req.bounds = map.getBounds()
-        window.qml.status = "Loading";
-        geocoder.geocode(req, function(results, status) {
-          if (status == google.maps.GeocoderStatus.OK) {
-            window.qml.status = "Ready";
-            goToLatLng(results[0].geometry.location,results[0].geometry.bounds);
-          } else {
-            window.qml.status = "Error";
-          }
-        });
-      }
-  }
-</script>
-</head>
-<body onload="initialize()" leftmargin="0px" topmargin="0px" marginwidth="0px" marginheight="0px">
-  <div id="map_canvas" style="width:100%; height:100%"></div>
-</body>
-</html>
diff --git a/examples/declarative/modelviews/webview/alerts/qml/alerts/content/pics/cancel.png b/examples/declarative/modelviews/webview/alerts/qml/alerts/content/pics/cancel.png
deleted file mode 100644
index ecc95331f2..0000000000
--- a/examples/declarative/modelviews/webview/alerts/qml/alerts/content/pics/cancel.png
+++ /dev/null
diff --git a/examples/declarative/modelviews/webview/alerts/qml/alerts/content/pics/ok.png b/examples/declarative/modelviews/webview/alerts/qml/alerts/content/pics/ok.png
deleted file mode 100644
index 5795f04fbf..0000000000
--- a/examples/declarative/modelviews/webview/alerts/qml/alerts/content/pics/ok.png
+++ /dev/null
diff --git a/examples/declarative/modelviews/webview/alerts/qml/alerts/googlemaps.qml b/examples/declarative/modelviews/webview/alerts/qml/alerts/googlemaps.qml
deleted file mode 100644
index aed0ddd025..0000000000
--- a/examples/declarative/modelviews/webview/alerts/qml/alerts/googlemaps.qml
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// This example demonstrates how Web services such as Google Maps can be
-// abstracted as QML types. Here we have a "Mapping" module with a "Map"
-// type. The Map type has an address property. Setting that property moves
-// the map. The underlying implementation uses WebView and the Google Maps
-// API, but users from QML don't need to understand the implementation in
-// order to create a Map.
-
-import QtQuick 1.0
-import QtWebKit 1.0
-import "content/Mapping"
-
-Map {
-    id: map
-    width: 300
-    height: 300
-    address: "Paris"
-
-    Rectangle {
-        x: 70
-        width: input.width + 20
-        height: input.height + 4
-        anchors.bottom: parent.bottom; anchors.bottomMargin: 5
-        radius: 5
-        opacity: map.status == "Ready" ? 1 : 0
-
-        TextInput {
-            id: input
-            text: map.address
-            anchors.centerIn: parent
-            Keys.onReturnPressed: map.address = input.text
-        }
-    }
-
-    Text {
-        id: loading
-        anchors.centerIn: parent
-        text: map.status == "Error" ? "Error" : "Loading"
-        opacity: map.status == "Ready" ? 0 : 1
-        font.pixelSize: 30
-
-        Behavior on opacity { NumberAnimation{} }
-    }
-}
diff --git a/examples/declarative/modelviews/webview/alerts/qml/alerts/inlinehtml.qml b/examples/declarative/modelviews/webview/alerts/qml/alerts/inlinehtml.qml
deleted file mode 100644
index afc1fa93d3..0000000000
--- a/examples/declarative/modelviews/webview/alerts/qml/alerts/inlinehtml.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-// Inline HTML with loose formatting can be
-// set on the html property.
-WebView {
-    html:"\
-        <body>
-        <table border=1>
-            <tr><th><th>One<th>Two<th>Three
-            <tr><th>1<td>X<td>1<td>X
-            <tr><th>2<td>0<td>X<td>0
-            <tr><th>3<td>X<td>1<td>X
-        </table>"
-}
diff --git a/examples/declarative/modelviews/webview/alerts/qml/alerts/newwindows.html b/examples/declarative/modelviews/webview/alerts/qml/alerts/newwindows.html
deleted file mode 100644
index f169599387..0000000000
--- a/examples/declarative/modelviews/webview/alerts/qml/alerts/newwindows.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Multiple windows...</h1>
-
-<a target="_blank" href="newwindows.html">Popup!</a>
diff --git a/examples/declarative/modelviews/webview/alerts/qml/alerts/newwindows.qml b/examples/declarative/modelviews/webview/alerts/qml/alerts/newwindows.qml
deleted file mode 100644
index 52f7a0b4dd..0000000000
--- a/examples/declarative/modelviews/webview/alerts/qml/alerts/newwindows.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Demonstrates opening new WebViews from HTML
-//
-// Note that to open windows from JavaScript, you will need to
-// allow it on WebView with settings.javascriptCanOpenWindows: true
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-Grid {
-    columns: 3
-    id: pages
-    height: 300; width: 600
-
-    Component {
-        id: webViewPage
-        Rectangle {
-            width: webView.width
-            height: webView.height
-            border.color: "gray"
-
-            WebView {
-                id: webView
-                newWindowComponent: webViewPage
-                newWindowParent: pages
-                url: "newwindows.html"
-            }
-        }
-    }
-
-    Loader { sourceComponent: webViewPage }
-}
diff --git a/examples/declarative/modelviews/webview/autosize/autosize.desktop b/examples/declarative/modelviews/webview/autosize/autosize.desktop
deleted file mode 100644
index 29a81c56c6..0000000000
--- a/examples/declarative/modelviews/webview/autosize/autosize.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=autosize
-Exec=/opt/usr/bin/autosize
-Icon=autosize
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/webview/autosize/qml/autosize/alerts.html b/examples/declarative/modelviews/webview/autosize/qml/autosize/alerts.html
deleted file mode 100644
index 82caddf7fb..0000000000
--- a/examples/declarative/modelviews/webview/autosize/qml/autosize/alerts.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body onclick="alert('This is an alert')">
-<p>This is a web page. It fires an alert when clicked.
-</body>
-</html>
diff --git a/examples/declarative/modelviews/webview/autosize/qml/autosize/alerts.qml b/examples/declarative/modelviews/webview/autosize/qml/autosize/alerts.qml
deleted file mode 100644
index 4aa4a3bc75..0000000000
--- a/examples/declarative/modelviews/webview/autosize/qml/autosize/alerts.qml
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-WebView {
-    id: webView
-    width: 200
-    height: 150
-    url: "alerts.html"
-
-    onAlert: popup.show(message)
-
-    Rectangle {
-        id: popup
-
-        color: "red"
-        border.color: "black"; border.width: 2
-        radius: 4
-
-        y: parent.height // off "screen"
-        anchors.horizontalCenter: parent.horizontalCenter
-        width: label.width + 5
-        height: label.height + 5
-
-        opacity: 0
-
-        function show(text) {
-            label.text = text
-            popup.state = "visible"
-            timer.start()
-        }
-        states: State {
-            name: "visible"
-            PropertyChanges { target: popup; opacity: 1 }
-            PropertyChanges { target: popup; y: (webView.height-popup.height)/2 }
-        }
-
-        transitions: [
-            Transition { from: ""; PropertyAnimation { properties: "opacity,y"; duration: 65 } },
-            Transition { from: "visible"; PropertyAnimation { properties: "opacity,y"; duration: 500 } }
-        ]
-
-        Timer {
-            id: timer
-            interval: 1000
-
-            onTriggered: popup.state = ""
-        }
-
-        Text {
-            id: label
-            anchors.centerIn: parent
-            width: webView.width  *0.75
-
-            color: "white"
-            font.pixelSize: 20
-            wrapMode: Text.WordWrap
-            horizontalAlignment: Text.AlignHCenter
-            smooth: true
-        }
-    }
-}
diff --git a/examples/declarative/modelviews/webview/autosize/qml/autosize/content/Mapping/Map.qml b/examples/declarative/modelviews/webview/autosize/qml/autosize/content/Mapping/Map.qml
deleted file mode 100644
index 9a865795e0..0000000000
--- a/examples/declarative/modelviews/webview/autosize/qml/autosize/content/Mapping/Map.qml
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-Item {
-    id: page
-
-    property real latitude: -34.397
-    property real longitude: 150.644
-    property string address: ""
-    property alias status: js.status
-
-    WebView {
-        id: map
-        anchors.fill: parent
-        url: "map.html"
-        pressGrabTime: 0
-        javaScriptWindowObjects: QtObject {
-            id: js
-            WebView.windowObjectName: "qml"
-            property real lat: page.latitude
-            property real lng: page.longitude
-            property string address: page.address
-            property string status: "Loading"
-
-            onAddressChanged: { 
-                if (map.url != "" && map.progress == 1) 
-                    map.evaluateJavaScript("goToAddress()") 
-            }
-        }
-
-        onLoadFinished: { evaluateJavaScript("goToAddress()"); }
-    }
-}
diff --git a/examples/declarative/modelviews/webview/autosize/qml/autosize/content/Mapping/map.html b/examples/declarative/modelviews/webview/autosize/qml/autosize/content/Mapping/map.html
deleted file mode 100644
index a98da5430f..0000000000
--- a/examples/declarative/modelviews/webview/autosize/qml/autosize/content/Mapping/map.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<html>
-<head>
-<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
-<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-<script type="text/javascript">
-  var geocoder
-  var map
-  function goToLatLng(latlng,bounds) {
-    if (map) {
-        map.setCenter(latlng)
-        map.fitBounds(bounds)
-    } else {
-        var myOptions = {
-          zoom: 8,
-          center: latlng,
-          mapTypeId: google.maps.MapTypeId.ROADMAP
-        };
-        map = new google.maps.Map(document.getElementById("map_canvas"), myOptions);
-    }
-  }
-  function initialize() {
-    geocoder = new google.maps.Geocoder();
-    if (window.qml.address) {
-        goToAddress()
-    } else {
-        goToLatLng(new google.maps.LatLng(window.qml.lat,window.qml.lng));
-    }
-    if (navigator.geolocation) {
-      navigator.geolocation.getCurrentPosition(function(position) {
-        initialLocation = new google.maps.LatLng(position.coords.latitude,position.coords.longitude);
-        window.qml.lat = initialLocation.lat;
-        window.qml.lng = initialLocation.lng;
-        goToLatLng(initialLocation);
-      });
-    }
-  }
-  function goToAddress() {
-      if (geocoder) {
-        var req = {
-            address: window.qml.address,
-        }
-        if (map)
-            req.bounds = map.getBounds()
-        window.qml.status = "Loading";
-        geocoder.geocode(req, function(results, status) {
-          if (status == google.maps.GeocoderStatus.OK) {
-            window.qml.status = "Ready";
-            goToLatLng(results[0].geometry.location,results[0].geometry.bounds);
-          } else {
-            window.qml.status = "Error";
-          }
-        });
-      }
-  }
-</script>
-</head>
-<body onload="initialize()" leftmargin="0px" topmargin="0px" marginwidth="0px" marginheight="0px">
-  <div id="map_canvas" style="width:100%; height:100%"></div>
-</body>
-</html>
diff --git a/examples/declarative/modelviews/webview/autosize/qml/autosize/content/pics/cancel.png b/examples/declarative/modelviews/webview/autosize/qml/autosize/content/pics/cancel.png
deleted file mode 100644
index ecc95331f2..0000000000
--- a/examples/declarative/modelviews/webview/autosize/qml/autosize/content/pics/cancel.png
+++ /dev/null
diff --git a/examples/declarative/modelviews/webview/autosize/qml/autosize/content/pics/ok.png b/examples/declarative/modelviews/webview/autosize/qml/autosize/content/pics/ok.png
deleted file mode 100644
index 5795f04fbf..0000000000
--- a/examples/declarative/modelviews/webview/autosize/qml/autosize/content/pics/ok.png
+++ /dev/null
diff --git a/examples/declarative/modelviews/webview/autosize/qml/autosize/googlemaps.qml b/examples/declarative/modelviews/webview/autosize/qml/autosize/googlemaps.qml
deleted file mode 100644
index aed0ddd025..0000000000
--- a/examples/declarative/modelviews/webview/autosize/qml/autosize/googlemaps.qml
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// This example demonstrates how Web services such as Google Maps can be
-// abstracted as QML types. Here we have a "Mapping" module with a "Map"
-// type. The Map type has an address property. Setting that property moves
-// the map. The underlying implementation uses WebView and the Google Maps
-// API, but users from QML don't need to understand the implementation in
-// order to create a Map.
-
-import QtQuick 1.0
-import QtWebKit 1.0
-import "content/Mapping"
-
-Map {
-    id: map
-    width: 300
-    height: 300
-    address: "Paris"
-
-    Rectangle {
-        x: 70
-        width: input.width + 20
-        height: input.height + 4
-        anchors.bottom: parent.bottom; anchors.bottomMargin: 5
-        radius: 5
-        opacity: map.status == "Ready" ? 1 : 0
-
-        TextInput {
-            id: input
-            text: map.address
-            anchors.centerIn: parent
-            Keys.onReturnPressed: map.address = input.text
-        }
-    }
-
-    Text {
-        id: loading
-        anchors.centerIn: parent
-        text: map.status == "Error" ? "Error" : "Loading"
-        opacity: map.status == "Ready" ? 0 : 1
-        font.pixelSize: 30
-
-        Behavior on opacity { NumberAnimation{} }
-    }
-}
diff --git a/examples/declarative/modelviews/webview/autosize/qml/autosize/inlinehtml.qml b/examples/declarative/modelviews/webview/autosize/qml/autosize/inlinehtml.qml
deleted file mode 100644
index afc1fa93d3..0000000000
--- a/examples/declarative/modelviews/webview/autosize/qml/autosize/inlinehtml.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-// Inline HTML with loose formatting can be
-// set on the html property.
-WebView {
-    html:"\
-        <body>
-        <table border=1>
-            <tr><th><th>One<th>Two<th>Three
-            <tr><th>1<td>X<td>1<td>X
-            <tr><th>2<td>0<td>X<td>0
-            <tr><th>3<td>X<td>1<td>X
-        </table>"
-}
diff --git a/examples/declarative/modelviews/webview/autosize/qml/autosize/newwindows.html b/examples/declarative/modelviews/webview/autosize/qml/autosize/newwindows.html
deleted file mode 100644
index f169599387..0000000000
--- a/examples/declarative/modelviews/webview/autosize/qml/autosize/newwindows.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Multiple windows...</h1>
-
-<a target="_blank" href="newwindows.html">Popup!</a>
diff --git a/examples/declarative/modelviews/webview/autosize/qml/autosize/newwindows.qml b/examples/declarative/modelviews/webview/autosize/qml/autosize/newwindows.qml
deleted file mode 100644
index 52f7a0b4dd..0000000000
--- a/examples/declarative/modelviews/webview/autosize/qml/autosize/newwindows.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Demonstrates opening new WebViews from HTML
-//
-// Note that to open windows from JavaScript, you will need to
-// allow it on WebView with settings.javascriptCanOpenWindows: true
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-Grid {
-    columns: 3
-    id: pages
-    height: 300; width: 600
-
-    Component {
-        id: webViewPage
-        Rectangle {
-            width: webView.width
-            height: webView.height
-            border.color: "gray"
-
-            WebView {
-                id: webView
-                newWindowComponent: webViewPage
-                newWindowParent: pages
-                url: "newwindows.html"
-            }
-        }
-    }
-
-    Loader { sourceComponent: webViewPage }
-}
diff --git a/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/README b/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/README
deleted file mode 100644
index ba73287d29..0000000000
--- a/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/README
+++ /dev/null
@@ -1,6 +0,0 @@
-The Debian Package autosize
-----------------------------
-
-Comments regarding the Package
-
- -- Daniel Molkentin <danimo@unknown>  Thu, 18 Nov 2010 17:21:56 +0100
diff --git a/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/changelog b/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/changelog
deleted file mode 100644
index 2939e3b558..0000000000
--- a/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-autosize (0.0.1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Daniel Molkentin <danimo@unknown>  Thu, 18 Nov 2010 17:21:56 +0100
diff --git a/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/compat b/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/compat
deleted file mode 100644
index 7f8f011eb7..0000000000
--- a/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/control b/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/control
deleted file mode 100644
index 22a510cdb6..0000000000
--- a/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: autosize
-Section: user/hidden
-Priority: optional
-Maintainer: Daniel Molkentin <danimo@unknown>
-Build-Depends: debhelper (>= 5), libqt4-dev
-Standards-Version: 3.7.3
-Homepage: <insert the upstream URL, if relevant>
-
-Package: autosize
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
diff --git a/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/copyright b/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/copyright
deleted file mode 100644
index afff162db4..0000000000
--- a/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/copyright
+++ /dev/null
@@ -1,40 +0,0 @@
-This package was debianized by Daniel Molkentin <danimo@unknown> on
-Thu, 18 Nov 2010 17:21:56 +0100.
-
-It was downloaded from <url://example.com>
-
-Upstream Author(s):
-
-    <put author's name and email here>
-    <likewise for another author>
-
-Copyright:
-
-    <Copyright (C) YYYY Name OfAuthor>
-    <likewise for another author>
-
-License:
-
-    This package is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2010, Daniel Molkentin <danimo@unknown> and
-is licensed under the GPL, see above.
-
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
diff --git a/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/rules b/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/rules
deleted file mode 100755
index 5fa637ce6d..0000000000
--- a/examples/declarative/modelviews/webview/autosize/qtc_packaging/debian_fremantle/rules
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-
-
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp  
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/autosize.sgml > autosize.1
-
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	$(MAKE) clean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/autosize.
-	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/autosize install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	# dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_makeshlibs
-	dh_installdeb
-	# dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/examples/declarative/modelviews/webview/content/Mapping/Map.qml b/examples/declarative/modelviews/webview/content/Mapping/Map.qml
deleted file mode 100644
index e88ce8b25c..0000000000
--- a/examples/declarative/modelviews/webview/content/Mapping/Map.qml
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-Item {
-    id: page
-
-    property real latitude: -34.397
-    property real longitude: 150.644
-    property string address: ""
-    property alias status: js.status
-
-    WebView {
-        id: map
-        anchors.fill: parent
-        url: "map.html"
-        pressGrabTime: 0
-        javaScriptWindowObjects: QtObject {
-            id: js
-            WebView.windowObjectName: "qml"
-            property real lat: page.latitude
-            property real lng: page.longitude
-            property string address: page.address
-            property string status: "Loading"
-
-            onAddressChanged: { 
-                if (map.url != "" && map.progress == 1) 
-                    map.evaluateJavaScript("goToAddress()") 
-            }
-        }
-
-        onLoadFinished: { evaluateJavaScript("goToAddress()"); }
-    }
-}
diff --git a/examples/declarative/modelviews/webview/googlemaps/googlemaps.desktop b/examples/declarative/modelviews/webview/googlemaps/googlemaps.desktop
deleted file mode 100644
index 99d9a79f50..0000000000
--- a/examples/declarative/modelviews/webview/googlemaps/googlemaps.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=googlemaps
-Exec=/opt/usr/bin/googlemaps
-Icon=googlemaps
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/webview/googlemaps/qml/googlemaps/alerts.html b/examples/declarative/modelviews/webview/googlemaps/qml/googlemaps/alerts.html
deleted file mode 100644
index 82caddf7fb..0000000000
--- a/examples/declarative/modelviews/webview/googlemaps/qml/googlemaps/alerts.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body onclick="alert('This is an alert')">
-<p>This is a web page. It fires an alert when clicked.
-</body>
-</html>
diff --git a/examples/declarative/modelviews/webview/googlemaps/qml/googlemaps/alerts.qml b/examples/declarative/modelviews/webview/googlemaps/qml/googlemaps/alerts.qml
deleted file mode 100644
index 4aa4a3bc75..0000000000
--- a/examples/declarative/modelviews/webview/googlemaps/qml/googlemaps/alerts.qml
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-WebView {
-    id: webView
-    width: 200
-    height: 150
-    url: "alerts.html"
-
-    onAlert: popup.show(message)
-
-    Rectangle {
-        id: popup
-
-        color: "red"
-        border.color: "black"; border.width: 2
-        radius: 4
-
-        y: parent.height // off "screen"
-        anchors.horizontalCenter: parent.horizontalCenter
-        width: label.width + 5
-        height: label.height + 5
-
-        opacity: 0
-
-        function show(text) {
-            label.text = text
-            popup.state = "visible"
-            timer.start()
-        }
-        states: State {
-            name: "visible"
-            PropertyChanges { target: popup; opacity: 1 }
-            PropertyChanges { target: popup; y: (webView.height-popup.height)/2 }
-        }
-
-        transitions: [
-            Transition { from: ""; PropertyAnimation { properties: "opacity,y"; duration: 65 } },
-            Transition { from: "visible"; PropertyAnimation { properties: "opacity,y"; duration: 500 } }
-        ]
-
-        Timer {
-            id: timer
-            interval: 1000
-
-            onTriggered: popup.state = ""
-        }
-
-        Text {
-            id: label
-            anchors.centerIn: parent
-            width: webView.width  *0.75
-
-            color: "white"
-            font.pixelSize: 20
-            wrapMode: Text.WordWrap
-            horizontalAlignment: Text.AlignHCenter
-            smooth: true
-        }
-    }
-}
diff --git a/examples/declarative/modelviews/webview/googlemaps/qml/googlemaps/autosize.qml b/examples/declarative/modelviews/webview/googlemaps/qml/googlemaps/autosize.qml
deleted file mode 100644
index 7e10403f8f..0000000000
--- a/examples/declarative/modelviews/webview/googlemaps/qml/googlemaps/autosize.qml
+++ /dev/null
@@ -1,106 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-// The WebView size is determined by the width, height,
-// preferredWidth, and preferredHeight properties.
-Rectangle {
-    id: rect
-    width: 200
-    height: layout.height
-
-    Column {
-        id: layout
-        spacing: 2
-
-        WebView {
-            html: "No width defined."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-
-        WebView {
-            width: rect.width
-            html: "The width is full."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-
-        WebView {
-            width: rect.width/2
-            html: "The width is half."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-        WebView {
-            width: rect.width/2
-            html: "The_width_is_half."  // not wrapped
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-
-        WebView {
-            preferredWidth: rect.width/2
-            html: "The preferredWidth is half."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-        WebView {
-            preferredWidth: rect.width/2
-            html: "The_preferredWidth_is_half." // not wrapped
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-    }
-}
diff --git a/examples/declarative/modelviews/webview/googlemaps/qml/googlemaps/newwindows.html b/examples/declarative/modelviews/webview/googlemaps/qml/googlemaps/newwindows.html
deleted file mode 100644
index f169599387..0000000000
--- a/examples/declarative/modelviews/webview/googlemaps/qml/googlemaps/newwindows.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Multiple windows...</h1>
-
-<a target="_blank" href="newwindows.html">Popup!</a>
diff --git a/examples/declarative/modelviews/webview/googlemaps/qml/googlemaps/newwindows.qml b/examples/declarative/modelviews/webview/googlemaps/qml/googlemaps/newwindows.qml
deleted file mode 100644
index 52f7a0b4dd..0000000000
--- a/examples/declarative/modelviews/webview/googlemaps/qml/googlemaps/newwindows.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Demonstrates opening new WebViews from HTML
-//
-// Note that to open windows from JavaScript, you will need to
-// allow it on WebView with settings.javascriptCanOpenWindows: true
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-Grid {
-    columns: 3
-    id: pages
-    height: 300; width: 600
-
-    Component {
-        id: webViewPage
-        Rectangle {
-            width: webView.width
-            height: webView.height
-            border.color: "gray"
-
-            WebView {
-                id: webView
-                newWindowComponent: webViewPage
-                newWindowParent: pages
-                url: "newwindows.html"
-            }
-        }
-    }
-
-    Loader { sourceComponent: webViewPage }
-}
diff --git a/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/README b/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/README
deleted file mode 100644
index 8bc7f9e30d..0000000000
--- a/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/README
+++ /dev/null
@@ -1,6 +0,0 @@
-The Debian Package googlemaps
-----------------------------
-
-Comments regarding the Package
-
- -- Daniel Molkentin <danimo@unknown>  Thu, 18 Nov 2010 17:19:23 +0100
diff --git a/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/changelog b/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/changelog
deleted file mode 100644
index e3e11d92dd..0000000000
--- a/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-googlemaps (0.0.1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Daniel Molkentin <danimo@unknown>  Thu, 18 Nov 2010 17:19:23 +0100
diff --git a/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/compat b/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/compat
deleted file mode 100644
index 7f8f011eb7..0000000000
--- a/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/control b/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/control
deleted file mode 100644
index e046e7c063..0000000000
--- a/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: googlemaps
-Section: user/hidden
-Priority: optional
-Maintainer: Daniel Molkentin <danimo@unknown>
-Build-Depends: debhelper (>= 5), libqt4-dev
-Standards-Version: 3.7.3
-Homepage: <insert the upstream URL, if relevant>
-
-Package: googlemaps
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
diff --git a/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/copyright b/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/copyright
deleted file mode 100644
index d800cefd9c..0000000000
--- a/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/copyright
+++ /dev/null
@@ -1,40 +0,0 @@
-This package was debianized by Daniel Molkentin <danimo@unknown> on
-Thu, 18 Nov 2010 17:19:23 +0100.
-
-It was downloaded from <url://example.com>
-
-Upstream Author(s):
-
-    <put author's name and email here>
-    <likewise for another author>
-
-Copyright:
-
-    <Copyright (C) YYYY Name OfAuthor>
-    <likewise for another author>
-
-License:
-
-    This package is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2010, Daniel Molkentin <danimo@unknown> and
-is licensed under the GPL, see above.
-
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
diff --git a/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/rules b/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/rules
deleted file mode 100755
index de6c89aab2..0000000000
--- a/examples/declarative/modelviews/webview/googlemaps/qtc_packaging/debian_fremantle/rules
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-
-
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp  
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/googlemaps.sgml > googlemaps.1
-
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	$(MAKE) clean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/googlemaps.
-	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/googlemaps install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	# dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_makeshlibs
-	dh_installdeb
-	# dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/examples/declarative/modelviews/webview/inlinehtml/inlinehtml.desktop b/examples/declarative/modelviews/webview/inlinehtml/inlinehtml.desktop
deleted file mode 100644
index 98e594929c..0000000000
--- a/examples/declarative/modelviews/webview/inlinehtml/inlinehtml.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=inlinehtml
-Exec=/opt/usr/bin/inlinehtml
-Icon=inlinehtml
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/alerts.html b/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/alerts.html
deleted file mode 100644
index 82caddf7fb..0000000000
--- a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/alerts.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body onclick="alert('This is an alert')">
-<p>This is a web page. It fires an alert when clicked.
-</body>
-</html>
diff --git a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/alerts.qml b/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/alerts.qml
deleted file mode 100644
index 4aa4a3bc75..0000000000
--- a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/alerts.qml
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-WebView {
-    id: webView
-    width: 200
-    height: 150
-    url: "alerts.html"
-
-    onAlert: popup.show(message)
-
-    Rectangle {
-        id: popup
-
-        color: "red"
-        border.color: "black"; border.width: 2
-        radius: 4
-
-        y: parent.height // off "screen"
-        anchors.horizontalCenter: parent.horizontalCenter
-        width: label.width + 5
-        height: label.height + 5
-
-        opacity: 0
-
-        function show(text) {
-            label.text = text
-            popup.state = "visible"
-            timer.start()
-        }
-        states: State {
-            name: "visible"
-            PropertyChanges { target: popup; opacity: 1 }
-            PropertyChanges { target: popup; y: (webView.height-popup.height)/2 }
-        }
-
-        transitions: [
-            Transition { from: ""; PropertyAnimation { properties: "opacity,y"; duration: 65 } },
-            Transition { from: "visible"; PropertyAnimation { properties: "opacity,y"; duration: 500 } }
-        ]
-
-        Timer {
-            id: timer
-            interval: 1000
-
-            onTriggered: popup.state = ""
-        }
-
-        Text {
-            id: label
-            anchors.centerIn: parent
-            width: webView.width  *0.75
-
-            color: "white"
-            font.pixelSize: 20
-            wrapMode: Text.WordWrap
-            horizontalAlignment: Text.AlignHCenter
-            smooth: true
-        }
-    }
-}
diff --git a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/autosize.qml b/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/autosize.qml
deleted file mode 100644
index 7e10403f8f..0000000000
--- a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/autosize.qml
+++ /dev/null
@@ -1,106 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-// The WebView size is determined by the width, height,
-// preferredWidth, and preferredHeight properties.
-Rectangle {
-    id: rect
-    width: 200
-    height: layout.height
-
-    Column {
-        id: layout
-        spacing: 2
-
-        WebView {
-            html: "No width defined."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-
-        WebView {
-            width: rect.width
-            html: "The width is full."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-
-        WebView {
-            width: rect.width/2
-            html: "The width is half."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-        WebView {
-            width: rect.width/2
-            html: "The_width_is_half."  // not wrapped
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-
-        WebView {
-            preferredWidth: rect.width/2
-            html: "The preferredWidth is half."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-        WebView {
-            preferredWidth: rect.width/2
-            html: "The_preferredWidth_is_half." // not wrapped
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-    }
-}
diff --git a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/content/Mapping/Map.qml b/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/content/Mapping/Map.qml
deleted file mode 100644
index 9a865795e0..0000000000
--- a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/content/Mapping/Map.qml
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-Item {
-    id: page
-
-    property real latitude: -34.397
-    property real longitude: 150.644
-    property string address: ""
-    property alias status: js.status
-
-    WebView {
-        id: map
-        anchors.fill: parent
-        url: "map.html"
-        pressGrabTime: 0
-        javaScriptWindowObjects: QtObject {
-            id: js
-            WebView.windowObjectName: "qml"
-            property real lat: page.latitude
-            property real lng: page.longitude
-            property string address: page.address
-            property string status: "Loading"
-
-            onAddressChanged: { 
-                if (map.url != "" && map.progress == 1) 
-                    map.evaluateJavaScript("goToAddress()") 
-            }
-        }
-
-        onLoadFinished: { evaluateJavaScript("goToAddress()"); }
-    }
-}
diff --git a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/content/Mapping/map.html b/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/content/Mapping/map.html
deleted file mode 100644
index a98da5430f..0000000000
--- a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/content/Mapping/map.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<html>
-<head>
-<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
-<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-<script type="text/javascript">
-  var geocoder
-  var map
-  function goToLatLng(latlng,bounds) {
-    if (map) {
-        map.setCenter(latlng)
-        map.fitBounds(bounds)
-    } else {
-        var myOptions = {
-          zoom: 8,
-          center: latlng,
-          mapTypeId: google.maps.MapTypeId.ROADMAP
-        };
-        map = new google.maps.Map(document.getElementById("map_canvas"), myOptions);
-    }
-  }
-  function initialize() {
-    geocoder = new google.maps.Geocoder();
-    if (window.qml.address) {
-        goToAddress()
-    } else {
-        goToLatLng(new google.maps.LatLng(window.qml.lat,window.qml.lng));
-    }
-    if (navigator.geolocation) {
-      navigator.geolocation.getCurrentPosition(function(position) {
-        initialLocation = new google.maps.LatLng(position.coords.latitude,position.coords.longitude);
-        window.qml.lat = initialLocation.lat;
-        window.qml.lng = initialLocation.lng;
-        goToLatLng(initialLocation);
-      });
-    }
-  }
-  function goToAddress() {
-      if (geocoder) {
-        var req = {
-            address: window.qml.address,
-        }
-        if (map)
-            req.bounds = map.getBounds()
-        window.qml.status = "Loading";
-        geocoder.geocode(req, function(results, status) {
-          if (status == google.maps.GeocoderStatus.OK) {
-            window.qml.status = "Ready";
-            goToLatLng(results[0].geometry.location,results[0].geometry.bounds);
-          } else {
-            window.qml.status = "Error";
-          }
-        });
-      }
-  }
-</script>
-</head>
-<body onload="initialize()" leftmargin="0px" topmargin="0px" marginwidth="0px" marginheight="0px">
-  <div id="map_canvas" style="width:100%; height:100%"></div>
-</body>
-</html>
diff --git a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/content/pics/cancel.png b/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/content/pics/cancel.png
deleted file mode 100644
index ecc95331f2..0000000000
--- a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/content/pics/cancel.png
+++ /dev/null
diff --git a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/content/pics/ok.png b/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/content/pics/ok.png
deleted file mode 100644
index 5795f04fbf..0000000000
--- a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/content/pics/ok.png
+++ /dev/null
diff --git a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/googlemaps.qml b/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/googlemaps.qml
deleted file mode 100644
index aed0ddd025..0000000000
--- a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/googlemaps.qml
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// This example demonstrates how Web services such as Google Maps can be
-// abstracted as QML types. Here we have a "Mapping" module with a "Map"
-// type. The Map type has an address property. Setting that property moves
-// the map. The underlying implementation uses WebView and the Google Maps
-// API, but users from QML don't need to understand the implementation in
-// order to create a Map.
-
-import QtQuick 1.0
-import QtWebKit 1.0
-import "content/Mapping"
-
-Map {
-    id: map
-    width: 300
-    height: 300
-    address: "Paris"
-
-    Rectangle {
-        x: 70
-        width: input.width + 20
-        height: input.height + 4
-        anchors.bottom: parent.bottom; anchors.bottomMargin: 5
-        radius: 5
-        opacity: map.status == "Ready" ? 1 : 0
-
-        TextInput {
-            id: input
-            text: map.address
-            anchors.centerIn: parent
-            Keys.onReturnPressed: map.address = input.text
-        }
-    }
-
-    Text {
-        id: loading
-        anchors.centerIn: parent
-        text: map.status == "Error" ? "Error" : "Loading"
-        opacity: map.status == "Ready" ? 0 : 1
-        font.pixelSize: 30
-
-        Behavior on opacity { NumberAnimation{} }
-    }
-}
diff --git a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/newwindows.html b/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/newwindows.html
deleted file mode 100644
index f169599387..0000000000
--- a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/newwindows.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Multiple windows...</h1>
-
-<a target="_blank" href="newwindows.html">Popup!</a>
diff --git a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/newwindows.qml b/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/newwindows.qml
deleted file mode 100644
index 52f7a0b4dd..0000000000
--- a/examples/declarative/modelviews/webview/inlinehtml/qml/inlinehtml/newwindows.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Demonstrates opening new WebViews from HTML
-//
-// Note that to open windows from JavaScript, you will need to
-// allow it on WebView with settings.javascriptCanOpenWindows: true
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-Grid {
-    columns: 3
-    id: pages
-    height: 300; width: 600
-
-    Component {
-        id: webViewPage
-        Rectangle {
-            width: webView.width
-            height: webView.height
-            border.color: "gray"
-
-            WebView {
-                id: webView
-                newWindowComponent: webViewPage
-                newWindowParent: pages
-                url: "newwindows.html"
-            }
-        }
-    }
-
-    Loader { sourceComponent: webViewPage }
-}
diff --git a/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/README b/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/README
deleted file mode 100644
index c0dfce0cdb..0000000000
--- a/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/README
+++ /dev/null
@@ -1,6 +0,0 @@
-The Debian Package inlinehtml
-----------------------------
-
-Comments regarding the Package
-
- -- Daniel Molkentin <danimo@unknown>  Thu, 18 Nov 2010 17:20:40 +0100
diff --git a/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/changelog b/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/changelog
deleted file mode 100644
index 68a99304bd..0000000000
--- a/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-inlinehtml (0.0.1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Daniel Molkentin <danimo@unknown>  Thu, 18 Nov 2010 17:20:40 +0100
diff --git a/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/compat b/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/compat
deleted file mode 100644
index 7f8f011eb7..0000000000
--- a/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/control b/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/control
deleted file mode 100644
index dbb1638edc..0000000000
--- a/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: inlinehtml
-Section: user/hidden
-Priority: optional
-Maintainer: Daniel Molkentin <danimo@unknown>
-Build-Depends: debhelper (>= 5), libqt4-dev
-Standards-Version: 3.7.3
-Homepage: <insert the upstream URL, if relevant>
-
-Package: inlinehtml
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
diff --git a/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/copyright b/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/copyright
deleted file mode 100644
index 67b61f74a1..0000000000
--- a/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/copyright
+++ /dev/null
@@ -1,40 +0,0 @@
-This package was debianized by Daniel Molkentin <danimo@unknown> on
-Thu, 18 Nov 2010 17:20:40 +0100.
-
-It was downloaded from <url://example.com>
-
-Upstream Author(s):
-
-    <put author's name and email here>
-    <likewise for another author>
-
-Copyright:
-
-    <Copyright (C) YYYY Name OfAuthor>
-    <likewise for another author>
-
-License:
-
-    This package is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2010, Daniel Molkentin <danimo@unknown> and
-is licensed under the GPL, see above.
-
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
diff --git a/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/rules b/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/rules
deleted file mode 100755
index 39509f9e78..0000000000
--- a/examples/declarative/modelviews/webview/inlinehtml/qtc_packaging/debian_fremantle/rules
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-
-
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp  
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/inlinehtml.sgml > inlinehtml.1
-
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	$(MAKE) clean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/inlinehtml.
-	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/inlinehtml install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	# dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_makeshlibs
-	dh_installdeb
-	# dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/examples/declarative/modelviews/webview/newwindows/newwindows.desktop b/examples/declarative/modelviews/webview/newwindows/newwindows.desktop
deleted file mode 100644
index ab2655c596..0000000000
--- a/examples/declarative/modelviews/webview/newwindows/newwindows.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=newwindows
-Exec=/opt/usr/bin/newwindows
-Icon=newwindows
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/modelviews/webview/newwindows/qml/newwindows/alerts.html b/examples/declarative/modelviews/webview/newwindows/qml/newwindows/alerts.html
deleted file mode 100644
index 82caddf7fb..0000000000
--- a/examples/declarative/modelviews/webview/newwindows/qml/newwindows/alerts.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body onclick="alert('This is an alert')">
-<p>This is a web page. It fires an alert when clicked.
-</body>
-</html>
diff --git a/examples/declarative/modelviews/webview/newwindows/qml/newwindows/alerts.qml b/examples/declarative/modelviews/webview/newwindows/qml/newwindows/alerts.qml
deleted file mode 100644
index 4aa4a3bc75..0000000000
--- a/examples/declarative/modelviews/webview/newwindows/qml/newwindows/alerts.qml
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-WebView {
-    id: webView
-    width: 200
-    height: 150
-    url: "alerts.html"
-
-    onAlert: popup.show(message)
-
-    Rectangle {
-        id: popup
-
-        color: "red"
-        border.color: "black"; border.width: 2
-        radius: 4
-
-        y: parent.height // off "screen"
-        anchors.horizontalCenter: parent.horizontalCenter
-        width: label.width + 5
-        height: label.height + 5
-
-        opacity: 0
-
-        function show(text) {
-            label.text = text
-            popup.state = "visible"
-            timer.start()
-        }
-        states: State {
-            name: "visible"
-            PropertyChanges { target: popup; opacity: 1 }
-            PropertyChanges { target: popup; y: (webView.height-popup.height)/2 }
-        }
-
-        transitions: [
-            Transition { from: ""; PropertyAnimation { properties: "opacity,y"; duration: 65 } },
-            Transition { from: "visible"; PropertyAnimation { properties: "opacity,y"; duration: 500 } }
-        ]
-
-        Timer {
-            id: timer
-            interval: 1000
-
-            onTriggered: popup.state = ""
-        }
-
-        Text {
-            id: label
-            anchors.centerIn: parent
-            width: webView.width  *0.75
-
-            color: "white"
-            font.pixelSize: 20
-            wrapMode: Text.WordWrap
-            horizontalAlignment: Text.AlignHCenter
-            smooth: true
-        }
-    }
-}
diff --git a/examples/declarative/modelviews/webview/newwindows/qml/newwindows/autosize.qml b/examples/declarative/modelviews/webview/newwindows/qml/newwindows/autosize.qml
deleted file mode 100644
index 7e10403f8f..0000000000
--- a/examples/declarative/modelviews/webview/newwindows/qml/newwindows/autosize.qml
+++ /dev/null
@@ -1,106 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-// The WebView size is determined by the width, height,
-// preferredWidth, and preferredHeight properties.
-Rectangle {
-    id: rect
-    width: 200
-    height: layout.height
-
-    Column {
-        id: layout
-        spacing: 2
-
-        WebView {
-            html: "No width defined."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-
-        WebView {
-            width: rect.width
-            html: "The width is full."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-
-        WebView {
-            width: rect.width/2
-            html: "The width is half."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-        WebView {
-            width: rect.width/2
-            html: "The_width_is_half."  // not wrapped
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-
-        WebView {
-            preferredWidth: rect.width/2
-            html: "The preferredWidth is half."
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-        WebView {
-            preferredWidth: rect.width/2
-            html: "The_preferredWidth_is_half." // not wrapped
-            Rectangle {
-                color: "#10000000"
-                anchors.fill: parent
-            }
-        }
-    }
-}
diff --git a/examples/declarative/modelviews/webview/newwindows/qml/newwindows/content/Mapping/Map.qml b/examples/declarative/modelviews/webview/newwindows/qml/newwindows/content/Mapping/Map.qml
deleted file mode 100644
index 9a865795e0..0000000000
--- a/examples/declarative/modelviews/webview/newwindows/qml/newwindows/content/Mapping/Map.qml
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-Item {
-    id: page
-
-    property real latitude: -34.397
-    property real longitude: 150.644
-    property string address: ""
-    property alias status: js.status
-
-    WebView {
-        id: map
-        anchors.fill: parent
-        url: "map.html"
-        pressGrabTime: 0
-        javaScriptWindowObjects: QtObject {
-            id: js
-            WebView.windowObjectName: "qml"
-            property real lat: page.latitude
-            property real lng: page.longitude
-            property string address: page.address
-            property string status: "Loading"
-
-            onAddressChanged: { 
-                if (map.url != "" && map.progress == 1) 
-                    map.evaluateJavaScript("goToAddress()") 
-            }
-        }
-
-        onLoadFinished: { evaluateJavaScript("goToAddress()"); }
-    }
-}
diff --git a/examples/declarative/modelviews/webview/newwindows/qml/newwindows/content/Mapping/map.html b/examples/declarative/modelviews/webview/newwindows/qml/newwindows/content/Mapping/map.html
deleted file mode 100644
index a98da5430f..0000000000
--- a/examples/declarative/modelviews/webview/newwindows/qml/newwindows/content/Mapping/map.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<html>
-<head>
-<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
-<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-<script type="text/javascript">
-  var geocoder
-  var map
-  function goToLatLng(latlng,bounds) {
-    if (map) {
-        map.setCenter(latlng)
-        map.fitBounds(bounds)
-    } else {
-        var myOptions = {
-          zoom: 8,
-          center: latlng,
-          mapTypeId: google.maps.MapTypeId.ROADMAP
-        };
-        map = new google.maps.Map(document.getElementById("map_canvas"), myOptions);
-    }
-  }
-  function initialize() {
-    geocoder = new google.maps.Geocoder();
-    if (window.qml.address) {
-        goToAddress()
-    } else {
-        goToLatLng(new google.maps.LatLng(window.qml.lat,window.qml.lng));
-    }
-    if (navigator.geolocation) {
-      navigator.geolocation.getCurrentPosition(function(position) {
-        initialLocation = new google.maps.LatLng(position.coords.latitude,position.coords.longitude);
-        window.qml.lat = initialLocation.lat;
-        window.qml.lng = initialLocation.lng;
-        goToLatLng(initialLocation);
-      });
-    }
-  }
-  function goToAddress() {
-      if (geocoder) {
-        var req = {
-            address: window.qml.address,
-        }
-        if (map)
-            req.bounds = map.getBounds()
-        window.qml.status = "Loading";
-        geocoder.geocode(req, function(results, status) {
-          if (status == google.maps.GeocoderStatus.OK) {
-            window.qml.status = "Ready";
-            goToLatLng(results[0].geometry.location,results[0].geometry.bounds);
-          } else {
-            window.qml.status = "Error";
-          }
-        });
-      }
-  }
-</script>
-</head>
-<body onload="initialize()" leftmargin="0px" topmargin="0px" marginwidth="0px" marginheight="0px">
-  <div id="map_canvas" style="width:100%; height:100%"></div>
-</body>
-</html>
diff --git a/examples/declarative/modelviews/webview/newwindows/qml/newwindows/content/pics/cancel.png b/examples/declarative/modelviews/webview/newwindows/qml/newwindows/content/pics/cancel.png
deleted file mode 100644
index ecc95331f2..0000000000
--- a/examples/declarative/modelviews/webview/newwindows/qml/newwindows/content/pics/cancel.png
+++ /dev/null
diff --git a/examples/declarative/modelviews/webview/newwindows/qml/newwindows/content/pics/ok.png b/examples/declarative/modelviews/webview/newwindows/qml/newwindows/content/pics/ok.png
deleted file mode 100644
index 5795f04fbf..0000000000
--- a/examples/declarative/modelviews/webview/newwindows/qml/newwindows/content/pics/ok.png
+++ /dev/null
diff --git a/examples/declarative/modelviews/webview/newwindows/qml/newwindows/googlemaps.qml b/examples/declarative/modelviews/webview/newwindows/qml/newwindows/googlemaps.qml
deleted file mode 100644
index aed0ddd025..0000000000
--- a/examples/declarative/modelviews/webview/newwindows/qml/newwindows/googlemaps.qml
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// This example demonstrates how Web services such as Google Maps can be
-// abstracted as QML types. Here we have a "Mapping" module with a "Map"
-// type. The Map type has an address property. Setting that property moves
-// the map. The underlying implementation uses WebView and the Google Maps
-// API, but users from QML don't need to understand the implementation in
-// order to create a Map.
-
-import QtQuick 1.0
-import QtWebKit 1.0
-import "content/Mapping"
-
-Map {
-    id: map
-    width: 300
-    height: 300
-    address: "Paris"
-
-    Rectangle {
-        x: 70
-        width: input.width + 20
-        height: input.height + 4
-        anchors.bottom: parent.bottom; anchors.bottomMargin: 5
-        radius: 5
-        opacity: map.status == "Ready" ? 1 : 0
-
-        TextInput {
-            id: input
-            text: map.address
-            anchors.centerIn: parent
-            Keys.onReturnPressed: map.address = input.text
-        }
-    }
-
-    Text {
-        id: loading
-        anchors.centerIn: parent
-        text: map.status == "Error" ? "Error" : "Loading"
-        opacity: map.status == "Ready" ? 0 : 1
-        font.pixelSize: 30
-
-        Behavior on opacity { NumberAnimation{} }
-    }
-}
diff --git a/examples/declarative/modelviews/webview/newwindows/qml/newwindows/inlinehtml.qml b/examples/declarative/modelviews/webview/newwindows/qml/newwindows/inlinehtml.qml
deleted file mode 100644
index afc1fa93d3..0000000000
--- a/examples/declarative/modelviews/webview/newwindows/qml/newwindows/inlinehtml.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtWebKit 1.0
-
-// Inline HTML with loose formatting can be
-// set on the html property.
-WebView {
-    html:"\
-        <body>
-        <table border=1>
-            <tr><th><th>One<th>Two<th>Three
-            <tr><th>1<td>X<td>1<td>X
-            <tr><th>2<td>0<td>X<td>0
-            <tr><th>3<td>X<td>1<td>X
-        </table>"
-}
diff --git a/examples/declarative/modelviews/webview/webview.pro b/examples/declarative/modelviews/webview/webview.pro
new file mode 100644
index 0000000000..1cb7631f89
--- /dev/null
+++ b/examples/declarative/modelviews/webview/webview.pro
@@ -0,0 +1,8 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    alerts \
+    autosize \
+    googlemaps \
+    inlinehtml \
+    newwindows
diff --git a/examples/declarative/positioners/positioners.desktop b/examples/declarative/positioners/positioners.desktop
deleted file mode 100644
index 16b8efcf3a..0000000000
--- a/examples/declarative/positioners/positioners.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=positioners
-Exec=/opt/usr/bin/positioners
-Icon=positioners
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/righttoleft/layoutdirection/layoutdirection.desktop b/examples/declarative/righttoleft/layoutdirection/layoutdirection.desktop
deleted file mode 100644
index 36ca6eab4b..0000000000
--- a/examples/declarative/righttoleft/layoutdirection/layoutdirection.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=layoutdirection
-Exec=/opt/layoutdirection/bin/layoutdirection
-Icon=layoutdirection64
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/righttoleft/layoutdirection/layoutdirection_harmattan.desktop b/examples/declarative/righttoleft/layoutdirection/layoutdirection_harmattan.desktop
deleted file mode 100644
index ef5691e54b..0000000000
--- a/examples/declarative/righttoleft/layoutdirection/layoutdirection_harmattan.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=layoutdirection
-Exec=/usr/bin/single-instance /opt/layoutdirection/bin/layoutdirection
-Icon=/usr/share/icons/hicolor/80x80/apps/layoutdirection80.png
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.desktop b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.desktop
deleted file mode 100644
index 974bd80c3f..0000000000
--- a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=layoutmirroring
-Exec=/opt/layoutmirroring/bin/layoutmirroring
-Icon=layoutmirroring64
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring_harmattan.desktop b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring_harmattan.desktop
deleted file mode 100644
index 384ef0f6a6..0000000000
--- a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring_harmattan.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=layoutmirroring
-Exec=/usr/bin/single-instance /opt/layoutmirroring/bin/layoutmirroring
-Icon=/usr/share/icons/hicolor/80x80/apps/layoutmirroring80.png
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/righttoleft/textalignment/textalignment.desktop b/examples/declarative/righttoleft/textalignment/textalignment.desktop
deleted file mode 100644
index 7e932e7097..0000000000
--- a/examples/declarative/righttoleft/textalignment/textalignment.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=textalignment
-Exec=/opt/textalignment/bin/textalignment
-Icon=textalignment64
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/righttoleft/textalignment/textalignment_harmattan.desktop b/examples/declarative/righttoleft/textalignment/textalignment_harmattan.desktop
deleted file mode 100644
index 6efad80d06..0000000000
--- a/examples/declarative/righttoleft/textalignment/textalignment_harmattan.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=textalignment
-Exec=/usr/bin/single-instance /opt/textalignment/bin/textalignment
-Icon=/usr/share/icons/hicolor/80x80/apps/textalignment80.png
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/sqllocalstorage/sqllocalstorage.desktop b/examples/declarative/sqllocalstorage/sqllocalstorage.desktop
deleted file mode 100644
index 68022bed5e..0000000000
--- a/examples/declarative/sqllocalstorage/sqllocalstorage.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=sqllocalstorage
-Exec=/opt/sqllocalstorage/bin/sqllocalstorage
-Icon=sqllocalstorage64
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/sqllocalstorage/sqllocalstorage_harmattan.desktop b/examples/declarative/sqllocalstorage/sqllocalstorage_harmattan.desktop
deleted file mode 100644
index 6d053cca52..0000000000
--- a/examples/declarative/sqllocalstorage/sqllocalstorage_harmattan.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=sqllocalstorage
-Exec=/usr/bin/single-instance /opt/sqllocalstorage/bin/sqllocalstorage
-Icon=/usr/share/icons/hicolor/80x80/apps/sqllocalstorage80.png
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/text/fonts/availableFonts/availableFonts.desktop b/examples/declarative/text/fonts/availableFonts/availableFonts.desktop
deleted file mode 100644
index 708a8cfe7b..0000000000
--- a/examples/declarative/text/fonts/availableFonts/availableFonts.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=availableFonts
-Exec=/opt/usr/bin/availableFonts
-Icon=availableFonts
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/text/fonts/banner/banner.desktop b/examples/declarative/text/fonts/banner/banner.desktop
deleted file mode 100644
index 3cc66c528d..0000000000
--- a/examples/declarative/text/fonts/banner/banner.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=banner
-Exec=/opt/usr/bin/banner
-Icon=banner
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/text/fonts/fonts.pro b/examples/declarative/text/fonts/fonts.pro
index 3710ab2aba..2359918e07 100644
--- a/examples/declarative/text/fonts/fonts.pro
+++ b/examples/declarative/text/fonts/fonts.pro
@@ -1,4 +1,4 @@
-TEMPLATE += subdirs
+TEMPLATE = subdirs
 
 SUBDIRS += \
     availableFonts \
diff --git a/examples/declarative/text/fonts/fonts/fonts.desktop b/examples/declarative/text/fonts/fonts/fonts.desktop
deleted file mode 100644
index ffb31e918d..0000000000
--- a/examples/declarative/text/fonts/fonts/fonts.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=fonts
-Exec=/opt/usr/bin/fonts
-Icon=fonts
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/text/fonts/hello/hello.desktop b/examples/declarative/text/fonts/hello/hello.desktop
deleted file mode 100644
index ad55aade26..0000000000
--- a/examples/declarative/text/fonts/hello/hello.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=hello
-Exec=/opt/usr/bin/hello
-Icon=hello
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/text/textselection/textselection.desktop b/examples/declarative/text/textselection/textselection.desktop
deleted file mode 100644
index 87e2ac0a29..0000000000
--- a/examples/declarative/text/textselection/textselection.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=textselection
-Exec=/opt/usr/bin/textselection
-Icon=textselection
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.desktop b/examples/declarative/threading/threadedlistmodel/threadedlistmodel.desktop
deleted file mode 100644
index 41646a8002..0000000000
--- a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=threadedlistmodel
-Exec=/opt/threadedlistmodel/bin/threadedlistmodel
-Icon=threadedlistmodel64
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/threading/threadedlistmodel/threadedlistmodel_harmattan.desktop b/examples/declarative/threading/threadedlistmodel/threadedlistmodel_harmattan.desktop
deleted file mode 100644
index ae9851a039..0000000000
--- a/examples/declarative/threading/threadedlistmodel/threadedlistmodel_harmattan.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=threadedlistmodel
-Exec=/usr/bin/single-instance /opt/threadedlistmodel/bin/threadedlistmodel
-Icon=/usr/share/icons/hicolor/80x80/apps/threadedlistmodel80.png
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/threading/workerscript/workerscript.desktop b/examples/declarative/threading/workerscript/workerscript.desktop
deleted file mode 100644
index c8e378d83f..0000000000
--- a/examples/declarative/threading/workerscript/workerscript.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=workerscript
-Exec=/opt/workerscript/bin/workerscript
-Icon=workerscript64
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/threading/workerscript/workerscript_harmattan.desktop b/examples/declarative/threading/workerscript/workerscript_harmattan.desktop
deleted file mode 100644
index 3517ca72de..0000000000
--- a/examples/declarative/threading/workerscript/workerscript_harmattan.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=workerscript
-Exec=/usr/bin/single-instance /opt/workerscript/bin/workerscript
-Icon=/usr/share/icons/hicolor/80x80/apps/workerscript80.png
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.desktop b/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.desktop
deleted file mode 100644
index aa5062e673..0000000000
--- a/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=experimental-gestures
-Exec=/opt/usr/bin/experimental-gestures
-Icon=experimental-gestures
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.desktop b/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.desktop
deleted file mode 100644
index 2306ece95f..0000000000
--- a/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=mousearea-example
-Exec=/opt/usr/bin/mousearea-example
-Icon=mousearea-example
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/touchinteraction/pincharea/pincharea.desktop b/examples/declarative/touchinteraction/pincharea/pincharea.desktop
deleted file mode 100644
index 42ad357ad7..0000000000
--- a/examples/declarative/touchinteraction/pincharea/pincharea.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=pincharea
-Exec=/opt/pincharea/bin/pincharea
-Icon=pincharea64
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/touchinteraction/pincharea/pincharea_harmattan.desktop b/examples/declarative/touchinteraction/pincharea/pincharea_harmattan.desktop
deleted file mode 100644
index f29c557b57..0000000000
--- a/examples/declarative/touchinteraction/pincharea/pincharea_harmattan.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=pincharea
-Exec=/usr/bin/single-instance /opt/pincharea/bin/pincharea
-Icon=/usr/share/icons/hicolor/80x80/apps/pincharea80.png
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/toys/clocks/clocks.desktop b/examples/declarative/toys/clocks/clocks.desktop
deleted file mode 100644
index 96afae607f..0000000000
--- a/examples/declarative/toys/clocks/clocks.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=clocks
-Exec=/opt/usr/bin/clocks
-Icon=clocks
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/toys/corkboards/corkboards.desktop b/examples/declarative/toys/corkboards/corkboards.desktop
deleted file mode 100644
index fcd20027a1..0000000000
--- a/examples/declarative/toys/corkboards/corkboards.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=corkboards
-Exec=/opt/usr/bin/corkboards
-Icon=corkboards
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/toys/dynamicscene/dynamicscene.desktop b/examples/declarative/toys/dynamicscene/dynamicscene.desktop
deleted file mode 100644
index c5170c641e..0000000000
--- a/examples/declarative/toys/dynamicscene/dynamicscene.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=dynamicscene
-Exec=/opt/usr/bin/dynamicscene
-Icon=dynamicscene
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/toys/tic-tac-toe/tictactoe.desktop b/examples/declarative/toys/tic-tac-toe/tictactoe.desktop
deleted file mode 100644
index e66569c497..0000000000
--- a/examples/declarative/toys/tic-tac-toe/tictactoe.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=tic-tac-toe
-Exec=/opt/usr/bin/tic-tac-toe
-Icon=tic-tac-toe
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/toys/tvtennis/tvtennis.desktop b/examples/declarative/toys/tvtennis/tvtennis.desktop
deleted file mode 100644
index e9ca1b9a13..0000000000
--- a/examples/declarative/toys/tvtennis/tvtennis.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=tvtennis
-Exec=/opt/usr/bin/tvtennis
-Icon=tvtennis
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/ui-components/dialcontrol/dialcontrol.desktop b/examples/declarative/ui-components/dialcontrol/dialcontrol.desktop
deleted file mode 100644
index d12a374c09..0000000000
--- a/examples/declarative/ui-components/dialcontrol/dialcontrol.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=dialcontrol
-Exec=/opt/usr/bin/dialcontrol
-Icon=dialcontrol
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/ui-components/flipable/flipable.desktop b/examples/declarative/ui-components/flipable/flipable.desktop
deleted file mode 100644
index 640d99dfdb..0000000000
--- a/examples/declarative/ui-components/flipable/flipable.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=flipable
-Exec=/opt/usr/bin/flipable
-Icon=flipable
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/ui-components/main/main.desktop b/examples/declarative/ui-components/main/main.desktop
deleted file mode 100644
index 157fa32764..0000000000
--- a/examples/declarative/ui-components/main/main.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=main
-Exec=/opt/usr/bin/main
-Icon=main
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/ui-components/progressbar/progressbar.desktop b/examples/declarative/ui-components/progressbar/progressbar.desktop
deleted file mode 100644
index 3fb6f218f7..0000000000
--- a/examples/declarative/ui-components/progressbar/progressbar.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=progressbar
-Exec=/opt/usr/bin/progressbar
-Icon=progressbar
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/ui-components/scrollbar/scrollbar.desktop b/examples/declarative/ui-components/scrollbar/scrollbar.desktop
deleted file mode 100644
index 191b0c28d6..0000000000
--- a/examples/declarative/ui-components/scrollbar/scrollbar.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=scrollbar
-Exec=/opt/scrollbar/bin/scrollbar
-Icon=scrollbar64
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/ui-components/scrollbar/scrollbar_harmattan.desktop b/examples/declarative/ui-components/scrollbar/scrollbar_harmattan.desktop
deleted file mode 100644
index 55ec39a51a..0000000000
--- a/examples/declarative/ui-components/scrollbar/scrollbar_harmattan.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=scrollbar
-Exec=/usr/bin/single-instance /opt/scrollbar/bin/scrollbar
-Icon=/usr/share/icons/hicolor/80x80/apps/scrollbar80.png
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/ui-components/searchbox/searchbox.desktop b/examples/declarative/ui-components/searchbox/searchbox.desktop
deleted file mode 100644
index bc25618fbb..0000000000
--- a/examples/declarative/ui-components/searchbox/searchbox.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=searchbox
-Exec=/opt/searchbox/bin/searchbox
-Icon=searchbox64
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/ui-components/searchbox/searchbox_harmattan.desktop b/examples/declarative/ui-components/searchbox/searchbox_harmattan.desktop
deleted file mode 100644
index c57f4a6b68..0000000000
--- a/examples/declarative/ui-components/searchbox/searchbox_harmattan.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=searchbox
-Exec=/usr/bin/single-instance /opt/searchbox/bin/searchbox
-Icon=/usr/share/icons/hicolor/80x80/apps/searchbox80.png
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/README b/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/README
deleted file mode 100644
index f2b87fba9f..0000000000
--- a/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/README
+++ /dev/null
@@ -1,6 +0,0 @@
-The Debian Package slideswitch
-----------------------------
-
-Comments regarding the Package
-
- -- Daniel Molkentin <danimo@unknown>  Thu, 18 Nov 2010 17:31:28 +0100
diff --git a/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/changelog b/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/changelog
deleted file mode 100644
index 46d83ac476..0000000000
--- a/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-slideswitch (0.0.1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Daniel Molkentin <danimo@unknown>  Thu, 18 Nov 2010 17:31:28 +0100
diff --git a/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/compat b/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/compat
deleted file mode 100644
index 7f8f011eb7..0000000000
--- a/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/control b/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/control
deleted file mode 100644
index f6eb57d03c..0000000000
--- a/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: slideswitch
-Section: user/hidden
-Priority: optional
-Maintainer: Daniel Molkentin <danimo@unknown>
-Build-Depends: debhelper (>= 5), libqt4-dev
-Standards-Version: 3.7.3
-Homepage: <insert the upstream URL, if relevant>
-
-Package: slideswitch
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: <insert up to 60 chars description>
- <insert long description, indented with spaces>
diff --git a/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/copyright b/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/copyright
deleted file mode 100644
index 06785f00cb..0000000000
--- a/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/copyright
+++ /dev/null
@@ -1,40 +0,0 @@
-This package was debianized by Daniel Molkentin <danimo@unknown> on
-Thu, 18 Nov 2010 17:31:28 +0100.
-
-It was downloaded from <url://example.com>
-
-Upstream Author(s):
-
-    <put author's name and email here>
-    <likewise for another author>
-
-Copyright:
-
-    <Copyright (C) YYYY Name OfAuthor>
-    <likewise for another author>
-
-License:
-
-    This package is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2010, Daniel Molkentin <danimo@unknown> and
-is licensed under the GPL, see above.
-
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
diff --git a/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/rules b/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/rules
deleted file mode 100755
index 0205aef4dd..0000000000
--- a/examples/declarative/ui-components/slideswitch/qtc_packaging/debian_fremantle/rules
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-
-
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp  
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/slideswitch.sgml > slideswitch.1
-
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	$(MAKE) clean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/slideswitch.
-	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/slideswitch install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	# dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_makeshlibs
-	dh_installdeb
-	# dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/examples/declarative/ui-components/slideswitch/slideswitch.desktop b/examples/declarative/ui-components/slideswitch/slideswitch.desktop
deleted file mode 100644
index 9f46a0bc67..0000000000
--- a/examples/declarative/ui-components/slideswitch/slideswitch.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=slideswitch
-Exec=/opt/usr/bin/slideswitch
-Icon=slideswitch
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/ui-components/spinner/spinner.desktop b/examples/declarative/ui-components/spinner/spinner.desktop
deleted file mode 100644
index 34003eb570..0000000000
--- a/examples/declarative/ui-components/spinner/spinner.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=spinner
-Exec=/opt/spinner/bin/spinner
-Icon=spinner64
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/ui-components/spinner/spinner_harmattan.desktop b/examples/declarative/ui-components/spinner/spinner_harmattan.desktop
deleted file mode 100644
index 0b4c13b35d..0000000000
--- a/examples/declarative/ui-components/spinner/spinner_harmattan.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=spinner
-Exec=/usr/bin/single-instance /opt/spinner/bin/spinner
-Icon=/usr/share/icons/hicolor/80x80/apps/spinner80.png
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/ui-components/tabwidget/tabwidget.desktop b/examples/declarative/ui-components/tabwidget/tabwidget.desktop
deleted file mode 100644
index 91d9888c79..0000000000
--- a/examples/declarative/ui-components/tabwidget/tabwidget.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=tabwidget
-Exec=/opt/tabwidget/bin/tabwidget
-Icon=tabwidget64
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/ui-components/tabwidget/tabwidget_harmattan.desktop b/examples/declarative/ui-components/tabwidget/tabwidget_harmattan.desktop
deleted file mode 100644
index 6603ac5b12..0000000000
--- a/examples/declarative/ui-components/tabwidget/tabwidget_harmattan.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=tabwidget
-Exec=/usr/bin/single-instance /opt/tabwidget/bin/tabwidget
-Icon=/usr/share/icons/hicolor/80x80/apps/tabwidget80.png
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.desktop b/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.desktop
deleted file mode 100644
index c5065cf678..0000000000
--- a/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=xmlhttprequest-example
-Exec=/opt/usr/bin/xmlhttprequest-example
-Icon=xmlhttprequest-example
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 7b4dc5c586..ef7e25fa05 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1628,7 +1628,7 @@ void QDeclarativeListViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
     to set \e {clip: true} in order to have the out of view items clipped
     nicely.
 
-    \sa {QML Data Models}, GridView, {declarative/modelviews/listview}{ListView examples}
+    \sa {QML Data Models}, GridView, {Models and Views: ListView Examples}{ListView examples}
 */
 
 QDeclarativeListView::QDeclarativeListView(QDeclarativeItem *parent)
@@ -1956,7 +1956,7 @@ int QDeclarativeListView::count() const
     so as to stay with the current item, unless the highlightFollowsCurrentItem
     property is false.
 
-    \sa highlightItem, highlightFollowsCurrentItem, {declarative/modelviews/listview}{ListView examples}
+    \sa highlightItem, highlightFollowsCurrentItem, {Models and Views: ListView Examples}{ListView examples}
 */
 QDeclarativeComponent *QDeclarativeListView::highlight() const
 {
@@ -2344,7 +2344,7 @@ void QDeclarativeListView::setCacheBuffer(int b)
     differing sections will result in a section header being created
     even if that section exists elsewhere.
 
-    \sa {declarative/modelviews/listview}{ListView examples}
+    \sa {Models and Views: ListView Examples}{ListView examples}
 */
 QDeclarativeViewSection *QDeclarativeListView::sectionCriteria()
 {