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: (22 commits)
  Fix compilation of qegl.cpp after the last merge
  Fix a race condition with QtDBus blocking for replies.
  QtDBus: Debug message update
  Removed DEPLOYMENT from demos/spectrum/spectrum.pro
  Install source for spectrum demo
  Fixed path for copying launcher script for spectrum demo
  My 4.6.3 changes.
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecee9d7244ce4f7e7acf723bcef535532780db5f )
  Fixed an assert in QMenu
  Backport multitouch bug fixes to 4.6
  tst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64
  Call eglTerminate() when the last QEglContext is destroyed to free mem.
  Removed double EINTR loop from nativeWrite and nativeRead.
  Fixed qsslkey test deployment for Symbian and fixed compiler warnings.
  Fixing the race condition in event dispatcher implementation on
  changes-4.6.3 updated
  Fixing the compile issue.
  Fixing the compile issue.
  Typo.
  Removed nearest test from  qaudiodeviceinfo unit test.
  ...

3 files changed, 19 insertions, 14 deletions

diff --git a/demos/spectrum/3rdparty/fftreal/fftreal.pro b/demos/spectrum/3rdparty/fftreal/fftreal.pro
index 4ab9652..5dd02a4 100644
--- a/demos/spectrum/3rdparty/fftreal/fftreal.pro
+++ b/demos/spectrum/3rdparty/fftreal/fftreal.pro
@@ -38,4 +38,10 @@ symbian {
     }
 } 
 
+# Install
+
+sources.files = $$SOURCES $$HEADERS fftreal.pro readme.txt license.txt
+sources.files += bwins/fftreal.def eabi/fftreal.def
+sources.path = $$[QT_INSTALL_DEMOS]/spectrum/3rdparty/fftreal
+INSTALLS += sources
 
diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro
index 8d7ce8e..92398ac 100644
--- a/demos/spectrum/app/app.pro
+++ b/demos/spectrum/app/app.pro
@@ -70,6 +70,13 @@ symbian {
     }
 }
 
+# Install
+
+sources.files = $$SOURCES $$HEADERS $$RESOURCES app.pro
+sources.path = $$[QT_INSTALL_DEMOS]/spectrum/app
+images.files += images/record.png images/settings.png
+images.path = $$[QT_INSTALL_DEMOS]/spectrum/app/images
+INSTALLS += sources images
 
 # Deployment
 
@@ -111,7 +118,7 @@ symbian {
             # the dynamic library can be located.
             copy_launch_script.target = copy_launch_script
             copy_launch_script.commands = \
-                install -m 0555 $$PWD/spectrum.sh ../bin/spectrum
+                install -m 0555 $$QT_SOURCE_TREE/demos/spectrum/app/spectrum.sh ../bin/spectrum
             QMAKE_EXTRA_TARGETS += copy_launch_script
             POST_TARGETDEPS += copy_launch_script
         }
diff --git a/demos/spectrum/spectrum.pro b/demos/spectrum/spectrum.pro
index 04bbdee..8736ba7 100644
--- a/demos/spectrum/spectrum.pro
+++ b/demos/spectrum/spectrum.pro
@@ -21,17 +21,9 @@ symbian {
 
     # UID for the SIS file
     TARGET.UID3 = 0xA000E3FA
-
-    bin.sources     = spectrum.exe
-    !contains(DEFINES, DISABLE_FFT) {
-        bin.sources += fftreal.dll
-    }
-    bin.path        = /sys/bin
-    rsc.sources     = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.rsc
-    rsc.path        = $$APP_RESOURCE_DIR
-    mif.sources     = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.mif
-    mif.path        = $$APP_RESOURCE_DIR
-    reg_rsc.sources = $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/spectrum_reg.rsc
-    reg_rsc.path    = $$REG_RESOURCE_IMPORT_DIR
-    DEPLOYMENT += bin rsc mif reg_rsc
 }
+
+sources.files = README.txt spectrum.pri spectrum.pro TODO.txt
+sources.path = $$[QT_INSTALL_DEMOS]/spectrum
+INSTALLS += sources
+