diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-07-18 10:39:32 (GMT) |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-30 13:08:15 (GMT) |
commit | 8530095108df75256c5fe26cb7ddaa25368b4d1a (patch) | |
tree | ccb53d6fefdfe3d6d1efb90768fe2e6da6ff5328 /examples | |
parent | 1ac65c92ff74dc90636dc5fff0d98b73b1c1ae87 (diff) | |
download | Qt-8530095108df75256c5fe26cb7ddaa25368b4d1a.zip Qt-8530095108df75256c5fe26cb7ddaa25368b4d1a.tar.gz Qt-8530095108df75256c5fe26cb7ddaa25368b4d1a.tar.bz2 |
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>
(cherry picked from qtquick1/cb9d1a61b127030562a206c0142d99997eb82c8e)
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'examples')
-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 95e0eea..2022675 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 6e2141c..6e2141c 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 7fbd802..7fbd802 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 462edac..462edac 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 f8061a1..f8061a1 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 1297ec7..1297ec7 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 e1288cf..e1288cf 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 0021ce0..d16b3a2 100644 --- a/examples/declarative/cppextensions/plugins/plugin.cpp +++ b/examples/declarative/cppextensions/plugins/plugin.cpp @@ -144,7 +144,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 6029347..0a37dd5 100644 --- a/examples/declarative/cppextensions/plugins/plugins.pro +++ b/examples/declarative/cppextensions/plugins/plugins.pro @@ -2,24 +2,24 @@ TEMPLATE = lib CONFIG += qt plugin QT += declarative -DESTDIR = com/nokia/TimeExample +DESTDIR = org/qtproject/TimeExample TARGET = qmlqtimeexampleplugin SOURCES += plugin.cpp 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 + 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/com/nokia/TimeExample +qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/org/qtproject/TimeExample sources.files += plugins.pro plugin.cpp plugins.qml README sources.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins -target.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/com/nokia/TimeExample +target.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/org/qtproject/TimeExample build_all:!build_pass { CONFIG -= build_all diff --git a/examples/declarative/cppextensions/plugins/plugins.qml b/examples/declarative/cppextensions/plugins/plugins.qml index b5401f2..b0496bf 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 |