Squashed commit of the changes from the mobile-examples repository
authorDavid Boddie <david.boddie@nokia.com>
Wed, 27 Apr 2011 17:16:41 +0000 (19:16 +0200)
committerDavid Boddie <david.boddie@nokia.com>
Mon, 23 May 2011 12:27:58 +0000 (14:27 +0200)
(4.7-generated-declarative branch).
(cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)

217 files changed:
doc/src/declarative/declarativeui.qdoc
doc/src/declarative/qdeclarativemodels.qdoc
doc/src/declarative/qtbinding.qdoc
doc/src/declarative/qtdeclarative.qdoc
doc/src/snippets/declarative/mousearea/mousearea-snippet.qml
doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h
examples/declarative/animation/animation.qmlproject [deleted file]
examples/declarative/animation/basics/basics.qmlproject [deleted file]
examples/declarative/animation/basics/images/face-smile.png [deleted file]
examples/declarative/animation/basics/images/moon.png [deleted file]
examples/declarative/animation/basics/images/shadow.png [deleted file]
examples/declarative/animation/basics/images/star.png [deleted file]
examples/declarative/animation/basics/images/sun.png [deleted file]
examples/declarative/animation/behaviors/behaviors.qmlproject [deleted file]
examples/declarative/animation/easing/content/quit.png [deleted file]
examples/declarative/animation/easing/easing.qmlproject [deleted file]
examples/declarative/animation/states/qt-logo.png [deleted file]
examples/declarative/animation/states/states.qmlproject [deleted file]
examples/declarative/cppextensions/imageprovider/imageprovider.pro
examples/declarative/cppextensions/plugins/plugins.pro
examples/declarative/cppextensions/qwidgets/qwidgets.pro
examples/declarative/examples.qmlproject [deleted file]
examples/declarative/i18n/i18n.qmlproject [deleted file]
examples/declarative/i18n/i18n/base.ts [deleted file]
examples/declarative/i18n/i18n/qml_en_AU.qm [deleted file]
examples/declarative/i18n/i18n/qml_en_AU.ts [deleted file]
examples/declarative/i18n/i18n/qml_fr.qm [deleted file]
examples/declarative/i18n/i18n/qml_fr.ts [deleted file]
examples/declarative/imageelements/borderimage/borderimage.qmlproject [deleted file]
examples/declarative/imageelements/borderimage/content/bw.png [deleted file]
examples/declarative/imageelements/borderimage/content/colors-round.sci [deleted file]
examples/declarative/imageelements/borderimage/content/colors-stretch.sci [deleted file]
examples/declarative/imageelements/borderimage/content/colors.png [deleted file]
examples/declarative/imageelements/borderimage/content/shadow.png [deleted file]
examples/declarative/imageelements/image/image.qmlproject [deleted file]
examples/declarative/imageelements/image/qt-logo.png [deleted file]
examples/declarative/imageelements/imageelements.qmlproject [deleted file]
examples/declarative/keyinteraction/focus/Core/images/arrow.png [deleted file]
examples/declarative/keyinteraction/focus/Core/images/qt-logo.png [deleted file]
examples/declarative/keyinteraction/focus/focus.qmlproject [deleted file]
examples/declarative/keyinteraction/keyinteraction.qmlproject [deleted file]
examples/declarative/modelviews/gridview/gridview.qmlproject [deleted file]
examples/declarative/modelviews/gridview/pics/AddressBook_48.png [deleted file]
examples/declarative/modelviews/gridview/pics/AudioPlayer_48.png [deleted file]
examples/declarative/modelviews/gridview/pics/Camera_48.png [deleted file]
examples/declarative/modelviews/gridview/pics/DateBook_48.png [deleted file]
examples/declarative/modelviews/gridview/pics/EMail_48.png [deleted file]
examples/declarative/modelviews/gridview/pics/TodoList_48.png [deleted file]
examples/declarative/modelviews/gridview/pics/VideoPlayer_48.png [deleted file]
examples/declarative/modelviews/listview/content/pics/fruit-salad.jpg [deleted file]
examples/declarative/modelviews/listview/content/pics/hamburger.jpg [deleted file]
examples/declarative/modelviews/listview/content/pics/lemonade.jpg [deleted file]
examples/declarative/modelviews/listview/content/pics/moreDown.png [deleted file]
examples/declarative/modelviews/listview/content/pics/moreUp.png [deleted file]
examples/declarative/modelviews/listview/content/pics/pancakes.jpg [deleted file]
examples/declarative/modelviews/listview/content/pics/vegetable-soup.jpg [deleted file]
examples/declarative/modelviews/listview/listview.qmlproject [deleted file]
examples/declarative/modelviews/modelviews.qmlproject [deleted file]
examples/declarative/modelviews/package/package.qmlproject [deleted file]
examples/declarative/modelviews/pathview/pathview.qmlproject [deleted file]
examples/declarative/modelviews/pathview/pics/AddressBook_48.png [deleted file]
examples/declarative/modelviews/pathview/pics/AudioPlayer_48.png [deleted file]
examples/declarative/modelviews/pathview/pics/Camera_48.png [deleted file]
examples/declarative/modelviews/pathview/pics/DateBook_48.png [deleted file]
examples/declarative/modelviews/pathview/pics/EMail_48.png [deleted file]
examples/declarative/modelviews/pathview/pics/TodoList_48.png [deleted file]
examples/declarative/modelviews/pathview/pics/VideoPlayer_48.png [deleted file]
examples/declarative/modelviews/visualitemmodel/visualitemmodel.qmlproject [deleted file]
examples/declarative/modelviews/webview/alerts.html [deleted file]
examples/declarative/modelviews/webview/content/Mapping/map.html [deleted file]
examples/declarative/modelviews/webview/content/pics/cancel.png [deleted file]
examples/declarative/modelviews/webview/content/pics/ok.png [deleted file]
examples/declarative/modelviews/webview/newwindows.html [deleted file]
examples/declarative/modelviews/webview/webview.qmlproject [deleted file]
examples/declarative/positioners/add.png [deleted file]
examples/declarative/positioners/del.png [deleted file]
examples/declarative/positioners/positioners.qmlproject [deleted file]
examples/declarative/sqllocalstorage/sqllocalstorage.qmlproject [deleted file]
examples/declarative/text/fonts/fonts.qmlproject [deleted file]
examples/declarative/text/fonts/fonts/tarzeau_ocr_a.ttf [deleted file]
examples/declarative/text/text.qmlproject [deleted file]
examples/declarative/text/textselection/pics/endHandle.png [deleted file]
examples/declarative/text/textselection/pics/endHandle.sci [deleted file]
examples/declarative/text/textselection/pics/startHandle.png [deleted file]
examples/declarative/text/textselection/pics/startHandle.sci [deleted file]
examples/declarative/text/textselection/textselection.qmlproject [deleted file]
examples/declarative/threading/threading.qmlproject [deleted file]
examples/declarative/touchinteraction/gestures/gestures.qmlproject [deleted file]
examples/declarative/touchinteraction/mousearea/mousearea.qmlproject [deleted file]
examples/declarative/touchinteraction/touchinteraction.qmlproject [deleted file]
examples/declarative/toys/README [deleted file]
examples/declarative/toys/clocks/clocks.qmlproject [deleted file]
examples/declarative/toys/corkboards/cork.jpg [deleted file]
examples/declarative/toys/corkboards/corkboards.qmlproject [deleted file]
examples/declarative/toys/corkboards/note-yellow.png [deleted file]
examples/declarative/toys/corkboards/tack.png [deleted file]
examples/declarative/toys/dynamicscene/dynamicscene.qmlproject [deleted file]
examples/declarative/toys/dynamicscene/images/NOTE [deleted file]
examples/declarative/toys/dynamicscene/images/face-smile.png [deleted file]
examples/declarative/toys/dynamicscene/images/moon.png [deleted file]
examples/declarative/toys/dynamicscene/images/rabbit_brown.png [deleted file]
examples/declarative/toys/dynamicscene/images/rabbit_bw.png [deleted file]
examples/declarative/toys/dynamicscene/images/star.png [deleted file]
examples/declarative/toys/dynamicscene/images/sun.png [deleted file]
examples/declarative/toys/dynamicscene/images/tree_s.png [deleted file]
examples/declarative/toys/dynamicscene/qml/itemCreation.js [deleted file]
examples/declarative/toys/tic-tac-toe/content/pics/board.png [deleted file]
examples/declarative/toys/tic-tac-toe/content/pics/o.png [deleted file]
examples/declarative/toys/tic-tac-toe/content/pics/x.png [deleted file]
examples/declarative/toys/tic-tac-toe/content/tic-tac-toe.js [deleted file]
examples/declarative/toys/tic-tac-toe/tic-tac-toe.qmlproject [deleted file]
examples/declarative/toys/toys.qmlproject [deleted file]
examples/declarative/toys/tvtennis/tvtennis.qmlproject [deleted file]
examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
examples/declarative/ui-components/README [deleted file]
examples/declarative/ui-components/dialcontrol/content/background.png [deleted file]
examples/declarative/ui-components/dialcontrol/content/needle.png [deleted file]
examples/declarative/ui-components/dialcontrol/content/needle_shadow.png [deleted file]
examples/declarative/ui-components/dialcontrol/content/overlay.png [deleted file]
examples/declarative/ui-components/dialcontrol/content/quit.png [deleted file]
examples/declarative/ui-components/dialcontrol/dialcontrol.qmlproject [deleted file]
examples/declarative/ui-components/flipable/content/5_heart.png [deleted file]
examples/declarative/ui-components/flipable/content/9_club.png [deleted file]
examples/declarative/ui-components/flipable/content/back.png [deleted file]
examples/declarative/ui-components/flipable/flipable.qmlproject [deleted file]
examples/declarative/ui-components/progressbar/content/background.png [deleted file]
examples/declarative/ui-components/progressbar/progressbar.qmlproject [deleted file]
examples/declarative/ui-components/scrollbar/pics/niagara_falls.jpg [deleted file]
examples/declarative/ui-components/scrollbar/scrollbar.qmlproject [deleted file]
examples/declarative/ui-components/searchbox/images/clear.png [deleted file]
examples/declarative/ui-components/searchbox/images/lineedit-bg-focus.png [deleted file]
examples/declarative/ui-components/searchbox/images/lineedit-bg.png [deleted file]
examples/declarative/ui-components/searchbox/searchbox.qmlproject [deleted file]
examples/declarative/ui-components/slideswitch/content/background.svg [deleted file]
examples/declarative/ui-components/slideswitch/content/knob.svg [deleted file]
examples/declarative/ui-components/slideswitch/slideswitch.qmlproject [deleted file]
examples/declarative/ui-components/spinner/content/spinner-bg.png [deleted file]
examples/declarative/ui-components/spinner/content/spinner-select.png [deleted file]
examples/declarative/ui-components/spinner/spinner.qmlproject [deleted file]
examples/declarative/ui-components/tabwidget/tab.png [deleted file]
examples/declarative/ui-components/tabwidget/tabwidget.qmlproject [deleted file]
examples/declarative/ui-components/ui-components.qmlproject [deleted file]
examples/declarative/xml/xml.qmlproject [deleted file]
examples/declarative/xml/xmlhttprequest/data.xml [deleted file]
examples/declarative/xml/xmlhttprequest/xmlhttprequest.qmlproject [deleted file]
examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp
examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/directory.cpp
examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/file.cpp
examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/file.h
src/declarative/debugger/qdeclarativedebugservice_p.h
src/declarative/debugger/qpacketprotocol_p.h
tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.4.png
tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.6.png
tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png
tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png
tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png
tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png
tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png
tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png
tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png
tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png
tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.7.png
tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png
tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.1.png
tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.1.png
tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png
tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png
tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png
tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png
tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png
tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.5.png
tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png
tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.0.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.4.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png
tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.7.png
tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png
tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png
tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png
tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png

