diff options
| author | Vikas Pachdha <vikas.pachdha@theqtcompany.com> | 2016-06-23 12:39:44 +0200 |
|---|---|---|
| committer | Vikas Pachdha <vikas.pachdha@theqtcompany.com> | 2016-07-13 09:52:47 +0000 |
| commit | b023bedfb0179c4b39e04e86965b0cfc57187ec9 (patch) | |
| tree | 1e0f208f922a416a3d6fd06c67932e28bd3b1c46 /src/plugins/qmakeandroidsupport | |
| parent | 148d7636f1a7e36a9a3b1eff17ad5b94a24c78fa (diff) | |
| download | qt-creator-b023bedfb0179c4b39e04e86965b0cfc57187ec9.tar.gz | |
Fix for showInGraphicalShell. The api fails to open a dir if the path contains ..
Change-Id: If38b23563395509c61d9ec2e6b771bf4d2c54527
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/qmakeandroidsupport')
| -rw-r--r-- | src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp index 0a6920a838..ca2a665e46 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp +++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp @@ -115,7 +115,9 @@ Utils::FileName QmakeAndroidBuildApkStep::androidPackageSourceDir() const = pro->rootProjectNode()->findProFileFor(proFilePathForInputFile()); if (!node) return Utils::FileName(); - return Utils::FileName::fromString(node->singleVariableValue(QmakeProjectManager::AndroidPackageSourceDir)); + + QFileInfo sourceDirInfo(node->singleVariableValue(QmakeProjectManager::AndroidPackageSourceDir)); + return Utils::FileName::fromString(sourceDirInfo.canonicalFilePath()); } void QmakeAndroidBuildApkStep::ctor() |