From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Mon, 27 Jun 2011 09:01:20 +0000 (+0200)
Subject: qmldump: Fix export comparison.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=cf3a3c397fb3c7e81a92d6ced4c08193c7e6d2f7;p=konrad%2Fqtdeclarative.git

qmldump: Fix export comparison.

Compare the full uri/name, not just the uri. Also
QDeclarativeType::module was not available in 4.7.3.

Mirrors http://codereview.qt.nokia.com/759

(cherry picked from commit a0bd8d2dc68fdf993821b5eb881769448b34dffd)

Change-Id: Ib66ec79b929bd29e3aa27a1b70e5a5c1ec2d51e5
Reviewed-on: http://codereview.qt.nokia.com/762
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
---

diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index 7e50118..61564d4 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -177,7 +177,7 @@ QSet<const QMetaObject *> collectReachableMetaObjects(const QString &importCode,
             foreach (const QDeclarativeType *baseExport, baseExports) {
                 bool match = false;
                 foreach (const QDeclarativeType *extensionExport, extensionExports) {
-                    if (baseExport->module() == extensionExport->module()
+                    if (baseExport->qmlTypeName() == extensionExport->qmlTypeName()
                             && baseExport->majorVersion() == extensionExport->majorVersion()
                             && baseExport->minorVersion() == extensionExport->minorVersion()) {
                         match = true;