summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-15 02:02:32 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-15 02:02:32 (GMT)
commit6ce4e6247fa6e438a34a498cd803a5542ff338b7 (patch)
tree6357c943951d56e35a6ee714d22cea88073c582d /qmake/generators
parentaad7bc4085980edf9fd6736efe909dc5a74a9d27 (diff)
parent3e4d8596edd8061a81f641df4f09d018b73c81f0 (diff)
downloadQt-6ce4e6247fa6e438a34a498cd803a5542ff338b7.zip
Qt-6ce4e6247fa6e438a34a498cd803a5542ff338b7.tar.gz
Qt-6ce4e6247fa6e438a34a498cd803a5542ff338b7.tar.bz2
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Provide overview for Symbian capabilities. Fix QNX screen initialization tst_qftp: Attempting to reproduce a crash QNAM HTTP: Do not pipeline with WebLogic servers Autotest: update path location on the test server Autotest: update location of fluke.gif on test server Make qsTr work in global scope Not possible to show selected text in virtual keyboard Fix typos, there is no QT_NO_SSL Export .flm files always if they are different Make qmake possible to build with mingw using qmake.pro QS60Style: Single Click UI support for SD 9.2 time-box
Diffstat (limited to 'qmake/generators')
-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 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()))