diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-07-18 12:39:32 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-18 14:56:27 +0200 |
commit | cb9d1a61b127030562a206c0142d99997eb82c8e (patch) | |
tree | 49cb020d9083f4127bb09c4a2d543e12266f5b06 | |
parent | 1f3d0ae63b2501460fc1c75f22b579b29147a80d (diff) |
Change domain used in cpp-extensions-example.
Task-number: QTBUG-32390
Change-Id: I373183e096390bd1564c2d263190fb9063a733a2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
-rw-r--r-- | examples/declarative/cppextensions/plugins/README | 2 | ||||
-rw-r--r-- | examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/Clock.qml (renamed from examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/center.png (renamed from examples/declarative/cppextensions/plugins/com/nokia/TimeExample/center.png) | bin | 765 -> 765 bytes | |||
-rw-r--r-- | examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/clock.png (renamed from examples/declarative/cppextensions/plugins/com/nokia/TimeExample/clock.png) | bin | 20653 -> 20653 bytes | |||
-rw-r--r-- | examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/hour.png (renamed from examples/declarative/cppextensions/plugins/com/nokia/TimeExample/hour.png) | bin | 625 -> 625 bytes | |||
-rw-r--r-- | examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/minute.png (renamed from examples/declarative/cppextensions/plugins/com/nokia/TimeExample/minute.png) | bin | 625 -> 625 bytes | |||
-rw-r--r-- | examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/qmldir (renamed from examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/cppextensions/plugins/plugin.cpp | 2 | ||||
-rw-r--r-- | examples/declarative/cppextensions/plugins/plugins.pro | 18 | ||||
-rw-r--r-- | examples/declarative/cppextensions/plugins/plugins.qml | 4 |
10 files changed, 13 insertions, 13 deletions
diff --git a/examples/declarative/cppextensions/plugins/README b/examples/declarative/cppextensions/plugins/README index 95e0eea8..20226750 100644 --- a/examples/declarative/cppextensions/plugins/README +++ b/examples/declarative/cppextensions/plugins/README @@ -1,4 +1,4 @@ -This example shows a module "com.nokia.TimeExample" that is implemented +This example shows a module "org.qtproject.TimeExample" that is implemented by a C++ plugin (providing the "Time" type), and by QML files (providing the "Clock" type). diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml b/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/Clock.qml index 6e2141c3..6e2141c3 100644 --- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml +++ b/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/Clock.qml diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/center.png b/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/center.png Binary files differindex 7fbd802a..7fbd802a 100644 --- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/center.png +++ b/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/center.png diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/clock.png b/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/clock.png Binary files differindex 462edacc..462edacc 100644 --- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/clock.png +++ b/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/clock.png diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/hour.png b/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/hour.png Binary files differindex f8061a12..f8061a12 100644 --- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/hour.png +++ b/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/hour.png diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/minute.png b/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/minute.png Binary files differindex 1297ec7c..1297ec7c 100644 --- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/minute.png +++ b/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/minute.png diff --git a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir b/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/qmldir index e1288cfa..e1288cfa 100644 --- a/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir +++ b/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/qmldir diff --git a/examples/declarative/cppextensions/plugins/plugin.cpp b/examples/declarative/cppextensions/plugins/plugin.cpp index e93e4629..81c9ce61 100644 --- a/examples/declarative/cppextensions/plugins/plugin.cpp +++ b/examples/declarative/cppextensions/plugins/plugin.cpp @@ -146,7 +146,7 @@ class QExampleQmlPlugin : public QDeclarativeExtensionPlugin public: void registerTypes(const char *uri) { - Q_ASSERT(uri == QLatin1String("com.nokia.TimeExample")); + Q_ASSERT(uri == QLatin1String("org.qtproject.TimeExample")); qmlRegisterType<TimeModel>(uri, 1, 0, "Time"); } }; diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro index 476a58e6..dddbd492 100644 --- a/examples/declarative/cppextensions/plugins/plugins.pro +++ b/examples/declarative/cppextensions/plugins/plugins.pro @@ -2,21 +2,21 @@ TEMPLATE = lib CONFIG += plugin QT += widgets declarative -DESTDIR = com/nokia/TimeExample +DESTDIR = org/qtproject/TimeExample TARGET = qmlqtimeexampleplugin SOURCES += plugin.cpp -target.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/com/nokia/TimeExample +target.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/org/qtproject/TimeExample qdeclarativesources.files += \ - com/nokia/TimeExample/qmldir \ - com/nokia/TimeExample/center.png \ - com/nokia/TimeExample/clock.png \ - com/nokia/TimeExample/Clock.qml \ - com/nokia/TimeExample/hour.png \ - com/nokia/TimeExample/minute.png -qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/com/nokia/TimeExample + org/qtproject/TimeExample/qmldir \ + org/qtproject/TimeExample/center.png \ + org/qtproject/TimeExample/clock.png \ + org/qtproject/TimeExample/Clock.qml \ + org/qtproject/TimeExample/hour.png \ + org/qtproject/TimeExample/minute.png +qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/org/qtproject/TimeExample qml.files += plugins.qml qml.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins diff --git a/examples/declarative/cppextensions/plugins/plugins.qml b/examples/declarative/cppextensions/plugins/plugins.qml index b5401f29..e9859a02 100644 --- a/examples/declarative/cppextensions/plugins/plugins.qml +++ b/examples/declarative/cppextensions/plugins/plugins.qml @@ -38,9 +38,9 @@ ** ****************************************************************************/ //![0] -import com.nokia.TimeExample 1.0 // import types from the plugin +import org.qtproject.TimeExample 1.0 // import types from the plugin -Clock { // this class is defined in QML (com/nokia/TimeExample/Clock.qml) +Clock { // this class is defined in QML (org.qtproject.TimeExample/Clock.qml) Time { // this class is defined in C++ (plugin.cpp) id: time |