diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-27 10:58:56 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-27 10:58:56 +0100 |
| commit | 9df70b0304fa44d2f1b1504d7e58d718eab4343a (patch) | |
| tree | 95a7b207a39c2b44bd4e80bcc1ea3d36bedd9a99 /tests/auto/qml/qqmlmoduleplugin/data/importsNested.3.qml | |
| parent | 648d4ae6a3591e916f175e32c12a2ea4f8edb6a9 (diff) | |
| parent | 900e3d4ad5f2bc4994ddf164c15c641f85630b81 (diff) | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: I10d4f9e993d23750a6e8ddc1291b79e47fc83c64
Diffstat (limited to 'tests/auto/qml/qqmlmoduleplugin/data/importsNested.3.qml')
| -rw-r--r-- | tests/auto/qml/qqmlmoduleplugin/data/importsNested.3.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlmoduleplugin/data/importsNested.3.qml b/tests/auto/qml/qqmlmoduleplugin/data/importsNested.3.qml index 69c6a34f46..b3dbf1741e 100644 --- a/tests/auto/qml/qqmlmoduleplugin/data/importsNested.3.qml +++ b/tests/auto/qml/qqmlmoduleplugin/data/importsNested.3.qml @@ -1,4 +1,4 @@ -import com.nokia.AutoTestQmlNestedPluginType 1.0 +import org.qtproject.AutoTestQmlNestedPluginType 1.0 MyNestedPluginType { } |