From 4a8a8953f70197a7ab7a62fcd01b1bc08051689e Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Mon, 6 Aug 2012 12:15:32 +1000 Subject: 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 --- examples/tutorials/extending/chapter6-plugins/Charts/qmldir | 2 ++ examples/tutorials/extending/chapter6-plugins/ChartsPlugin/qmldir | 1 - examples/tutorials/extending/chapter6-plugins/app.qml | 2 +- examples/tutorials/extending/chapter6-plugins/chapter6-plugins.pro | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 examples/tutorials/extending/chapter6-plugins/Charts/qmldir delete mode 100644 examples/tutorials/extending/chapter6-plugins/ChartsPlugin/qmldir (limited to 'examples') 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 -- cgit v1.2.3