diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-14 08:14:40 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-14 08:14:40 (GMT) |
| commit | 62cd360b3f2ef9e9787359a9105fd805b721b49f (patch) | |
| tree | 8bb7dd87f0914d59d94d688c32e9244ebb79cbad /qmake/generators/symbian/symmake_sbsv2.cpp | |
| parent | 4af9cc043370846c52ec21cf874696ee650394c1 (diff) | |
| parent | 0dbd8f1b0a6df20e5502bb35e58490a9f99953a7 (diff) | |
| download | Qt-62cd360b3f2ef9e9787359a9105fd805b721b49f.zip Qt-62cd360b3f2ef9e9787359a9105fd805b721b49f.tar.gz Qt-62cd360b3f2ef9e9787359a9105fd805b721b49f.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/script/api/qscriptengine.cpp
Diffstat (limited to 'qmake/generators/symbian/symmake_sbsv2.cpp')
| -rw-r--r-- | qmake/generators/symbian/symmake_sbsv2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp index c817056..3a6706a 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())) |