Changed the plugin module name

The earlier name, com.nokia.TimeExample is irrelevant now.
Also updated all instances of documentation where this older module
name was referred.

Change-Id: Ic252d0e72af23c2d39d5fed55f242e47c1b6bde9
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

3 files changed, 14 insertions, 14 deletions

diff --git a/src/qml/doc/snippets/qml/imports/timeexample.qml b/src/qml/doc/snippets/qml/imports/timeexample.qml
index f9c2411d02..97668452c0 100644
--- a/src/qml/doc/snippets/qml/imports/timeexample.qml
+++ b/src/qml/doc/snippets/qml/imports/timeexample.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 //! [import]
-import com.nokia.TimeExample 1.0
+import TimeExample 1.0
 //! [import]
 
 Item {
diff --git a/src/qml/doc/src/modules/cppplugins.qdoc b/src/qml/doc/src/modules/cppplugins.qdoc
index 31ff02c2f4..2a08d732c0 100644
--- a/src/qml/doc/src/modules/cppplugins.qdoc
+++ b/src/qml/doc/src/modules/cppplugins.qdoc
@@ -87,12 +87,12 @@
     types into the runtime.
 
     For this example, the TimeExample source directory is in
-    \c{com/nokia/TimeExample}.  The plugin's type namespace will mirror
+    \c{imports/TimeExample}.  The plugin's type namespace will mirror
     this structure, so the types are registered into the namespace
-    "com.nokia.TimeExample".
+    "TimeExample".
 
     Additionally, the project file, in a \c .pro file, defines the project as a plugin library,
-    specifies it should be built into the \c com/nokia/TimeExample directory, and registers
+    specifies it should be built into the \c imports/TimeExample directory, and registers
     the plugin target name and various other details:
 
     \code
@@ -100,21 +100,21 @@
     CONFIG += qt plugin
     QT += qml
 
-    DESTDIR = com/nokia/TimeExample
+    DESTDIR = imports/TimeExample
     TARGET = qmlqtimeexampleplugin
     SOURCES += qexampleqmlplugin.cpp
     \endcode
 
     Finally, a \l{Module Definition qmldir Files}{qmldir file} is required
-    in the \c com/nokia/TimeExample directory to describe the plugin and the types that it
+    in the \c imports/TimeExample directory to describe the plugin and the types that it
     exports. The plugin includes a \c Clock.qml file along with the \c qmlqtimeexampleplugin
     that is built by the project (as shown above in the \c .pro file) so both of these
     need to be specified in the \c qmldir file:
 
-    \quotefile examples/qml/plugins/com/nokia/TimeExample/qmldir
+    \quotefile examples/qml/plugins/imports/TimeExample/qmldir
 
     Once the project is built and installed, the new \c Time component is
-    accessible by any QML component that imports the \c com.nokia.TimeExample
+    accessible by any QML component that imports the \c TimeExample
     module
 
     \snippet examples/qml/plugins/plugins.qml 0
diff --git a/src/qml/qml/qqmlextensionplugin.cpp b/src/qml/qml/qqmlextensionplugin.cpp
index 36abc3a9e4..2f0e804019 100644
--- a/src/qml/qml/qqmlextensionplugin.cpp
+++ b/src/qml/qml/qqmlextensionplugin.cpp
@@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE
 
     To make this class available as a QML type, create a plugin that registers
     this type with a specific \l {QML Modules}{module} using qmlRegisterType(). For this example the plugin
-    module will be named \c com.nokia.TimeExample (as defined in the project
+    module will be named \c TimeExample (as defined in the project
     file further below).
 
     \snippet examples/qml/plugins/plugin.cpp plugin
@@ -93,27 +93,27 @@ QT_BEGIN_NAMESPACE
     ensures the module is imported correctly by any QML components that use this plugin.
 
     The project file defines the project as a plugin library and specifies 
-    it should be built into the \c com/nokia/TimeExample directory:
+    it should be built into the \c imports/TimeExample directory:
 
     \code
     TEMPLATE = lib
     CONFIG += qt plugin
     QT += qml
 
-    DESTDIR = com/nokia/TimeExample
+    DESTDIR = imports/TimeExample
     TARGET = qmlqtimeexampleplugin
     ...
     \endcode    
 
-    Finally, a \l{Module Definition qmldir Files}{qmldir file} is required in the \c com/nokia/TimeExample directory
+    Finally, a \l{Module Definition qmldir Files}{qmldir file} is required in the \c imports/TimeExample directory
     that describes the plugin. This directory includes a \c Clock.qml file that
     should be bundled with the plugin, so it needs to be specified in the \c qmldir
     file:
 
-    \quotefile examples/qml/plugins/com/nokia/TimeExample/qmldir
+    \quotefile examples/qml/plugins/imports/TimeExample/qmldir
 
     Once the project is built and installed, the new \c Time element can be 
-    used by any QML component that imports the \c com.nokia.TimeExample module:
+    used by any QML component that imports the \c TimeExample module:
 
     \snippet examples/qml/plugins/plugins.qml 0