diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-16 15:22:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-16 15:22:54 (GMT) |
| commit | 6ddda99db20203917229e399c4b8d333a119c3d6 (patch) | |
| tree | c5293f9229b1f4d9fb4a5a5cf979f38fd54795ce /qmake/generators/symbian | |
| parent | 7e395e4f5a89dd43d1b7b88f12e0fa4107756d54 (diff) | |
| parent | 7cfc9f2245162944f3d9a29ad73cd93e2bcf197f (diff) | |
| download | Qt-6ddda99db20203917229e399c4b8d333a119c3d6.zip Qt-6ddda99db20203917229e399c4b8d333a119c3d6.tar.gz Qt-6ddda99db20203917229e399c4b8d333a119c3d6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QProcessManager destruction
Fix "installer_sis" and "deploy" targets when TARGET has path
Fix for memory leak in qt_init
Fix check to remove unnecessary deployments in Symbian
Diffstat (limited to 'qmake/generators/symbian')
| -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(); } } |