summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-04-13 11:17:26 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-04-13 11:25:30 (GMT)
commitcbabeb657132b71b6ab5cfee18a7abace56982f3 (patch)
tree09232e614818ada7033b8316058018c3a4e6df82
parent920b5381941ca0bed603158cbab958d172623612 (diff)
downloadQt-cbabeb657132b71b6ab5cfee18a7abace56982f3.zip
Qt-cbabeb657132b71b6ab5cfee18a7abace56982f3.tar.gz
Qt-cbabeb657132b71b6ab5cfee18a7abace56982f3.tar.bz2
Export .flm files always if they are different
There are valid cases where Qt .flm files found under /epoc32/tools/makefile_templates/qt/ have newer timestamp than those in Qt repo one is developing against but still need to be overwritten, so always export .flm files when the timestamp is different instead of just when the files to be exported are newer. Task-number: QT-3253 Reviewed-by: TrustMe
-rw-r--r--qmake/generators/symbian/symmake_sbsv2.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index 1014ba2..9f3f5c3 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -75,7 +75,7 @@ void SymbianSbsv2MakefileGenerator::exportFlm()
foreach(QFileInfo item, sourceInfos) {
QFileInfo destInfo = QFileInfo(destDir.absolutePath() + "/" + item.fileName());
- if (!destInfo.exists() || destInfo.lastModified() < item.lastModified()) {
+ if (!destInfo.exists() || destInfo.lastModified() != item.lastModified()) {
if (destInfo.exists())
QFile::remove(destInfo.absoluteFilePath());
if (QFile::copy(item.absoluteFilePath(), destInfo.absoluteFilePath()))