Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

14 files changed, 107 insertions, 1 deletions

diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro
new file mode 100644
index 0000000..b8c0200
--- /dev/null
+++ b/examples/declarative/declarative.pro
@@ -0,0 +1,48 @@
+TEMPLATE = subdirs
+
+# These examples contain some C++ and need to be built
+SUBDIRS = \
+   extending \
+   imageprovider \
+   objectlistmodel \
+   plugins
+
+# These examples contain no C++ and can simply be copied
+sources.files = \
+   animations \
+   aspectratio \
+   behaviours \
+   border-image \
+   clocks \
+   colorbrowser \
+   connections \
+   dial \
+   dynamic \
+   effects \
+   fillmode \
+   focusscope \
+   fonts \
+   gridview \
+   layouts \
+   listview \
+   mousearea \
+   package \
+   parallax \
+   progressbar \
+   scrollbar \
+   searchbox \
+   slideswitch \
+   sql \
+   states \
+   tabwidget \
+   tic-tac-toe \
+   tutorials \
+   tvtennis \
+   velocity \
+   webview \
+   workerlistmodel \
+   workerscript \
+   xmldata \
+   xmlhttprequest
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative
+INSTALLS += sources
diff --git a/examples/declarative/extending/adding/adding.pro b/examples/declarative/extending/adding/adding.pro
index c02a35f..6072de4 100644
--- a/examples/declarative/extending/adding/adding.pro
+++ b/examples/declarative/extending/adding/adding.pro
@@ -9,3 +9,7 @@ SOURCES += main.cpp \
            person.cpp 
 HEADERS += person.h
 RESOURCES += adding.qrc
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/adding
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS adding.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/adding
+INSTALLS += target sources
diff --git a/examples/declarative/extending/attached/attached.pro b/examples/declarative/extending/attached/attached.pro
index b0f3fea..f6d76ed 100644
--- a/examples/declarative/extending/attached/attached.pro
+++ b/examples/declarative/extending/attached/attached.pro
@@ -11,3 +11,7 @@ SOURCES += main.cpp \
 HEADERS += person.h \
            birthdayparty.h
 RESOURCES += attached.qrc
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/attached
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS attached.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/attached
+INSTALLS += target sources
diff --git a/examples/declarative/extending/binding/binding.pro b/examples/declarative/extending/binding/binding.pro
index 8298565..903712e 100644
--- a/examples/declarative/extending/binding/binding.pro
+++ b/examples/declarative/extending/binding/binding.pro
@@ -13,3 +13,7 @@ HEADERS += person.h \
            birthdayparty.h \
            happybirthday.h
 RESOURCES += binding.qrc
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/binding
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS binding.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/binding
+INSTALLS += target sources
diff --git a/examples/declarative/extending/coercion/coercion.pro b/examples/declarative/extending/coercion/coercion.pro
index 136b210..c8daed8 100644
--- a/examples/declarative/extending/coercion/coercion.pro
+++ b/examples/declarative/extending/coercion/coercion.pro
@@ -11,3 +11,7 @@ SOURCES += main.cpp \
 HEADERS += person.h \
            birthdayparty.h
 RESOURCES += coercion.qrc
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/coercion
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS coercion.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/coercion
+INSTALLS += target sources
diff --git a/examples/declarative/extending/default/default.pro b/examples/declarative/extending/default/default.pro
index 0d5d45c..32aff0b 100644
--- a/examples/declarative/extending/default/default.pro
+++ b/examples/declarative/extending/default/default.pro
@@ -11,3 +11,7 @@ SOURCES += main.cpp \
 HEADERS += person.h \
            birthdayparty.h
 RESOURCES += default.qrc
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/default
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS default.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/default
+INSTALLS += target sources
diff --git a/examples/declarative/extending/extended/extended.pro b/examples/declarative/extending/extended/extended.pro
index 1182226..97af286 100644
--- a/examples/declarative/extending/extended/extended.pro
+++ b/examples/declarative/extending/extended/extended.pro
@@ -9,3 +9,7 @@ SOURCES += main.cpp \
            lineedit.cpp 
 HEADERS += lineedit.h
 RESOURCES += extended.qrc
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/extended
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extended.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/extended
+INSTALLS += target sources
diff --git a/examples/declarative/extending/grouped/grouped.pro b/examples/declarative/extending/grouped/grouped.pro
index 8fde8e8..576e1d2 100644
--- a/examples/declarative/extending/grouped/grouped.pro
+++ b/examples/declarative/extending/grouped/grouped.pro
@@ -11,3 +11,7 @@ SOURCES += main.cpp \
 HEADERS += person.h \
            birthdayparty.h
 RESOURCES += grouped.qrc
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/grouped
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grouped.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/grouped
+INSTALLS += target sources
diff --git a/examples/declarative/extending/properties/properties.pro b/examples/declarative/extending/properties/properties.pro
index 6355644..a8f4301 100644
--- a/examples/declarative/extending/properties/properties.pro
+++ b/examples/declarative/extending/properties/properties.pro
@@ -11,3 +11,8 @@ SOURCES += main.cpp \
 HEADERS += person.h \
            birthdayparty.h
 RESOURCES += properties.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/properties
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS properties.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/properties
+INSTALLS += target sources
diff --git a/examples/declarative/extending/signal/signal.pro b/examples/declarative/extending/signal/signal.pro
index 30e413f..6367a38 100644
--- a/examples/declarative/extending/signal/signal.pro
+++ b/examples/declarative/extending/signal/signal.pro
@@ -11,3 +11,7 @@ SOURCES += main.cpp \
 HEADERS += person.h \
            birthdayparty.h
 RESOURCES += signal.qrc
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/signal
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS signal.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/signal
+INSTALLS += target sources
diff --git a/examples/declarative/extending/valuesource/valuesource.pro b/examples/declarative/extending/valuesource/valuesource.pro
index 9e54448..d3409b6 100644
--- a/examples/declarative/extending/valuesource/valuesource.pro
+++ b/examples/declarative/extending/valuesource/valuesource.pro
@@ -13,3 +13,7 @@ HEADERS += person.h \
            birthdayparty.h \
            happybirthday.h
 RESOURCES += valuesource.qrc
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/valuesource
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS valuesource.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/extending/valuesource
+INSTALLS += target sources
diff --git a/examples/declarative/imageprovider/imageprovider.pro b/examples/declarative/imageprovider/imageprovider.pro
index e403bf8..86dbcca 100644
--- a/examples/declarative/imageprovider/imageprovider.pro
+++ b/examples/declarative/imageprovider/imageprovider.pro
@@ -9,3 +9,13 @@ DESTDIR = ImageProviderCore
 # Input
 SOURCES += imageprovider.cpp
 
