diff options
| author | Sinan Tanilkan <sinan.tanilkan@nokia.com> | 2011-09-21 11:45:02 (GMT) |
|---|---|---|
| committer | Sinan Tanilkan <sinan.tanilkan@nokia.com> | 2011-09-21 11:45:02 (GMT) |
| commit | 160b82950ec53d3a0392df0fd18ac6856bfecbcf (patch) | |
| tree | 1bdae6efe3fbcb7f25e0ce91884f83e1cdf68189 /tools/macdeployqt | |
| parent | 8ba781b01e900148fec2e9d26485369b3295487f (diff) | |
| parent | 085bd7cf2d76f9acd548120f859201b014970a72 (diff) | |
| download | Qt-160b82950ec53d3a0392df0fd18ac6856bfecbcf.zip Qt-160b82950ec53d3a0392df0fd18ac6856bfecbcf.tar.gz Qt-160b82950ec53d3a0392df0fd18ac6856bfecbcf.tar.bz2 | |
Merge branch '4.8' into earth-staging-master
Conflicts:
dist/changes-4.8.0
Diffstat (limited to 'tools/macdeployqt')
| -rw-r--r-- | tools/macdeployqt/shared/shared.cpp | 2 | ||||
| -rw-r--r-- | tools/macdeployqt/tests/tst_deployment_mac.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/macdeployqt/shared/shared.cpp b/tools/macdeployqt/shared/shared.cpp index 1a9a6ab..156f1de 100644 --- a/tools/macdeployqt/shared/shared.cpp +++ b/tools/macdeployqt/shared/shared.cpp @@ -127,7 +127,7 @@ FrameworkInfo parseOtoolLibraryLine(const QString &line, bool useDebugLibs) while (part < parts.count()) { const QString currentPart = parts.at(part).simplified() ; ++part; - if (currentPart == "") + if (currentPart.isEmpty()) continue; if (state == QtPath) { diff --git a/tools/macdeployqt/tests/tst_deployment_mac.cpp b/tools/macdeployqt/tests/tst_deployment_mac.cpp index 858dc45..5921199 100644 --- a/tools/macdeployqt/tests/tst_deployment_mac.cpp +++ b/tools/macdeployqt/tests/tst_deployment_mac.cpp @@ -230,4 +230,4 @@ void tst_deployment_mac::testFindAppBinarty() QTEST_MAIN(tst_deployment_mac) -#include "tst_deployment_mac.moc"
\ No newline at end of file +#include "tst_deployment_mac.moc" |