index 93571bd..8367c0f 100644 (file)
@@ -147,4 +147,12 @@ examples for porting}
 \list
 \o \l{Qt Quick Licensing Information}
 \endlist
+
+\section1 Online Examples
+
+\list
+\o Forum Nokia:
+\l{http://wiki.forum.nokia.com/index.php/Qt_Quick_examples_for_porting}{Qt Quick
+examples for porting}
+\endlist
 */
index 23dd390..30167d7 100644 (file)
@@ -422,3 +422,84 @@ a function in the model, e.g.:
 updated, and that \e{value} holds the new value.
 
 */
+
+/*!
+\page qml-presenting-data.html
+\title Presenting Data with QML
+
+\section1 Introduction
+
+Qt Quick contains a set of standard items that can be used to present data in a
+number of different ways. For simple user interfaces,
+\l{Using QML Positioner and Repeater Items#Repeaters}{Repeaters} can be used
+in combination with
+\l{Using QML Positioner and Repeater Items#Positioners}{Positioners}
+to obtain pieces of data and arrange them in a user interface. However, when
+large quantities of data are involved, it is often better to use models with
+the standard views since these contain many built-in display and navigation
+features.
+
+\section1 Views
+
+Views are scrolling containers for collections of items. They are feature-rich,
+supporting many of the use cases found in typical applications, and can be
+customized to meet requirements on style and behavior.
+
+A set of standard views are provided in the basic set of Qt Quick
+graphical elements:
+
+\list
+\o \l{#ListView}{ListView} arranges items in a horizontal or vertical list
+\o \l{#GridView}{GridView} arranges items in a grid within the available space
+\o \l{#PathView}{PathView} arranges items on a path
+\endlist
+
+Unlike these items, \l WebView is not a fully-featured view item, and needs
+to be combined with a \l Flickable item to create a view that performs like
+a Web browser.
+
+\section2 ListView
+
+\l ListView shows a classic list of items with horizontal or vertical placing
+of items.
+
+\beginfloatright
+\inlineimage qml-listview-snippet.png
+\endfloat
+
+The following example shows a minimal ListView displaying a sequence of
+numbers (using an \l{QML Data Models#An Integer}{integer as a model}).
+A simple delegate is used to define an items for each piece of data in the
+model.
+
+\clearfloat
+\snippet doc/src/snippets/declarative/listview/listview-snippet.qml document
+
+
+
+\section2 GridView
+
+\l GridView displays items in a grid like an file manager's icon view.
+
+\section2 PathView
+
+\l PathView displays items on a path, where the selection remains in
+the same place and the items move around it.
+
+\section1 Decorating Views
+
+\section2 Headers and Footers
+
+\section2 Sections
+
+\section2 Navigation
+
+In traditional user interfaces, views can be scrolled using standard
+controls, such as scroll bars and arrow buttons. In some situations, it
+is also possible to drag the view directly by pressing and holding a
+mouse button while moving the cursor. In touch-based user interfaces,
+this dragging action is often complemented with a flicking action, where
+scrolling continues after the user has stopped touching the view.
+
+\section1 Further Reading
+*/
index 3659caa..02d88ae 100644 (file)
@@ -465,6 +465,10 @@ below right calls this function, passing a QVariantList and a QVariantMap, which
 converted to JavaScript array and object values, repectively:
 
 \table
+\header
+\o Type
+\o String format
+\o Example
 \row
 \o \snippet doc/src/snippets/declarative/qtbinding/variantlistmap/MyItem.qml 0
 \o \snippet doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp 0
index 4a6f6a9..3930d3d 100644 (file)
   #include <QtDeclarative> to use this function.
 
   Returns the QML type id.
-  */
+*/
index 03473ba..1b9a9ec 100644 (file)
@@ -47,53 +47,53 @@ Rectangle {
     width: 500; height: 500
     color: "green"
 
-Column {
-//! [anchor fill]
-Rectangle {
-    id: button
-    width: 100; height: 100
+    Column {
+        //! [anchor fill]
+        Rectangle {
+            id: button
+            width: 100; height: 100
 
-    MouseArea {
-        anchors.fill: parent
-        onClicked: console.log("button clicked")
-    }
-    MouseArea {
-        width:150; height: 75
-        onClicked: console.log("irregular area clicked")
-    }
-}
-//! [anchor fill]
+            MouseArea {
+                anchors.fill: parent
+                onClicked: console.log("button clicked")
+            }
+            MouseArea {
+                width:150; height: 75
+                onClicked: console.log("irregular area clicked")
+            }
+        }
+        //! [anchor fill]
 
-Rectangle {
-    id: button
-    width: 100; height: 100
+        Rectangle {
+            id: button
+            width: 100; height: 100
 
-//! [enable handlers]
-    MouseArea {
-        hoverEnabled: true
-        acceptedButtons: Qt.LeftButton | Qt.RightButton
-        onEntered: console.log("mouse entered the area")
-        onExited: console.log("mouse left the area")
-    }
-//! [enable handlers]
-}
+        //! [enable handlers]
+            MouseArea {
+                hoverEnabled: true
+                acceptedButtons: Qt.LeftButton | Qt.RightButton
+                onEntered: console.log("mouse entered the area")
+                onExited: console.log("mouse left the area")
+            }
+        //! [enable handlers]
+        }
 
-Rectangle {
-    id: button
-    width: 100; height: 100
+        Rectangle {
+            id: button
+            width: 100; height: 100
 
-//! [mouse handlers]
-    MouseArea {
-        anchors.fill: parent
-        onClicked: console.log("area clicked")
-        onDoubleClicked: console.log("area double clicked")
-        onEntered: console.log("mouse entered the area")
-        onExited: console.log("mouse left the area")
-    }
-//! [mouse handlers]
-}
+        //! [mouse handlers]
+            MouseArea {
+                anchors.fill: parent
+                onClicked: console.log("area clicked")
+                onDoubleClicked: console.log("area double clicked")
+                onEntered: console.log("mouse entered the area")
+                onExited: console.log("mouse left the area")
+            }
+        //! [mouse handlers]
+        }
 
-} //end of column
+    } //end of column
 //! [parent end]
 }
 //! [parent end]
index f317d40..763a451 100644 (file)
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/examples/declarative/animation/animation.qmlproject b/examples/declarative/animation/animation.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/animation/basics/basics.qmlproject b/examples/declarative/animation/basics/basics.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/animation/basics/images/face-smile.png b/examples/declarative/animation/basics/images/face-smile.png
deleted file mode 100644 (file)
index 3d66d72..0000000
Binary files a/examples/declarative/animation/basics/images/face-smile.png and /dev/null differ
diff --git a/examples/declarative/animation/basics/images/moon.png b/examples/declarative/animation/basics/images/moon.png
deleted file mode 100644 (file)
index 9407b2b..0000000
Binary files a/examples/declarative/animation/basics/images/moon.png and /dev/null differ
diff --git a/examples/declarative/animation/basics/images/shadow.png b/examples/declarative/animation/basics/images/shadow.png
deleted file mode 100644 (file)
index 8270565..0000000
Binary files a/examples/declarative/animation/basics/images/shadow.png and /dev/null differ
diff --git a/examples/declarative/animation/basics/images/star.png b/examples/declarative/animation/basics/images/star.png
deleted file mode 100644 (file)
index 27ef924..0000000
Binary files a/examples/declarative/animation/basics/images/star.png and /dev/null differ
diff --git a/examples/declarative/animation/basics/images/sun.png b/examples/declarative/animation/basics/images/sun.png
deleted file mode 100644 (file)
index 7713ca5..0000000
Binary files a/examples/declarative/animation/basics/images/sun.png and /dev/null differ
diff --git a/examples/declarative/animation/behaviors/behaviors.qmlproject b/examples/declarative/animation/behaviors/behaviors.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/animation/easing/content/quit.png b/examples/declarative/animation/easing/content/quit.png
deleted file mode 100644 (file)
index b822057..0000000
Binary files a/examples/declarative/animation/easing/content/quit.png and /dev/null differ
diff --git a/examples/declarative/animation/easing/easing.qmlproject b/examples/declarative/animation/easing/easing.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/animation/states/qt-logo.png b/examples/declarative/animation/states/qt-logo.png
deleted file mode 100644 (file)
index 14ddf2a..0000000
Binary files a/examples/declarative/animation/states/qt-logo.png and /dev/null differ
diff --git a/examples/declarative/animation/states/states.qmlproject b/examples/declarative/animation/states/states.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
index 034ef2f..5786af6 100644 (file)
@@ -26,3 +26,4 @@ symbian:{
     importFiles.path = ImageProviderCore
     DEPLOYMENT += importFiles
 }
+maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
index 6d774ab..c5c68e3 100644 (file)
@@ -27,3 +27,4 @@ symbian {
     CONFIG += qt_example
     TARGET.EPOCALLOWDLLDATA = 1
 }
+maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
index 2c74c05..9d15198 100644 (file)
@@ -22,3 +22,4 @@ symbian:{
 
     DEPLOYMENT += importFiles
 }
+maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
diff --git a/examples/declarative/examples.qmlproject b/examples/declarative/examples.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/i18n/i18n.qmlproject b/examples/declarative/i18n/i18n.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/i18n/i18n/base.ts b/examples/declarative/i18n/i18n/base.ts
deleted file mode 100644 (file)
index 82547a1..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" sourcelanguage="en">
-<context>
-    <name>i18n</name>
-    <message>
-        <location filename="../i18n.qml" line="30"/>
-        <source>Hello</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/examples/declarative/i18n/i18n/qml_en_AU.qm b/examples/declarative/i18n/i18n/qml_en_AU.qm
deleted file mode 100644 (file)
index fb8b710..0000000
Binary files a/examples/declarative/i18n/i18n/qml_en_AU.qm and /dev/null differ
diff --git a/examples/declarative/i18n/i18n/qml_en_AU.ts b/examples/declarative/i18n/i18n/qml_en_AU.ts
deleted file mode 100644 (file)
index e991aff..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="en_AU" sourcelanguage="en">
-<context>
-    <name>i18n</name>
-    <message>
-        <location filename="../i18n.qml" line="30"/>
-        <source>Hello</source>
-        <translation>G&apos;day</translation>
-    </message>
-</context>
-</TS>
diff --git a/examples/declarative/i18n/i18n/qml_fr.qm b/examples/declarative/i18n/i18n/qml_fr.qm
deleted file mode 100644 (file)
index 583562e..0000000
Binary files a/examples/declarative/i18n/i18n/qml_fr.qm and /dev/null differ
diff --git a/examples/declarative/i18n/i18n/qml_fr.ts b/examples/declarative/i18n/i18n/qml_fr.ts
deleted file mode 100644 (file)
index 365abd9..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="fr" sourcelanguage="en">
-<context>
-    <name>i18n</name>
-    <message>
-        <location filename="../i18n.qml" line="30"/>
-        <source>Hello</source>
-        <translation>Bonjour</translation>
-    </message>
-</context>
-</TS>
diff --git a/examples/declarative/imageelements/borderimage/borderimage.qmlproject b/examples/declarative/imageelements/borderimage/borderimage.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/imageelements/borderimage/content/bw.png b/examples/declarative/imageelements/borderimage/content/bw.png
deleted file mode 100644 (file)
index 486eaae..0000000
Binary files a/examples/declarative/imageelements/borderimage/content/bw.png and /dev/null differ
diff --git a/examples/declarative/imageelements/borderimage/content/colors-round.sci b/examples/declarative/imageelements/borderimage/content/colors-round.sci
deleted file mode 100644 (file)
index 506f6f5..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-border.left:30
-border.top:30
-border.right:30
-border.bottom:30
-horizontalTileRule:Round
-verticalTileRule:Round
-source:colors.png
diff --git a/examples/declarative/imageelements/borderimage/content/colors-stretch.sci b/examples/declarative/imageelements/borderimage/content/colors-stretch.sci
deleted file mode 100644 (file)
index e4989a7..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left:30
-border.top:30
-border.right:30
-border.bottom:30
-source:colors.png
diff --git a/examples/declarative/imageelements/borderimage/content/colors.png b/examples/declarative/imageelements/borderimage/content/colors.png
deleted file mode 100644 (file)
index dfb62f3..0000000
Binary files a/examples/declarative/imageelements/borderimage/content/colors.png and /dev/null differ
diff --git a/examples/declarative/imageelements/borderimage/content/shadow.png b/examples/declarative/imageelements/borderimage/content/shadow.png
deleted file mode 100644 (file)
index 431af85..0000000
Binary files a/examples/declarative/imageelements/borderimage/content/shadow.png and /dev/null differ
diff --git a/examples/declarative/imageelements/image/image.qmlproject b/examples/declarative/imageelements/image/image.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/imageelements/image/qt-logo.png b/examples/declarative/imageelements/image/qt-logo.png
deleted file mode 100644 (file)
index 14ddf2a..0000000
Binary files a/examples/declarative/imageelements/image/qt-logo.png and /dev/null differ
diff --git a/examples/declarative/imageelements/imageelements.qmlproject b/examples/declarative/imageelements/imageelements.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/keyinteraction/focus/Core/images/arrow.png b/examples/declarative/keyinteraction/focus/Core/images/arrow.png
deleted file mode 100644 (file)
index 14978c2..0000000
Binary files a/examples/declarative/keyinteraction/focus/Core/images/arrow.png and /dev/null differ
diff --git a/examples/declarative/keyinteraction/focus/Core/images/qt-logo.png b/examples/declarative/keyinteraction/focus/Core/images/qt-logo.png
deleted file mode 100644 (file)
index 14ddf2a..0000000
Binary files a/examples/declarative/keyinteraction/focus/Core/images/qt-logo.png and /dev/null differ
diff --git a/examples/declarative/keyinteraction/focus/focus.qmlproject b/examples/declarative/keyinteraction/focus/focus.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/keyinteraction/keyinteraction.qmlproject b/examples/declarative/keyinteraction/keyinteraction.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/modelviews/gridview/gridview.qmlproject b/examples/declarative/modelviews/gridview/gridview.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/modelviews/gridview/pics/AddressBook_48.png b/examples/declarative/modelviews/gridview/pics/AddressBook_48.png
deleted file mode 100644 (file)
index 1ab7c8e..0000000
Binary files a/examples/declarative/modelviews/gridview/pics/AddressBook_48.png and /dev/null differ
diff --git a/examples/declarative/modelviews/gridview/pics/AudioPlayer_48.png b/examples/declarative/modelviews/gridview/pics/AudioPlayer_48.png
deleted file mode 100644 (file)
index f4b8689..0000000
Binary files a/examples/declarative/modelviews/gridview/pics/AudioPlayer_48.png and /dev/null differ
diff --git a/examples/declarative/modelviews/gridview/pics/Camera_48.png b/examples/declarative/modelviews/gridview/pics/Camera_48.png
deleted file mode 100644 (file)
index c76b524..0000000
Binary files a/examples/declarative/modelviews/gridview/pics/Camera_48.png and /dev/null differ
diff --git a/examples/declarative/modelviews/gridview/pics/DateBook_48.png b/examples/declarative/modelviews/gridview/pics/DateBook_48.png
deleted file mode 100644 (file)
index 58f5787..0000000
Binary files a/examples/declarative/modelviews/gridview/pics/DateBook_48.png and /dev/null differ
diff --git a/examples/declarative/modelviews/gridview/pics/EMail_48.png b/examples/declarative/modelviews/gridview/pics/EMail_48.png
deleted file mode 100644 (file)
index d6d84a6..0000000
Binary files a/examples/declarative/modelviews/gridview/pics/EMail_48.png and /dev/null differ
diff --git a/examples/declarative/modelviews/gridview/pics/TodoList_48.png b/examples/declarative/modelviews/gridview/pics/TodoList_48.png
deleted file mode 100644 (file)
index 0988448..0000000
Binary files a/examples/declarative/modelviews/gridview/pics/TodoList_48.png and /dev/null differ
diff --git a/examples/declarative/modelviews/gridview/pics/VideoPlayer_48.png b/examples/declarative/modelviews/gridview/pics/VideoPlayer_48.png
deleted file mode 100644 (file)
index 52638c5..0000000
Binary files a/examples/declarative/modelviews/gridview/pics/VideoPlayer_48.png and /dev/null differ
diff --git a/examples/declarative/modelviews/listview/content/pics/fruit-salad.jpg b/examples/declarative/modelviews/listview/content/pics/fruit-salad.jpg
deleted file mode 100644 (file)
index da5a6b1..0000000
Binary files a/examples/declarative/modelviews/listview/content/pics/fruit-salad.jpg and /dev/null differ
diff --git a/examples/declarative/modelviews/listview/content/pics/hamburger.jpg b/examples/declarative/modelviews/listview/content/pics/hamburger.jpg
deleted file mode 100644 (file)
index d0a15be..0000000
Binary files a/examples/declarative/modelviews/listview/content/pics/hamburger.jpg and /dev/null differ
diff --git a/examples/declarative/modelviews/listview/content/pics/lemonade.jpg b/examples/declarative/modelviews/listview/content/pics/lemonade.jpg
deleted file mode 100644 (file)
index db445c9..0000000
Binary files a/examples/declarative/modelviews/listview/content/pics/lemonade.jpg and /dev/null differ
diff --git a/examples/declarative/modelviews/listview/content/pics/moreDown.png b/examples/declarative/modelviews/listview/content/pics/moreDown.png
deleted file mode 100644 (file)
index 31a35d5..0000000
Binary files a/examples/declarative/modelviews/listview/content/pics/moreDown.png and /dev/null differ
diff --git a/examples/declarative/modelviews/listview/content/pics/moreUp.png b/examples/declarative/modelviews/listview/content/pics/moreUp.png
deleted file mode 100644 (file)
index fefb9c9..0000000
Binary files a/examples/declarative/modelviews/listview/content/pics/moreUp.png and /dev/null differ
diff --git a/examples/declarative/modelviews/listview/content/pics/pancakes.jpg b/examples/declarative/modelviews/listview/content/pics/pancakes.jpg
deleted file mode 100644 (file)
index 60c4396..0000000
Binary files a/examples/declarative/modelviews/listview/content/pics/pancakes.jpg and /dev/null differ
diff --git a/examples/declarative/modelviews/listview/content/pics/vegetable-soup.jpg b/examples/declarative/modelviews/listview/content/pics/vegetable-soup.jpg
deleted file mode 100644 (file)
index 9dce332..0000000
Binary files a/examples/declarative/modelviews/listview/content/pics/vegetable-soup.jpg and /dev/null differ
diff --git a/examples/declarative/modelviews/listview/listview.qmlproject b/examples/declarative/modelviews/listview/listview.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/modelviews/modelviews.qmlproject b/examples/declarative/modelviews/modelviews.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/modelviews/package/package.qmlproject b/examples/declarative/modelviews/package/package.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/modelviews/pathview/pathview.qmlproject b/examples/declarative/modelviews/pathview/pathview.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/modelviews/pathview/pics/AddressBook_48.png b/examples/declarative/modelviews/pathview/pics/AddressBook_48.png
deleted file mode 100644 (file)
index 1ab7c8e..0000000
Binary files a/examples/declarative/modelviews/pathview/pics/AddressBook_48.png and /dev/null differ
diff --git a/examples/declarative/modelviews/pathview/pics/AudioPlayer_48.png b/examples/declarative/modelviews/pathview/pics/AudioPlayer_48.png
deleted file mode 100644 (file)
index f4b8689..0000000
Binary files a/examples/declarative/modelviews/pathview/pics/AudioPlayer_48.png and /dev/null differ
diff --git a/examples/declarative/modelviews/pathview/pics/Camera_48.png b/examples/declarative/modelviews/pathview/pics/Camera_48.png
deleted file mode 100644 (file)
index c76b524..0000000
Binary files a/examples/declarative/modelviews/pathview/pics/Camera_48.png and /dev/null differ
diff --git a/examples/declarative/modelviews/pathview/pics/DateBook_48.png b/examples/declarative/modelviews/pathview/pics/DateBook_48.png
deleted file mode 100644 (file)
index 58f5787..0000000
Binary files a/examples/declarative/modelviews/pathview/pics/DateBook_48.png and /dev/null differ
diff --git a/examples/declarative/modelviews/pathview/pics/EMail_48.png b/examples/declarative/modelviews/pathview/pics/EMail_48.png
deleted file mode 100644 (file)
index d6d84a6..0000000
Binary files a/examples/declarative/modelviews/pathview/pics/EMail_48.png and /dev/null differ
diff --git a/examples/declarative/modelviews/pathview/pics/TodoList_48.png b/examples/declarative/modelviews/pathview/pics/TodoList_48.png
deleted file mode 100644 (file)
index 0988448..0000000
Binary files a/examples/declarative/modelviews/pathview/pics/TodoList_48.png and /dev/null differ
diff --git a/examples/declarative/modelviews/pathview/pics/VideoPlayer_48.png b/examples/declarative/modelviews/pathview/pics/VideoPlayer_48.png
deleted file mode 100644 (file)
index 52638c5..0000000
Binary files a/examples/declarative/modelviews/pathview/pics/VideoPlayer_48.png and /dev/null differ
diff --git a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qmlproject b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/modelviews/webview/alerts.html b/examples/declarative/modelviews/webview/alerts.html
deleted file mode 100644 (file)
index 82caddf..0000000
+++ /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/content/Mapping/map.html b/examples/declarative/modelviews/webview/content/Mapping/map.html
deleted file mode 100755 (executable)
index a98da54..0000000
+++ /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/content/pics/cancel.png b/examples/declarative/modelviews/webview/content/pics/cancel.png
deleted file mode 100644 (file)
index ecc9533..0000000
Binary files a/examples/declarative/modelviews/webview/content/pics/cancel.png and /dev/null differ
diff --git a/examples/declarative/modelviews/webview/content/pics/ok.png b/examples/declarative/modelviews/webview/content/pics/ok.png
deleted file mode 100644 (file)
index 5795f04..0000000
Binary files a/examples/declarative/modelviews/webview/content/pics/ok.png and /dev/null differ
diff --git a/examples/declarative/modelviews/webview/newwindows.html b/examples/declarative/modelviews/webview/newwindows.html
deleted file mode 100644 (file)
index f169599..0000000
+++ /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/webview.qmlproject b/examples/declarative/modelviews/webview/webview.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/positioners/add.png b/examples/declarative/positioners/add.png
deleted file mode 100644 (file)
index 1ee4542..0000000
Binary files a/examples/declarative/positioners/add.png and /dev/null differ
diff --git a/examples/declarative/positioners/del.png b/examples/declarative/positioners/del.png
deleted file mode 100644 (file)
index 8d2eaed..0000000
Binary files a/examples/declarative/positioners/del.png and /dev/null differ
diff --git a/examples/declarative/positioners/positioners.qmlproject b/examples/declarative/positioners/positioners.qmlproject
deleted file mode 100644 (file)
index e526217..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/* File generated by QtCreator */
-
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/sqllocalstorage/sqllocalstorage.qmlproject b/examples/declarative/sqllocalstorage/sqllocalstorage.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/text/fonts/fonts.qmlproject b/examples/declarative/text/fonts/fonts.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/text/fonts/fonts/tarzeau_ocr_a.ttf b/examples/declarative/text/fonts/fonts/tarzeau_ocr_a.ttf
deleted file mode 100644 (file)
index cf93f96..0000000
Binary files a/examples/declarative/text/fonts/fonts/tarzeau_ocr_a.ttf and /dev/null differ
diff --git a/examples/declarative/text/text.qmlproject b/examples/declarative/text/text.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/text/textselection/pics/endHandle.png b/examples/declarative/text/textselection/pics/endHandle.png
deleted file mode 100644 (file)
index 1a4bc5d..0000000
Binary files a/examples/declarative/text/textselection/pics/endHandle.png and /dev/null differ
diff --git a/examples/declarative/text/textselection/pics/endHandle.sci b/examples/declarative/text/textselection/pics/endHandle.sci
deleted file mode 100644 (file)
index 4f51f24..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 0
-border.top: 6
-border.bottom: 6
-border.right: 6
-source: endHandle.png
diff --git a/examples/declarative/text/textselection/pics/startHandle.png b/examples/declarative/text/textselection/pics/startHandle.png
deleted file mode 100644 (file)
index deedcd5..0000000
Binary files a/examples/declarative/text/textselection/pics/startHandle.png and /dev/null differ
diff --git a/examples/declarative/text/textselection/pics/startHandle.sci b/examples/declarative/text/textselection/pics/startHandle.sci
deleted file mode 100644 (file)
index f9eae20..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 6
-border.top: 6
-border.bottom: 6
-border.right: 0
-source: startHandle.png
diff --git a/examples/declarative/text/textselection/textselection.qmlproject b/examples/declarative/text/textselection/textselection.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/threading/threading.qmlproject b/examples/declarative/threading/threading.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/touchinteraction/gestures/gestures.qmlproject b/examples/declarative/touchinteraction/gestures/gestures.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/touchinteraction/mousearea/mousearea.qmlproject b/examples/declarative/touchinteraction/mousearea/mousearea.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/touchinteraction/touchinteraction.qmlproject b/examples/declarative/touchinteraction/touchinteraction.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/toys/README b/examples/declarative/toys/README
deleted file mode 100644 (file)
index ff4d024..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-These pure QML examples demonstrate
-some of what can be easily done using just a few QML files.
-
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory. They can also be viewed directly with the
-QML viewer utility, without requiring compilation.
-
-Documentation for these examples can be found via the Tutorial and Examples
-link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/declarative/toys/clocks/clocks.qmlproject b/examples/declarative/toys/clocks/clocks.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/toys/corkboards/cork.jpg b/examples/declarative/toys/corkboards/cork.jpg
deleted file mode 100644 (file)
index 160bc00..0000000
Binary files a/examples/declarative/toys/corkboards/cork.jpg and /dev/null differ
diff --git a/examples/declarative/toys/corkboards/corkboards.qmlproject b/examples/declarative/toys/corkboards/corkboards.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/toys/corkboards/note-yellow.png b/examples/declarative/toys/corkboards/note-yellow.png
deleted file mode 100644 (file)
index 8ddecc8..0000000
Binary files a/examples/declarative/toys/corkboards/note-yellow.png and /dev/null differ
diff --git a/examples/declarative/toys/corkboards/tack.png b/examples/declarative/toys/corkboards/tack.png
deleted file mode 100644 (file)
index cef2d1c..0000000
Binary files a/examples/declarative/toys/corkboards/tack.png and /dev/null differ
diff --git a/examples/declarative/toys/dynamicscene/dynamicscene.qmlproject b/examples/declarative/toys/dynamicscene/dynamicscene.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/toys/dynamicscene/images/NOTE b/examples/declarative/toys/dynamicscene/images/NOTE
deleted file mode 100644 (file)
index fcd87f9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Images (except star.png) are from the KDE project.
diff --git a/examples/declarative/toys/dynamicscene/images/face-smile.png b/examples/declarative/toys/dynamicscene/images/face-smile.png
deleted file mode 100644 (file)
index 3d66d72..0000000
Binary files a/examples/declarative/toys/dynamicscene/images/face-smile.png and /dev/null differ
diff --git a/examples/declarative/toys/dynamicscene/images/moon.png b/examples/declarative/toys/dynamicscene/images/moon.png
deleted file mode 100644 (file)
index 1c0d606..0000000
Binary files a/examples/declarative/toys/dynamicscene/images/moon.png and /dev/null differ
diff --git a/examples/declarative/toys/dynamicscene/images/rabbit_brown.png b/examples/declarative/toys/dynamicscene/images/rabbit_brown.png
deleted file mode 100644 (file)
index ebfdeed..0000000
Binary files a/examples/declarative/toys/dynamicscene/images/rabbit_brown.png and /dev/null differ
diff --git a/examples/declarative/toys/dynamicscene/images/rabbit_bw.png b/examples/declarative/toys/dynamicscene/images/rabbit_bw.png
deleted file mode 100644 (file)
index 7bff9b9..0000000
Binary files a/examples/declarative/toys/dynamicscene/images/rabbit_bw.png and /dev/null differ
diff --git a/examples/declarative/toys/dynamicscene/images/star.png b/examples/declarative/toys/dynamicscene/images/star.png
deleted file mode 100644 (file)
index 27ef924..0000000
Binary files a/examples/declarative/toys/dynamicscene/images/star.png and /dev/null differ
diff --git a/examples/declarative/toys/dynamicscene/images/sun.png b/examples/declarative/toys/dynamicscene/images/sun.png
deleted file mode 100644 (file)
index 7713ca5..0000000
Binary files a/examples/declarative/toys/dynamicscene/images/sun.png and /dev/null differ
diff --git a/examples/declarative/toys/dynamicscene/images/tree_s.png b/examples/declarative/toys/dynamicscene/images/tree_s.png
deleted file mode 100644 (file)
index 6eac35a..0000000
Binary files a/examples/declarative/toys/dynamicscene/images/tree_s.png and /dev/null differ
diff --git a/examples/declarative/toys/dynamicscene/qml/itemCreation.js b/examples/declarative/toys/dynamicscene/qml/itemCreation.js
deleted file mode 100644 (file)
index 4ee74c2..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-var itemComponent = null;
-var draggedItem = null;
-var startingMouse;
-var posnInWindow;
-
-function startDrag(mouse)
-{
-    posnInWindow = paletteItem.mapToItem(window, 0, 0);
-    startingMouse = { x: mouse.x, y: mouse.y }
-    loadComponent();
-}
-
-//Creation is split into two functions due to an asynchronous wait while
-//possible external files are loaded.
-
-function loadComponent() {
-    if (itemComponent != null) { // component has been previously loaded
-        createItem();
-        return;
-    }
-
-    itemComponent = Qt.createComponent(paletteItem.componentFile);
-    if (itemComponent.status == Component.Loading)  //Depending on the content, it can be ready or error immediately
-        component.statusChanged.connect(createItem);
-    else    
-        createItem();
-}
-
-function createItem() {
-    if (itemComponent.status == Component.Ready && draggedItem == null) {
-        draggedItem = itemComponent.createObject(window, {"image": paletteItem.image, "x": posnInWindow.x, "y": posnInWindow.y, "z": 3});
-        // make sure created item is above the ground layer
-    } else if (itemComponent.status == Component.Error) {
-        draggedItem = null;
-        console.log("error creating component");
-        console.log(itemComponent.errorString());
-    }
-}
-
-function continueDrag(mouse)
-{
-    if (draggedItem == null)
-        return;
-
-    draggedItem.x = mouse.x + posnInWindow.x - startingMouse.x;
-    draggedItem.y = mouse.y + posnInWindow.y - startingMouse.y;
-}
-
-function endDrag(mouse)
-{
-    if (draggedItem == null)
-        return;
-
-    if (draggedItem.x + draggedItem.width > toolbox.x) { //Don't drop it in the toolbox
-        draggedItem.destroy();
-        draggedItem = null;
-    } else {
-        draggedItem.created = true;
-        draggedItem = null;
-    }
-}
-
diff --git a/examples/declarative/toys/tic-tac-toe/content/pics/board.png b/examples/declarative/toys/tic-tac-toe/content/pics/board.png
deleted file mode 100644 (file)
index 7e5b7ba..0000000
Binary files a/examples/declarative/toys/tic-tac-toe/content/pics/board.png and /dev/null differ
diff --git a/examples/declarative/toys/tic-tac-toe/content/pics/o.png b/examples/declarative/toys/tic-tac-toe/content/pics/o.png
deleted file mode 100644 (file)
index abc7ee0..0000000
Binary files a/examples/declarative/toys/tic-tac-toe/content/pics/o.png and /dev/null differ
diff --git a/examples/declarative/toys/tic-tac-toe/content/pics/x.png b/examples/declarative/toys/tic-tac-toe/content/pics/x.png
deleted file mode 100644 (file)
index ddc65c8..0000000
Binary files a/examples/declarative/toys/tic-tac-toe/content/pics/x.png and /dev/null differ
diff --git a/examples/declarative/toys/tic-tac-toe/content/tic-tac-toe.js b/examples/declarative/toys/tic-tac-toe/content/tic-tac-toe.js
deleted file mode 100644 (file)
index 5a166b7..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-function winner(board)
-{
-    for (var i=0; i<3; ++i) {
-        if (board.children[i].state != ""
-                && board.children[i].state == board.children[i+3].state
-                && board.children[i].state == board.children[i+6].state)
-            return true
-
-        if (board.children[i*3].state != ""
-                && board.children[i*3].state == board.children[i*3+1].state
-                && board.children[i*3].state == board.children[i*3+2].state)
-            return true
-    }
-
-    if (board.children[0].state != ""
-            && board.children[0].state == board.children[4].state != ""
-            && board.children[0].state == board.children[8].state != "")
-        return true
-
-    if (board.children[2].state != ""
-            && board.children[2].state == board.children[4].state != ""
-            && board.children[2].state == board.children[6].state != "")
-        return true
-
-    return false
-}
-
-function restartGame()
-{
-    game.running = true
-
-    for (var i=0; i<9; ++i)
-        board.children[i].state = ""
-}
-
-function makeMove(pos, player)
-{
-    board.children[pos].state = player
-    if (winner(board)) {
-        gameFinished(player + " wins")
-        return true
-    } else {
-        return false
-    }
-}
-
-function canPlayAtPos(pos)
-{
-    return board.children[pos].state == ""
-}
-
-function computerTurn()
-{
-    var r = Math.random();
-    if (r < game.difficulty)
-        smartAI();
-    else
-        randomAI();
-}
-
-function smartAI()
-{
-    function boardCopy(a) {
-        var ret = new Object;
-        ret.children = new Array(9);
-        for (var i = 0; i<9; i++) {
-            ret.children[i] = new Object;
-            ret.children[i].state = a.children[i].state;
-        }
-        return ret;
-    }
-
-    for (var i=0; i<9; i++) {
-        var simpleBoard = boardCopy(board);
-        if (canPlayAtPos(i)) {
-            simpleBoard.children[i].state = "O";
-            if (winner(simpleBoard)) {
-                makeMove(i, "O")
-                return
-            }
-        }
-    }
-    for (var i=0; i<9; i++) {
-        var simpleBoard = boardCopy(board);
-        if (canPlayAtPos(i)) {
-            simpleBoard.children[i].state = "X";
-            if (winner(simpleBoard)) {
-                makeMove(i, "O")
-                return
-            }
-        }
-    }
-
-    function thwart(a,b,c) {    //If they are at a, try b or c
-        if (board.children[a].state == "X") {
-            if (canPlayAtPos(b)) {
-                makeMove(b, "O")
-                return true
-            } else if (canPlayAtPos(c)) {
-                makeMove(c, "O")
-                return true
-            }
-        }
-        return false;
-    }
-
-    if (thwart(4,0,2)) return;
-    if (thwart(0,4,3)) return;
-    if (thwart(2,4,1)) return;
-    if (thwart(6,4,7)) return;
-    if (thwart(8,4,5)) return;
-    if (thwart(1,4,2)) return;
-    if (thwart(3,4,0)) return;
-    if (thwart(5,4,8)) return;
-    if (thwart(7,4,6)) return;
-
-    for (var i =0; i<9; i++) {
-        if (canPlayAtPos(i)) {
-            makeMove(i, "O")
-            return
-        }
-    }
-    restartGame();
-}
-
-function randomAI()
-{
-    var unfilledPosns = new Array();
-
-    for (var i=0; i<9; ++i) {
-        if (canPlayAtPos(i))
-            unfilledPosns.push(i);
-    }
-
-    if (unfilledPosns.length == 0) {
-        restartGame();
-    } else {
-        var choice = unfilledPosns[Math.floor(Math.random() * unfilledPosns.length)];
-        makeMove(choice, "O");
-    }
-}
-
-function gameFinished(message)
-{
-    messageDisplay.text = message
-    messageDisplay.visible = true
-    game.running = false
-}
-
diff --git a/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qmlproject b/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/toys/toys.qmlproject b/examples/declarative/toys/toys.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/toys/tvtennis/tvtennis.qmlproject b/examples/declarative/toys/tvtennis/tvtennis.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/ui-components/README b/examples/declarative/ui-components/README
deleted file mode 100644 (file)
index 7eecec1..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-With Qt Declarative, it is easy to implement the UI components that you need
-in exactly the way that you want. These examples demonstrate this by creating
-a selection of user interface components where the look and feel has been
-completely defined in a QML file.
-
-The example launcher provided with Qt can be used to explore each of the
-examples in this directory. But most can also be viewed directly with the
-QML viewer utility, without requiring compilation.
-
-Documentation for these examples can be found via the Tutorials and Examples
-link in the main Qt documentation.
-
-
-Finding the Qt Examples and Demos launcher
-==========================================
-
-On Windows:
-
-The launcher can be accessed via the Windows Start menu. Select the menu
-entry entitled "Qt Examples and Demos" entry in the submenu containing
-the Qt tools.
-
-On Mac OS X:
-
-For the binary distribution, the qtdemo executable is installed in the
-/Developer/Applications/Qt directory. For the source distribution, it is
-installed alongside the other Qt tools on the path specified when Qt is
-configured.
-
-On Unix/Linux:
-
-The qtdemo executable is installed alongside the other Qt tools on the path
-specified when Qt is configured.
-
-On all platforms:
-
-The source code for the launcher can be found in the demos/qtdemo directory
-in the Qt package. This example is built at the same time as the Qt libraries,
-tools, examples, and demonstrations.
diff --git a/examples/declarative/ui-components/dialcontrol/content/background.png b/examples/declarative/ui-components/dialcontrol/content/background.png
deleted file mode 100644 (file)
index 75d555d..0000000
Binary files a/examples/declarative/ui-components/dialcontrol/content/background.png and /dev/null differ
diff --git a/examples/declarative/ui-components/dialcontrol/content/needle.png b/examples/declarative/ui-components/dialcontrol/content/needle.png
deleted file mode 100644 (file)
index 2d19f75..0000000
Binary files a/examples/declarative/ui-components/dialcontrol/content/needle.png and /dev/null differ
diff --git a/examples/declarative/ui-components/dialcontrol/content/needle_shadow.png b/examples/declarative/ui-components/dialcontrol/content/needle_shadow.png
deleted file mode 100644 (file)
index 8d8a928..0000000
Binary files a/examples/declarative/ui-components/dialcontrol/content/needle_shadow.png and /dev/null differ
diff --git a/examples/declarative/ui-components/dialcontrol/content/overlay.png b/examples/declarative/ui-components/dialcontrol/content/overlay.png
deleted file mode 100644 (file)
index 3860a7b..0000000
Binary files a/examples/declarative/ui-components/dialcontrol/content/overlay.png and /dev/null differ
diff --git a/examples/declarative/ui-components/dialcontrol/content/quit.png b/examples/declarative/ui-components/dialcontrol/content/quit.png
deleted file mode 100644 (file)
index b822057..0000000
Binary files a/examples/declarative/ui-components/dialcontrol/content/quit.png and /dev/null differ
diff --git a/examples/declarative/ui-components/dialcontrol/dialcontrol.qmlproject b/examples/declarative/ui-components/dialcontrol/dialcontrol.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/ui-components/flipable/content/5_heart.png b/examples/declarative/ui-components/flipable/content/5_heart.png
deleted file mode 100644 (file)
index fb59d81..0000000
Binary files a/examples/declarative/ui-components/flipable/content/5_heart.png and /dev/null differ
diff --git a/examples/declarative/ui-components/flipable/content/9_club.png b/examples/declarative/ui-components/flipable/content/9_club.png
deleted file mode 100644 (file)
index 2545001..0000000
Binary files a/examples/declarative/ui-components/flipable/content/9_club.png and /dev/null differ
diff --git a/examples/declarative/ui-components/flipable/content/back.png b/examples/declarative/ui-components/flipable/content/back.png
deleted file mode 100644 (file)
index f715d74..0000000
Binary files a/examples/declarative/ui-components/flipable/content/back.png and /dev/null differ
diff --git a/examples/declarative/ui-components/flipable/flipable.qmlproject b/examples/declarative/ui-components/flipable/flipable.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/ui-components/progressbar/content/background.png b/examples/declarative/ui-components/progressbar/content/background.png
deleted file mode 100644 (file)
index 9044226..0000000
Binary files a/examples/declarative/ui-components/progressbar/content/background.png and /dev/null differ
diff --git a/examples/declarative/ui-components/progressbar/progressbar.qmlproject b/examples/declarative/ui-components/progressbar/progressbar.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/ui-components/scrollbar/pics/niagara_falls.jpg b/examples/declarative/ui-components/scrollbar/pics/niagara_falls.jpg
deleted file mode 100644 (file)
index 618d808..0000000
Binary files a/examples/declarative/ui-components/scrollbar/pics/niagara_falls.jpg and /dev/null differ
diff --git a/examples/declarative/ui-components/scrollbar/scrollbar.qmlproject b/examples/declarative/ui-components/scrollbar/scrollbar.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/ui-components/searchbox/images/clear.png b/examples/declarative/ui-components/searchbox/images/clear.png
deleted file mode 100644 (file)
index 91eb270..0000000
Binary files a/examples/declarative/ui-components/searchbox/images/clear.png and /dev/null differ
diff --git a/examples/declarative/ui-components/searchbox/images/lineedit-bg-focus.png b/examples/declarative/ui-components/searchbox/images/lineedit-bg-focus.png
deleted file mode 100644 (file)
index bbfac38..0000000
Binary files a/examples/declarative/ui-components/searchbox/images/lineedit-bg-focus.png and /dev/null differ
diff --git a/examples/declarative/ui-components/searchbox/images/lineedit-bg.png b/examples/declarative/ui-components/searchbox/images/lineedit-bg.png
deleted file mode 100644 (file)
index 9044226..0000000
Binary files a/examples/declarative/ui-components/searchbox/images/lineedit-bg.png and /dev/null differ
diff --git a/examples/declarative/ui-components/searchbox/searchbox.qmlproject b/examples/declarative/ui-components/searchbox/searchbox.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/ui-components/slideswitch/content/background.svg b/examples/declarative/ui-components/slideswitch/content/background.svg
deleted file mode 100644 (file)
index f920d3e..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-        x="0px" y="0px" width="130px" height="56px" viewBox="0 0 130 56" enable-background="new 0 0 130 56" xml:space="preserve">
-<defs>
-</defs>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-37.5005" y1="-66" x2="-37.5005" y2="-121.9985" gradientTransform="matrix(1 0 0 -1 102.5 -66)">
-       <stop  offset="0.0056" style="stop-color:#000000"/>
-       <stop  offset="1" style="stop-color:#EAECEF"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M101.998,55.998H28c-15.439,0-28-12.562-28-28C0,12.56,12.561,0,28,0h73.998
-       c15.439,0,28,12.559,28,27.998C129.998,43.438,117.438,55.998,101.998,55.998L101.998,55.998z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-5.5" y1="-132.1338" x2="-69.5002" y2="-55.8613" gradientTransform="matrix(1 0 0 -1 102.5 -66)">
-       <stop  offset="0.0056" style="stop-color:#000000"/>
-       <stop  offset="1" style="stop-color:#828385"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M127.999,27.998c0,14.359-11.642,26-26,26h-74c-14.359,0-26-11.641-26-26l0,0
-       c0-14.359,11.641-26,26-26h74C116.357,1.998,127.999,13.639,127.999,27.998L127.999,27.998z"/>
-</svg>
diff --git a/examples/declarative/ui-components/slideswitch/content/knob.svg b/examples/declarative/ui-components/slideswitch/content/knob.svg
deleted file mode 100644 (file)
index fb69337..0000000
+++ /dev/null
@@ -1,867 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In  -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   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"
-   version="1.1"
-   x="0px"
-   y="0px"
-   width="52px"
-   height="52px"
-   viewBox="0 0 52 52"
-   enable-background="new 0 0 52 52"
-   xml:space="preserve"
-   id="svg3883"
-   sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   sodipodi:docname="knob_on.svg"
-   sodipodi:docbase="/local/axel/embeddedwidgets/embeddedstories/skins/svgslideswitch/MetallicBrush"><metadata
-   id="metadata4200"><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><sodipodi:namedview
-   inkscape:window-height="640"
-   inkscape:window-width="937"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="0.0"
-   guidetolerance="10.0"
-   gridtolerance="10.0"
-   objecttolerance="10.0"
-   borderopacity="1.0"
-   bordercolor="#666666"
-   pagecolor="#ffffff"
-   id="base"
-   inkscape:zoom="8.3653846"
-   inkscape:cx="26.000002"
-   inkscape:cy="26"
-   inkscape:window-x="0"
-   inkscape:window-y="0"
-   inkscape:current-layer="svg3883" />
-<defs
-   id="defs3885">
-</defs>
-<linearGradient
-   id="SVGID_1_"
-   gradientUnits="userSpaceOnUse"
-   x1="-59.7866"
-   y1="-115.917"
-   x2="-93.2123"
-   y2="-76.0818"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-       <stop
-   offset="0.0056"
-   style="stop-color:#000000"
-   id="stop3888" />
-       <stop
-   offset="1"
-   style="stop-color:#EAECEF"
-   id="stop3890" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="26"
-   id="circle3892"
-   style="fill:url(#SVGID_1_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="26"
-   sodipodi:ry="26"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_2_"
-   gradientUnits="userSpaceOnUse"
-   x1="-100.5"
-   y1="-96"
-   x2="-52.5"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-       <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop3895" />
-       <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop3897" />
-       <stop
-   offset="0.6043"
-   style="stop-color:#E7EAED"
-   id="stop3899" />
-       <stop
-   offset="0.6751"
-   style="stop-color:#DEE4E7"
-   id="stop3901" />
-       <stop
-   offset="0.7358"
-   style="stop-color:#CFD9DD"
-   id="stop3903" />
-       <stop
-   offset="0.791"
-   style="stop-color:#B9CACF"
-   id="stop3905" />
-       <stop
-   offset="0.8425"
-   style="stop-color:#9EB6BD"
-   id="stop3907" />
-       <stop
-   offset="0.891"
-   style="stop-color:#7B9EA7"
-   id="stop3909" />
-       <stop
-   offset="0.9374"
-   style="stop-color:#53828C"
-   id="stop3911" />
-       <stop
-   offset="0.9809"
-   style="stop-color:#25626E"
-   id="stop3913" />
-       <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop3915" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="24"
-   id="circle3917"
-   style="fill:url(#SVGID_2_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="24"
-   sodipodi:ry="24"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_3_"
-   gradientUnits="userSpaceOnUse"
-   x1="-98.6328"
-   y1="-96"
-   x2="-54.3672"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-       <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop3920" />
-       <stop
-   offset="0.073"
-   style="stop-color:#8FAECB"
-   id="stop3922" />
-       <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop3924" />
-       <stop
-   offset="0.5902"
-   style="stop-color:#E7E9ED"
-   id="stop3926" />
-       <stop
-   offset="0.618"
-   style="stop-color:#E4E7EB"
-   id="stop3928" />
-       <stop
-   offset="0.6697"
-   style="stop-color:#E0E4E9"
-   id="stop3930" />
-       <stop
-   offset="0.7211"
-   style="stop-color:#D4DCE1"
-   id="stop3932" />
-       <stop
-   offset="0.7722"
-   style="stop-color:#C0CFD5"
-   id="stop3934" />
-       <stop
-   offset="0.809"
-   style="stop-color:#ADC2C9"
-   id="stop3936" />
-       <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop3938" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="22.132999"
-   id="circle3940"
-   style="fill:url(#SVGID_3_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="22.132999"
-   sodipodi:ry="22.132999"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_4_"
-   gradientUnits="userSpaceOnUse"
-   x1="-96.7671"
-   y1="-96"
-   x2="-56.2324"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-       <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop3943" />
-       <stop
-   offset="0.073"
-   style="stop-color:#86A7C4"
-   id="stop3945" />
-       <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop3947" />
-       <stop
-   offset="0.577"
-   style="stop-color:#E7EAED"
-   id="stop3949" />
-       <stop
-   offset="0.618"
-   style="stop-color:#E1E6EA"
-   id="stop3951" />
-       <stop
-   offset="0.6697"
-   style="stop-color:#DDE3E8"
-   id="stop3953" />
-       <stop
-   offset="0.7211"
-   style="stop-color:#D1DBE1"
-   id="stop3955" />
-       <stop
-   offset="0.7722"
-   style="stop-color:#BDCDD5"
-   id="stop3957" />
-       <stop
-   offset="0.809"
-   style="stop-color:#AAC0CA"
-   id="stop3959" />
-       <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop3961" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="20.267"
-   id="circle3963"
-   style="fill:url(#SVGID_4_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="20.267"
-   sodipodi:ry="20.267"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_5_"
-   gradientUnits="userSpaceOnUse"
-   x1="-94.8999"
-   y1="-96"
-   x2="-58.0996"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-       <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop3966" />
-       <stop
-   offset="0.073"
-   style="stop-color:#7E9FBC"
-   id="stop3968" />
-       <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop3970" />
-       <stop
-   offset="0.5709"
-   style="stop-color:#E6E9ED"
-   id="stop3972" />
-       <stop
-   offset="0.618"
-   style="stop-color:#DFE4E9"
-   id="stop3974" />
-       <stop
-   offset="0.6687"
-   style="stop-color:#DBE1E7"
-   id="stop3976" />
-       <stop
-   offset="0.7193"
-   style="stop-color:#CFD9E0"
-   id="stop3978" />
-       <stop
-   offset="0.7695"
-   style="stop-color:#BBCCD6"
-   id="stop3980" />
-       <stop
-   offset="0.809"
-   style="stop-color:#A6BECA"
-   id="stop3982" />
-       <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop3984" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="18.4"
-   id="circle3986"
-   style="fill:url(#SVGID_5_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="18.4"
-   sodipodi:ry="18.4"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_6_"
-   gradientUnits="userSpaceOnUse"
-   x1="-93.0332"
-   y1="-96"
-   x2="-59.9668"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-       <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop3989" />
-       <stop
-   offset="0.073"
-   style="stop-color:#7697B4"
-   id="stop3991" />
-       <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop3993" />
-       <stop
-   offset="0.5636"
-   style="stop-color:#E6E9ED"
-   id="stop3995" />
-       <stop
-   offset="0.618"
-   style="stop-color:#DCE2E8"
-   id="stop3997" />
-       <stop
-   offset="0.6687"
-   style="stop-color:#D8DFE6"
-   id="stop3999" />
-       <stop
-   offset="0.7193"
-   style="stop-color:#CCD7E0"
-   id="stop4001" />
-       <stop
-   offset="0.7695"
-   style="stop-color:#B8CAD5"
-   id="stop4003" />
-       <stop
-   offset="0.809"
-   style="stop-color:#A3BCCA"
-   id="stop4005" />
-       <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop4007" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="16.533001"
-   id="circle4009"
-   style="fill:url(#SVGID_6_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="16.533001"
-   sodipodi:ry="16.533001"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_7_"
-   gradientUnits="userSpaceOnUse"
-   x1="-91.167"
-   y1="-96"
-   x2="-61.833"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-       <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop4012" />
-       <stop
-   offset="0.073"
-   style="stop-color:#6D8FAD"
-   id="stop4014" />
-       <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop4016" />
-       <stop
-   offset="0.5605"
-   style="stop-color:#E5E8EC"
-   id="stop4018" />
-       <stop
-   offset="0.618"
-   style="stop-color:#DAE1E7"
-   id="stop4020" />
-       <stop
-   offset="0.6679"
-   style="stop-color:#D6DEE5"
-   id="stop4022" />
-       <stop
-   offset="0.7175"
-   style="stop-color:#CAD6DF"
-   id="stop4024" />
-       <stop
-   offset="0.7669"
-   style="stop-color:#B6C9D6"
-   id="stop4026" />
-       <stop
-   offset="0.809"
-   style="stop-color:#9FBACB"
-   id="stop4028" />
-       <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop4030" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="14.667"
-   id="circle4032"
-   style="fill:url(#SVGID_7_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="14.667"
-   sodipodi:ry="14.667"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_8_"
-   gradientUnits="userSpaceOnUse"
-   x1="-89.2998"
-   y1="-96"
-   x2="-63.7002"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-       <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop4035" />
-       <stop
-   offset="0.073"
-   style="stop-color:#6587A5"
-   id="stop4037" />
-       <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop4039" />
-       <stop
-   offset="0.5588"
-   style="stop-color:#E4E8EC"
-   id="stop4041" />
-       <stop
-   offset="0.618"
-   style="stop-color:#D8DFE7"
-   id="stop4043" />
-       <stop
-   offset="0.6675"
-   style="stop-color:#D4DCE5"
-   id="stop4045" />
-       <stop
-   offset="0.7167"
-   style="stop-color:#C8D5E0"
-   id="stop4047" />
-       <stop
-   offset="0.7657"
-   style="stop-color:#B4C8D6"
-   id="stop4049" />
-       <stop
-   offset="0.809"
-   style="stop-color:#9CB8CB"
-   id="stop4051" />
-       <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop4053" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="12.8"
-   id="circle4055"
-   style="fill:url(#SVGID_8_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="12.8"
-   sodipodi:ry="12.8"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_9_"
-   gradientUnits="userSpaceOnUse"
-   x1="-87.4331"
-   y1="-96"
-   x2="-65.5664"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-       <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop4058" />
-       <stop
-   offset="0.073"
-   style="stop-color:#5D809D"
-   id="stop4060" />
-       <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop4062" />
-       <stop
-   offset="0.5567"
-   style="stop-color:#E3E7EC"
-   id="stop4064" />
-       <stop
-   offset="0.618"
-   style="stop-color:#D5DDE6"
-   id="stop4066" />
-       <stop
-   offset="0.6671"
-   style="stop-color:#D1DAE4"
-   id="stop4068" />
-       <stop
-   offset="0.7159"
-   style="stop-color:#C5D3DF"
-   id="stop4070" />
-       <stop
-   offset="0.7645"
-   style="stop-color:#B1C6D6"
-   id="stop4072" />
-       <stop
-   offset="0.809"
-   style="stop-color:#98B5CB"
-   id="stop4074" />
-       <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop4076" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="10.933"
-   id="circle4078"
-   style="fill:url(#SVGID_9_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="10.933"
-   sodipodi:ry="10.933"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_10_"
-   gradientUnits="userSpaceOnUse"
-   x1="-85.5659"
-   y1="-96"
-   x2="-67.4336"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-       <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop4081" />
-       <stop
-   offset="0.073"
-   style="stop-color:#547896"
-   id="stop4083" />
-       <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop4085" />
-       <stop
-   offset="0.5588"
-   style="stop-color:#E1E6EB"
-   id="stop4087" />
-       <stop
-   offset="0.618"
-   style="stop-color:#D3DCE5"
-   id="stop4089" />
-       <stop
-   offset="0.6663"
-   style="stop-color:#CFD9E3"
-   id="stop4091" />
-       <stop
-   offset="0.7143"
-   style="stop-color:#C3D2DF"
-   id="stop4093" />
-       <stop
-   offset="0.7621"
-   style="stop-color:#AFC5D7"
-   id="stop4095" />
-       <stop
-   offset="0.809"
-   style="stop-color:#94B3CC"
-   id="stop4097" />
-       <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop4099" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="9.066"
-   id="circle4101"
-   style="fill:url(#SVGID_10_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="9.066"
-   sodipodi:ry="9.066"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_11_"
-   gradientUnits="userSpaceOnUse"
-   x1="-83.7002"
-   y1="-96"
-   x2="-69.2998"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-       <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop4104" />
-       <stop
-   offset="0.073"
-   style="stop-color:#4C708E"
-   id="stop4106" />
-       <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop4108" />
-       <stop
-   offset="0.5625"
-   style="stop-color:#DEE4EA"
-   id="stop4110" />
-       <stop
-   offset="0.618"
-   style="stop-color:#D0DAE4"
-   id="stop4112" />
-       <stop
-   offset="0.6663"
-   style="stop-color:#CCD7E2"
-   id="stop4114" />
-       <stop
-   offset="0.7143"
-   style="stop-color:#C0D0DE"
-   id="stop4116" />
-       <stop
-   offset="0.7621"
-   style="stop-color:#ACC3D6"
-   id="stop4118" />
-       <stop
-   offset="0.809"
-   style="stop-color:#91B1CC"
-   id="stop4120" />
-       <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop4122" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="7.1999998"
-   id="circle4124"
-   style="fill:url(#SVGID_11_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="7.1999998"
-   sodipodi:ry="7.1999998"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_12_"
-   gradientUnits="userSpaceOnUse"
-   x1="-81.833"
-   y1="-96"
-   x2="-71.167"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-       <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop4127" />
-       <stop
-   offset="0.073"
-   style="stop-color:#446986"
-   id="stop4129" />
-       <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop4131" />
-       <stop
-   offset="0.5757"
-   style="stop-color:#D9E0E8"
-   id="stop4133" />
-       <stop
-   offset="0.618"
-   style="stop-color:#CED8E3"
-   id="stop4135" />
-       <stop
-   offset="0.6655"
-   style="stop-color:#CAD5E2"
-   id="stop4137" />
-       <stop
-   offset="0.7129"
-   style="stop-color:#BECEDD"
-   id="stop4139" />
-       <stop
-   offset="0.7601"
-   style="stop-color:#AAC1D6"
-   id="stop4141" />
-       <stop
-   offset="0.807"
-   style="stop-color:#8EB0CC"
-   id="stop4143" />
-       <stop
-   offset="0.809"
-   style="stop-color:#8DAFCC"
-   id="stop4145" />
-       <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop4147" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="5.3330002"
-   id="circle4149"
-   style="fill:url(#SVGID_12_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="5.3330002"
-   sodipodi:ry="5.3330002"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_13_"
-   gradientUnits="userSpaceOnUse"
-   x1="-79.9658"
-   y1="-96"
-   x2="-73.0342"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-       <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop4152" />
-       <stop
-   offset="0.073"
-   style="stop-color:#3B617F"
-   id="stop4154" />
-       <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop4156" />
-       <stop
-   offset="0.6087"
-   style="stop-color:#CED9E3"
-   id="stop4158" />
-       <stop
-   offset="0.618"
-   style="stop-color:#CBD7E2"
-   id="stop4160" />
-       <stop
-   offset="0.6655"
-   style="stop-color:#C7D4E1"
-   id="stop4162" />
-       <stop
-   offset="0.7129"
-   style="stop-color:#BBCDDD"
-   id="stop4164" />
-       <stop
-   offset="0.7601"
-   style="stop-color:#A7C0D6"
-   id="stop4166" />
-       <stop
-   offset="0.807"
-   style="stop-color:#8BAECD"
-   id="stop4168" />
-       <stop
-   offset="0.809"
-   style="stop-color:#8AADCD"
-   id="stop4170" />
-       <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop4172" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="3.4660001"
-   id="circle4174"
-   style="fill:url(#SVGID_13_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="3.4660001"
-   sodipodi:ry="3.4660001"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-<linearGradient
-   id="SVGID_14_"
-   gradientUnits="userSpaceOnUse"
-   x1="-78.1001"
-   y1="-96"
-   x2="-74.9004"
-   y2="-96"
-   gradientTransform="matrix(1,0,0,-1,102.5,-70)">
-       <stop
-   offset="0.0056"
-   style="stop-color:#8AADCE"
-   id="stop4177" />
-       <stop
-   offset="0.073"
-   style="stop-color:#335977"
-   id="stop4179" />
-       <stop
-   offset="0.5"
-   style="stop-color:#EAECEF"
-   id="stop4181" />
-       <stop
-   offset="0.618"
-   style="stop-color:#C9D5E1"
-   id="stop4183" />
-       <stop
-   offset="0.6648"
-   style="stop-color:#C5D3E0"
-   id="stop4185" />
-       <stop
-   offset="0.7114"
-   style="stop-color:#B9CBDC"
-   id="stop4187" />
-       <stop
-   offset="0.758"
-   style="stop-color:#A5BFD6"
-   id="stop4189" />
-       <stop
-   offset="0.8042"
-   style="stop-color:#89ADCE"
-   id="stop4191" />
-       <stop
-   offset="0.809"
-   style="stop-color:#86ABCD"
-   id="stop4193" />
-       <stop
-   offset="1"
-   style="stop-color:#0E525F"
-   id="stop4195" />
-</linearGradient>
-<circle
-   cx="26"
-   cy="26"
-   r="1.6"
-   id="circle4197"
-   style="fill:url(#SVGID_14_)"
-   sodipodi:cx="26"
-   sodipodi:cy="26"
-   sodipodi:rx="1.6"
-   sodipodi:ry="1.6"
-   transform="matrix(0.923077,0,0,0.923077,2,1.999996)" />
-</svg>
\ No newline at end of file
diff --git a/examples/declarative/ui-components/slideswitch/slideswitch.qmlproject b/examples/declarative/ui-components/slideswitch/slideswitch.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/ui-components/spinner/content/spinner-bg.png b/examples/declarative/ui-components/spinner/content/spinner-bg.png
deleted file mode 100644 (file)
index b3556f1..0000000
Binary files a/examples/declarative/ui-components/spinner/content/spinner-bg.png and /dev/null differ
diff --git a/examples/declarative/ui-components/spinner/content/spinner-select.png b/examples/declarative/ui-components/spinner/content/spinner-select.png
deleted file mode 100644 (file)
index 95a17a1..0000000
Binary files a/examples/declarative/ui-components/spinner/content/spinner-select.png and /dev/null differ
diff --git a/examples/declarative/ui-components/spinner/spinner.qmlproject b/examples/declarative/ui-components/spinner/spinner.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/ui-components/tabwidget/tab.png b/examples/declarative/ui-components/tabwidget/tab.png
deleted file mode 100644 (file)
index ad80216..0000000
Binary files a/examples/declarative/ui-components/tabwidget/tab.png and /dev/null differ
diff --git a/examples/declarative/ui-components/tabwidget/tabwidget.qmlproject b/examples/declarative/ui-components/tabwidget/tabwidget.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/ui-components/ui-components.qmlproject b/examples/declarative/ui-components/ui-components.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/xml/xml.qmlproject b/examples/declarative/xml/xml.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/xml/xmlhttprequest/data.xml b/examples/declarative/xml/xmlhttprequest/data.xml
deleted file mode 100644 (file)
index 8b7f1e1..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<data>
-    <element1 />
-    <element2 />
-</data>
-
diff --git a/examples/declarative/xml/xmlhttprequest/xmlhttprequest.qmlproject b/examples/declarative/xml/xmlhttprequest/xmlhttprequest.qmlproject
deleted file mode 100644 (file)
index d4909f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
index 03f0384..add6a63 100644 (file)
@@ -54,4 +54,4 @@ void DialogPlugin::registerTypes(const char *uri){
 }
 
 //FileDialog is the plugin name (same as the TARGET in the project file) and DialogPlugin is the plugin classs
