summaryrefslogtreecommitdiffstats
path: root/examples/declarative/ui-components/main/qml
diff options
context:
space:
mode:
authorartoka <arto.katajasalo@digia.com>2011-11-17 14:50:05 (GMT)
committerCasper van Donderen <casper.vandonderen@nokia.com>2011-11-17 14:59:54 (GMT)
commitf38788d08bcb7c50f5ce29255792a35f6ad2bb16 (patch)
tree5e76354ebd7f8794ea78782d56992bfefc741e07 /examples/declarative/ui-components/main/qml
parent5c2f5bf955e5c5a37c59f64ae05d816416c3f1ac (diff)
downloadQt-f38788d08bcb7c50f5ce29255792a35f6ad2bb16.zip
Qt-f38788d08bcb7c50f5ce29255792a35f6ad2bb16.tar.gz
Qt-f38788d08bcb7c50f5ce29255792a35f6ad2bb16.tar.bz2
ui-components/main example modifications
Modified the example to use centralized qmlapplicationviewer, removed duplicate files and modified project files according to the changes. Merge-request: 2719 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'examples/declarative/ui-components/main/qml')
-rw-r--r--examples/declarative/ui-components/main/qml/main/ScrollBar.qml (renamed from examples/declarative/ui-components/main/qml/ScrollBar.qml)0
-rw-r--r--examples/declarative/ui-components/main/qml/main/SearchBox.qml (renamed from examples/declarative/ui-components/main/qml/SearchBox.qml)0
-rw-r--r--examples/declarative/ui-components/main/qml/main/TabWidget.qml (renamed from examples/declarative/ui-components/main/qml/TabWidget.qml)0
-rw-r--r--examples/declarative/ui-components/main/qml/main/content/ProgressBar.qml (renamed from examples/declarative/ui-components/main/qml/content/ProgressBar.qml)0
-rw-r--r--examples/declarative/ui-components/main/qml/main/content/Spinner.qml (renamed from examples/declarative/ui-components/main/qml/content/Spinner.qml)0
-rw-r--r--examples/declarative/ui-components/main/qml/main/content/background.png (renamed from examples/declarative/ui-components/main/qml/content/background.png)bin426 -> 426 bytes
-rw-r--r--examples/declarative/ui-components/main/qml/main/content/spinner-bg.png (renamed from examples/declarative/ui-components/main/qml/content/spinner-bg.png)bin345 -> 345 bytes
-rw-r--r--examples/declarative/ui-components/main/qml/main/content/spinner-select.png (renamed from examples/declarative/ui-components/main/qml/content/spinner-select.png)bin320 -> 320 bytes
-rw-r--r--examples/declarative/ui-components/main/qml/main/images/clear.png (renamed from examples/declarative/ui-components/main/qml/images/clear.png)bin429 -> 429 bytes
-rw-r--r--examples/declarative/ui-components/main/qml/main/images/lineedit-bg-focus.png (renamed from examples/declarative/ui-components/main/qml/images/lineedit-bg-focus.png)bin526 -> 526 bytes
-rw-r--r--examples/declarative/ui-components/main/qml/main/images/lineedit-bg.png (renamed from examples/declarative/ui-components/main/qml/images/lineedit-bg.png)bin426 -> 426 bytes
-rw-r--r--examples/declarative/ui-components/main/qml/main/main.qml (renamed from examples/declarative/ui-components/main/qml/main.qml)0
-rw-r--r--examples/declarative/ui-components/main/qml/main/pics/niagara_falls.jpg (renamed from examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg)bin100161 -> 100161 bytes
-rw-r--r--examples/declarative/ui-components/main/qml/main/tab.png (renamed from examples/declarative/ui-components/main/qml/tab.png)bin507 -> 507 bytes
-rw-r--r--examples/declarative/ui-components/main/qml/progressbar.qmlproject16
-rw-r--r--examples/declarative/ui-components/main/qml/scrollbar.qmlproject16
-rw-r--r--examples/declarative/ui-components/main/qml/searchbox.qmlproject16
-rw-r--r--examples/declarative/ui-components/main/qml/spinner.qmlproject16
-rw-r--r--examples/declarative/ui-components/main/qml/tabwidget.qmlproject16
19 files changed, 0 insertions, 80 deletions
diff --git a/examples/declarative/ui-components/main/qml/ScrollBar.qml b/examples/declarative/ui-components/main/qml/main/ScrollBar.qml
index faa501a..faa501a 100644
--- a/examples/declarative/ui-components/main/qml/ScrollBar.qml
+++ b/examples/declarative/ui-components/main/qml/main/ScrollBar.qml
diff --git a/examples/declarative/ui-components/main/qml/SearchBox.qml b/examples/declarative/ui-components/main/qml/main/SearchBox.qml
index f54954a..f54954a 100644
--- a/examples/declarative/ui-components/main/qml/SearchBox.qml
+++ b/examples/declarative/ui-components/main/qml/main/SearchBox.qml
diff --git a/examples/declarative/ui-components/main/qml/TabWidget.qml b/examples/declarative/ui-components/main/qml/main/TabWidget.qml
index f066fd2..f066fd2 100644
--- a/examples/declarative/ui-components/main/qml/TabWidget.qml
+++ b/examples/declarative/ui-components/main/qml/main/TabWidget.qml
diff --git a/examples/declarative/ui-components/main/qml/content/ProgressBar.qml b/examples/declarative/ui-components/main/qml/main/content/ProgressBar.qml
index e92342a..e92342a 100644
--- a/examples/declarative/ui-components/main/qml/content/ProgressBar.qml
+++ b/examples/declarative/ui-components/main/qml/main/content/ProgressBar.qml
diff --git a/examples/declarative/ui-components/main/qml/content/Spinner.qml b/examples/declarative/ui-components/main/qml/main/content/Spinner.qml
index 853c787..853c787 100644
--- a/examples/declarative/ui-components/main/qml/content/Spinner.qml
+++ b/examples/declarative/ui-components/main/qml/main/content/Spinner.qml
diff --git a/examples/declarative/ui-components/main/qml/content/background.png b/examples/declarative/ui-components/main/qml/main/content/background.png
index 9044226..9044226 100644
--- a/examples/declarative/ui-components/main/qml/content/background.png
+++ b/examples/declarative/ui-components/main/qml/main/content/background.png
Binary files differ
diff --git a/examples/declarative/ui-components/main/qml/content/spinner-bg.png b/examples/declarative/ui-components/main/qml/main/content/spinner-bg.png
index b3556f1..b3556f1 100644
--- a/examples/declarative/ui-components/main/qml/content/spinner-bg.png
+++ b/examples/declarative/ui-components/main/qml/main/content/spinner-bg.png
Binary files differ
diff --git a/examples/declarative/ui-components/main/qml/content/spinner-select.png b/examples/declarative/ui-components/main/qml/main/content/spinner-select.png
index 95a17a1..95a17a1 100644
--- a/examples/declarative/ui-components/main/qml/content/spinner-select.png
+++ b/examples/declarative/ui-components/main/qml/main/content/spinner-select.png
Binary files differ
diff --git a/examples/declarative/ui-components/main/qml/images/clear.png b/examples/declarative/ui-components/main/qml/main/images/clear.png
index 91eb270..91eb270 100644
--- a/examples/declarative/ui-components/main/qml/images/clear.png
+++ b/examples/declarative/ui-components/main/qml/main/images/clear.png
Binary files differ
diff --git a/examples/declarative/ui-components/main/qml/images/lineedit-bg-focus.png b/examples/declarative/ui-components/main/qml/main/images/lineedit-bg-focus.png
index bbfac38..bbfac38 100644
--- a/examples/declarative/ui-components/main/qml/images/lineedit-bg-focus.png
+++ b/examples/declarative/ui-components/main/qml/main/images/lineedit-bg-focus.png
Binary files differ
diff --git a/examples/declarative/ui-components/main/qml/images/lineedit-bg.png b/examples/declarative/ui-components/main/qml/main/images/lineedit-bg.png
index 9044226..9044226 100644
--- a/examples/declarative/ui-components/main/qml/images/lineedit-bg.png
+++ b/examples/declarative/ui-components/main/qml/main/images/lineedit-bg.png
Binary files differ
diff --git a/examples/declarative/ui-components/main/qml/main.qml b/examples/declarative/ui-components/main/qml/main/main.qml
index 842ef1a..842ef1a 100644
--- a/examples/declarative/ui-components/main/qml/main.qml
+++ b/examples/declarative/ui-components/main/qml/main/main.qml
diff --git a/examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg b/examples/declarative/ui-components/main/qml/main/pics/niagara_falls.jpg
index d255543..d255543 100644
--- a/examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg
+++ b/examples/declarative/ui-components/main/qml/main/pics/niagara_falls.jpg
Binary files differ
diff --git a/examples/declarative/ui-components/main/qml/tab.png b/examples/declarative/ui-components/main/qml/main/tab.png
index ad80216..ad80216 100644
--- a/examples/declarative/ui-components/main/qml/tab.png
+++ b/examples/declarative/ui-components/main/qml/main/tab.png
Binary files differ
diff --git a/examples/declarative/ui-components/main/qml/progressbar.qmlproject b/examples/declarative/ui-components/main/qml/progressbar.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/ui-components/main/qml/progressbar.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
- /* Include .qml, .js, and image files from current directory and subdirectories */
- QmlFiles {
- directory: "."
- }
- JavaScriptFiles {
- directory: "."
- }
- ImageFiles {
- directory: "."
- }
- /* List of plugin directories passed to QML runtime */
- // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/ui-components/main/qml/scrollbar.qmlproject b/examples/declarative/ui-components/main/qml/scrollbar.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/ui-components/main/qml/scrollbar.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
- /* Include .qml, .js, and image files from current directory and subdirectories */
- QmlFiles {
- directory: "."
- }
- JavaScriptFiles {
- directory: "."
- }
- ImageFiles {
- directory: "."
- }
- /* List of plugin directories passed to QML runtime */
- // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/ui-components/main/qml/searchbox.qmlproject b/examples/declarative/ui-components/main/qml/searchbox.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/ui-components/main/qml/searchbox.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
- /* Include .qml, .js, and image files from current directory and subdirectories */
- QmlFiles {
- directory: "."
- }
- JavaScriptFiles {
- directory: "."
- }
- ImageFiles {
- directory: "."
- }
- /* List of plugin directories passed to QML runtime */
- // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/ui-components/main/qml/spinner.qmlproject b/examples/declarative/ui-components/main/qml/spinner.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/ui-components/main/qml/spinner.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
- /* Include .qml, .js, and image files from current directory and subdirectories */
- QmlFiles {
- directory: "."
- }
- JavaScriptFiles {
- directory: "."
- }
- ImageFiles {
- directory: "."
- }
- /* List of plugin directories passed to QML runtime */
- // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/ui-components/main/qml/tabwidget.qmlproject b/examples/declarative/ui-components/main/qml/tabwidget.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/ui-components/main/qml/tabwidget.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
- /* Include .qml, .js, and image files from current directory and subdirectories */
- QmlFiles {
- directory: "."
- }
- JavaScriptFiles {
- directory: "."
- }
- ImageFiles {
- directory: "."
- }
- /* List of plugin directories passed to QML runtime */
- // importPaths: [ " ../exampleplugin " ]
-}