summaryrefslogtreecommitdiffstats
path: root/tools/macdeployqt/shared
diff options
context:
space:
mode:
authorJesper Thomschütz <jesper@trolltech.com>2009-05-14 13:48:31 (GMT)
committerJesper Thomschütz <jesper@trolltech.com>2009-05-14 13:55:14 (GMT)
commit8e9b041f0081cd5af67c5c5f3cee0cf2b70ffe11 (patch)
treefeed93dc8771667dd2f9ef73fd18c53426e50f17 /tools/macdeployqt/shared
parentf09304d46bac91f3e8329cb7147f8df44898d1e0 (diff)
downloadQt-8e9b041f0081cd5af67c5c5f3cee0cf2b70ffe11.zip
Qt-8e9b041f0081cd5af67c5c5f3cee0cf2b70ffe11.tar.gz
Qt-8e9b041f0081cd5af67c5c5f3cee0cf2b70ffe11.tar.bz2
Use isNull() for strings instead of comparing against QString().
foo == QString() should be foo.isNull(). Fixes 7 warnings in the Norwegian Breakfast Network Reviewed-by: Samuel
Diffstat (limited to 'tools/macdeployqt/shared')
-rw-r--r--tools/macdeployqt/shared/shared.cpp4
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);