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: (46 commits)
  Fix the license info for bin/elf2e32_qtwrapper.pl.
  Avoid panics in QDesktopWidget on Symbian emulator.
  QS60Style: use placeholder texture when polishing widgets and palette
  Regression: QS60Style: Theme background is incorrect
  Remove changes from fix to QTBUG-17045 that were not related to the fix
  Prevent null pointer crash when closing splitview
  QS60Style slows down layout switch by updating widgets unnecessarily
  Fix qgraphicstransform autotest for Symbian, where qreal is float.
  Removed reference to nonexistant profile.
  Disable capabilities example for symbian-gcce due to a bug in elf2e32
  Readded a ';;' that was removed by mistake.
  Fixed mkspec detection for Symbian.
  Removed javascript-jit from default symbian-gcce build.
  Corrected a mismerge in GCCE link parameters.
  Fixed incorrect referral to an include file.
  Fixed win32-msvc2008 build regression.
  Made qmake strip trailing \ from libdirs.
  Fixed GCCE libdir handling if the paths have spaces in them.
  Added MinGW support for adding lib prefix and extension via profile.
  Added support for various special compiler/linker flags on MinGW.
  ...

1 files changed, 14 insertions, 2 deletions

diff --git a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri
index 494c64c..b7a87f3 100644
--- a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri
+++ b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri
@@ -1,6 +1,12 @@
 # We just want to include the sqlite3 binaries for Symbian for platforms that do not have them.
 !symbian-abld:!symbian-sbsv2 {
     !symbian_no_export_sqlite:!exists($${EPOCROOT}epoc32/release/armv5/lib/sqlite3.dso) {
+        contains(QMAKE_HOST.os,Windows) {
+            # Trick on Windows to do a touch on the file, since copy keeps the timestamp.
+            copyWithTouch = copy /y /b NUL+
+        } else {
+            copyWithTouch = "$$QMAKE_COPY "
+        }
         symbian_sqlite3_zip_file = $$PWD/SQLite3_v9.2.zip
 
         # The QMAKE_COPY section is to update timestamp on the file.
@@ -10,7 +16,7 @@
         symbian_sqlite3_header.CONFIG = combine no_link
         symbian_sqlite3_header.dependency_type = TYPE_C
         symbian_sqlite3_header.commands = $$QMAKE_UNZIP -j ${QMAKE_FILE_NAME} epoc32/include/stdapis/${QMAKE_FILE_OUT_BASE}.h \
-                                          && $$QMAKE_COPY ${QMAKE_FILE_OUT_BASE}.h ${QMAKE_FILE_OUT}.tmp \
+                                          && $${copyWithTouch}${QMAKE_FILE_OUT_BASE}.h ${QMAKE_FILE_OUT}.tmp \
                                           && $$QMAKE_DEL_FILE ${QMAKE_FILE_OUT_BASE}.h \
                                           && $$QMAKE_MOVE ${QMAKE_FILE_OUT}.tmp ${QMAKE_FILE_OUT}
         silent:symbian_sqlite3_header.commands = @echo unzipping $@ && $$symbian_sqlite3_header.commands
@@ -22,12 +28,18 @@
         !isEmpty(OBJECTS_DIR):symbian_sqlite3_dso.output = $$OBJECTS_DIR/$$symbian_sqlite3_dso.output
         symbian_sqlite3_dso.CONFIG = combine no_link target_predeps
         symbian_sqlite3_dso.commands = $$QMAKE_UNZIP -j ${QMAKE_FILE_NAME} epoc32/release/armv5/lib/${QMAKE_FILE_OUT_BASE}.dso \
-                                       && $$QMAKE_COPY ${QMAKE_FILE_OUT_BASE}.dso ${QMAKE_FILE_OUT}.tmp \
+                                       && $${copyWithTouch}${QMAKE_FILE_OUT_BASE}.dso ${QMAKE_FILE_OUT}.tmp \
                                        && $$QMAKE_DEL_FILE ${QMAKE_FILE_OUT_BASE}.dso \
                                        && $$QMAKE_MOVE ${QMAKE_FILE_OUT}.tmp ${QMAKE_FILE_OUT}
         silent:symbian_sqlite3_dso.commands = @echo unzipping $@ && $$symbian_sqlite3_dso.commands
         QMAKE_EXTRA_COMPILERS += symbian_sqlite3_dso
 
+        # Workaround for the fact that make doesn't understand that sqlite3.dso
+        # is the same as $OBJECTS_DIR/sqlite3.dso
+        symbian_sqlite3_dso_standalone.target = sqlite3.dso
+        symbian_sqlite3_dso_standalone.depends = $$symbian_sqlite3_dso.output
+        QMAKE_EXTRA_TARGETS += symbian_sqlite3_dso_standalone
+
         symbian_sqlite3_ver_dso.input = symbian_sqlite3_zip_file
         symbian_sqlite3_ver_dso.output = sqlite3{00060003}.dso
         !isEmpty(OBJECTS_DIR):symbian_sqlite3_ver_dso.output = $$OBJECTS_DIR/$$symbian_sqlite3_ver_dso.output