+sources.files = $$SOURCES imageprovider.qml imageprovider.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/imageprovider
+
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/imageprovider/ImageProviderCore
+
+ImageProviderCore_sources.files = \
+    ImageProviderCore/qmldir 
+ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/imageprovider/ImageProviderCore
+
+INSTALLS = sources ImageProviderCore_sources target
diff --git a/examples/declarative/objectlistmodel/objectlistmodel.pro b/examples/declarative/objectlistmodel/objectlistmodel.pro
index ca61e4c..869cde3 100644
--- a/examples/declarative/objectlistmodel/objectlistmodel.pro
+++ b/examples/declarative/objectlistmodel/objectlistmodel.pro
@@ -9,3 +9,10 @@ SOURCES += main.cpp \
            dataobject.cpp
 HEADERS += dataobject.h
 RESOURCES += objectlistmodel.qrc
+
+sources.files = $$SOURCES $$HEADERS $$RESOURCES objectlistmodel.pro view.qml
+sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/objectlistmodel
+target.path = $$[QT_INSTALL_EXAMPLES]/declarative/objectlistmodel
+
+INSTALLS += sources target
+
diff --git a/examples/declarative/plugins/plugins.pro b/examples/declarative/plugins/plugins.pro
index c925cea..877a5ce 100644
--- a/examples/declarative/plugins/plugins.pro
+++ b/examples/declarative/plugins/plugins.pro
@@ -17,7 +17,7 @@ qdeclarativesources.files += \
 
 qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample
 
-sources.files += plugins.pro plugin.cpp plugins.qml
+sources.files += plugins.pro plugin.cpp plugins.qml README
 sources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins
 
 target.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample