diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-08-13 10:25:46 (GMT) |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-08-13 11:53:03 (GMT) |
commit | 448a8603bb0609bf880a2c1b92b26c2005e1cf63 (patch) | |
tree | 07a48d4b868ddd2fce0e2b569145a040d6cba534 /qmake | |
parent | ee62807198a2525577c14f718b98d07ae0ec7bec (diff) | |
download | Qt-448a8603bb0609bf880a2c1b92b26c2005e1cf63.zip Qt-448a8603bb0609bf880a2c1b92b26c2005e1cf63.tar.gz Qt-448a8603bb0609bf880a2c1b92b26c2005e1cf63.tar.bz2 |
Fix check to remove unnecessary deployments in Symbian
Previously check to remove files from deployment in case the deployment
target location was the same as the source location was done using
QFileInfo equality, which resolved to true when file didn't yet exist
at the time qmake was run. Changed the check to compare absolute paths
instead.
Task-number: QTBUG-12879
Reviewed-by: Shane Kearns
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/symbian/initprojectdeploy_symbian.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp index 382e012..776a646 100644 --- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp +++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp @@ -353,7 +353,11 @@ void initProjectDeploySymbian(QMakeProject* project, CopyItem &item = i.next(); QFileInfo fromItem(item.from); QFileInfo toItem(item.to); - if (fromItem == toItem) +#if defined(Q_OS_WIN) + if (0 == fromItem.absoluteFilePath().compare(toItem.absoluteFilePath(), Qt::CaseInsensitive)) +#else + if (0 == fromItem.absoluteFilePath().compare(toItem.absoluteFilePath())) +#endif i.remove(); } } |