diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-05-19 13:07:18 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-05-19 13:07:18 (GMT) |
| commit | d7fda9c7aef17ed79fd656f197fb179acb4ec54a (patch) | |
| tree | 10d34a0e1159597c954c0446f028beaa0dd20394 /tools/macdeployqt/shared/shared.cpp | |
| parent | ae85bab1ec5d66d4bfb628da4f0e5514dc85f5a5 (diff) | |
| parent | 16887d14b975c4740f037366dc7e45d59731fb47 (diff) | |
| download | Qt-d7fda9c7aef17ed79fd656f197fb179acb4ec54a.zip Qt-d7fda9c7aef17ed79fd656f197fb179acb4ec54a.tar.gz Qt-d7fda9c7aef17ed79fd656f197fb179acb4ec54a.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'tools/macdeployqt/shared/shared.cpp')
| -rw-r--r-- | tools/macdeployqt/shared/shared.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/macdeployqt/shared/shared.cpp b/tools/macdeployqt/shared/shared.cpp index db76ef2..1faa63a 100644 --- a/tools/macdeployqt/shared/shared.cpp +++ b/tools/macdeployqt/shared/shared.cpp @@ -343,7 +343,7 @@ DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks, const QString copiedFrameworks.append(framework.frameworkName); // Get the qt path from one of the Qt frameworks; - if (deploymenInfo.qtPath == QString() && framework.frameworkName.contains("Qt") + if (deploymenInfo.qtPath.isNull() && framework.frameworkName.contains("Qt") && framework.frameworkDirectory.contains("/lib")) { deploymenInfo.qtPath = framework.frameworkDirectory; @@ -364,7 +364,7 @@ DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks, const QString // Copy farmework to app bundle. const QString deployedBinaryPath = copyFramework(framework, bundlePath); // Skip the rest if already was deployed. - if (deployedBinaryPath == QString()) + if (deployedBinaryPath.isNull()) continue; runStrip(deployedBinaryPath); |