-Q_EXPORT_PLUGIN2(FileDialog, DialogPlugin);
\ No newline at end of file
+Q_EXPORT_PLUGIN2(FileDialog, DialogPlugin);
index afbb330..2844274 100644 (file)
@@ -53,4 +53,4 @@ void File::setName(const QString &str){
         m_name = str;
         emit nameChanged();
     }
-}
\ No newline at end of file
+}
index 5e30350..1730d11 100644 (file)
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QDeclarativeDebugServicePrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeDebugService : public QObject
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugService : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarativeDebugService)
index accb8ef..bcf4fe4 100644 (file)
@@ -59,7 +59,7 @@ class QPacket;
 class QPacketAutoSend;
 class QPacketProtocolPrivate;
 
-class Q_DECLARATIVE_EXPORT QPacketProtocol : public QObject
+class Q_DECLARATIVE_PRIVATE_EXPORT QPacketProtocol : public QObject
 {
 Q_OBJECT
 public:
@@ -89,7 +89,7 @@ private:
 };
 
 
-class Q_DECLARATIVE_EXPORT QPacket : public QDataStream
+class Q_DECLARATIVE_PRIVATE_EXPORT QPacket : public QDataStream
 {
 public:
     QPacket();
index bc65634..4c4d17c 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.4.png differ
index be041d8..d7b5943 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.6.png and b/tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.6.png differ
index 0efb20a..75a6c49 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png differ
index 6525dbb..ae89849 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png differ
index 5b8d209..7b7db05 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png differ
index cf012ba..7c1442f 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png differ
index 57e77a4..c01c980 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png differ
index 24d26bd..8806e4c 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png differ
index a540734..b331119 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png differ
index 17da643..76e3c6f 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png differ
index e03cfe4..141753c 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.7.png and b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.7.png differ
index 1b808ef..8b6329d 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png differ
index 666d272..38f2051 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png differ
index 823199c..d85498b 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.0.png differ
index 7e84164..7547856 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png differ
index 7e84164..84430bb 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png differ
index 6119f92..026d06c 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png differ
index 6119f92..026d06c 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.1.png differ
index f2e6117..16202c4 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.1.png differ
index 2f4c84a..38b9668 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png differ
index ae786a2..801ec2b 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png differ
index 93c16dc..ddd6cc5 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png differ
index acec1ee..4679774 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png differ
index f380c08..51018b4 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png differ
index 18142dd..f5ed905 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png differ
index c7f59b8..5005724 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.5.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.5.png differ
index be676c0..e47b479 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png differ
index df2fe2f..0d3c672 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png differ
index b4e1d3a..56d98ff 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png differ
index 4177b9e..1ab1eb5 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png differ
index 36e5d35..68921f6 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png differ
index 34f8e38..c9450c7 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.0.png differ
index 0b4ca4e..5049c3f 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png differ
index 251beb6..ee6e16a 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png differ
index 5cd2d7d..d9d2252 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png differ
index 5cd2d7d..d9d2252 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png differ
index bf6a44e..cf99d98 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png differ
index 1089578..e3937f0 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png differ
index c9113de..2fe3337 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png differ
index 47b4744..97b9913 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png differ
index c518204..08e059f 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png differ
index 9f1c26a..bbc5ba2 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png differ
index cd8d0a5..465b64e 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png differ
index 8f5f872..d9d2252 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png differ
index a61ba5a..61606b2 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png differ
index 2a28c96..a4b28fc 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png differ
index d1ddaa6..5be6bbb 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png differ
index 493c5cd..a220f65 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png differ
index 2b2ce59..6946707 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png differ
index 044eea4..4eeb8ec 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png differ
index f0748b2..4eeb8ec 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png differ
index 8d74b8d..59fc0fc 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png differ
index 8a642d2..2747b50 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png differ
index 5698741..74efe73 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png differ
index 7f56f34..02f6e17 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png differ
index 8d74b8d..59fc0fc 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.4.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.4.png differ
index 8effaef..56f6ece 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png differ
index 8effaef..56f6ece 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png differ
index 8effaef..56f6ece 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png differ
index b79af19..f8bc3b4 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png differ
index ef15fdf..e156cd5 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png differ
index 99d451c..d624a71 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.7.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.7.png differ
index 5f632d0..57a1599 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png differ
index 060be22..d327d5b 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png differ
index d373aef..c1e3dce 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png differ
index 0ea21f3..7829e03 100644 (file)
Binary files a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png and b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png differ