aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorChris Adams <christopher.adams@nokia.com>2012-08-06 12:15:32 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-08 13:50:40 +0200
commit4a8a8953f70197a7ab7a62fcd01b1bc08051689e (patch)
tree037e78c35f675e8d5b7bc00f26d8d984387eda86 /examples
parent3b0aa0d8048ffa0bb75bb7b29c903e4499c796a8 (diff)
Update imports and module documentation
Recently, the qmldir syntax was modified to allow a module identifier directive to be specified. This allows us to guarantee that types provided in that namespace are not overridden by other modules. Given this fundamental change, the documentation needed to be updated to reflect the new terminology surrounding imports: - modules - identified vs legacy - directories - local and remote directory imports - JavaScript resources - scripts which can be imported directly Change-Id: I5a3d38de93d0186e79b87f2b3050f2b802088348 Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/tutorials/extending/chapter6-plugins/Charts/qmldir2
-rw-r--r--examples/tutorials/extending/chapter6-plugins/ChartsPlugin/qmldir1
-rw-r--r--examples/tutorials/extending/chapter6-plugins/app.qml2
-rw-r--r--examples/tutorials/extending/chapter6-plugins/chapter6-plugins.pro2
4 files changed, 4 insertions, 3 deletions
diff --git a/examples/tutorials/extending/chapter6-plugins/Charts/qmldir b/examples/tutorials/extending/chapter6-plugins/Charts/qmldir
new file mode 100644
index 0000000000..d9e8471b3c
--- /dev/null
+++ b/examples/tutorials/extending/chapter6-plugins/Charts/qmldir
@@ -0,0 +1,2 @@
+module Charts
+plugin chartsplugin
diff --git a/examples/tutorials/extending/chapter6-plugins/ChartsPlugin/qmldir b/examples/tutorials/extending/chapter6-plugins/ChartsPlugin/qmldir
deleted file mode 100644
index 72650d8243..0000000000
--- a/examples/tutorials/extending/chapter6-plugins/ChartsPlugin/qmldir
+++ /dev/null
@@ -1 +0,0 @@
-plugin chartsplugin \ No newline at end of file
diff --git a/examples/tutorials/extending/chapter6-plugins/app.qml b/examples/tutorials/extending/chapter6-plugins/app.qml
index b6eac44e27..09931e02b5 100644
--- a/examples/tutorials/extending/chapter6-plugins/app.qml
+++ b/examples/tutorials/extending/chapter6-plugins/app.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.0
-import "ChartsPlugin" 1.0
+import Charts 1.0
Item {
width: 300; height: 200
diff --git a/examples/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
index 75f88b2eaa..c84b6fe7ff 100644
--- a/examples/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
+++ b/examples/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
@@ -2,7 +2,7 @@ TEMPLATE = lib
CONFIG += qt plugin
QT += qml quick
-DESTDIR = ChartsPlugin
+DESTDIR = Charts
TARGET = chartsplugin
OBJECTS_DIR = tmp