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: (203 commits)
  Fix compilation of OpenVG.
  Fixed wrong qmake logic for Symbian.
  Fixed a bug where a proxy widget received FocusIn over and over.
  Fixed broken test.
  Fixed recursive QMAKE_EXTRA_TARGETS for symbian makefiles.
  Fix dependency so it works also on massive parrallel systems
  Set PM_MenuScrollerHeight to zero
  Change QS60Style to use combobox popup menu
  This should likely get webkit linking again on windows/sbsv2
  Handle Symbian's file name encoding, correctly.
  Fix linking issues of QtOpenVG.dll
  Fixed Symbian applications with DESTDIR set.
  Removed a warning about generated rss files.
  Revert "Temporarily disable problematic dll."
  Fixed "Cannot install protected application" message on Symbian.
  Worked around a crash in the elf2e32 postlinker tool.
  Worked around case differences in Symbian^3 and Gnupoc.
  Enabled compilation of plugins again.
  Make sure target path exists in qmake_extra_pre_targetdep.flm
  Added close button to Anomaly demo browser
  ...

1 files changed, 13 insertions, 11 deletions

diff --git a/mkspecs/features/symbian/moc.prf b/mkspecs/features/symbian/moc.prf
index 9c21ed7..29e0d8d 100644
--- a/mkspecs/features/symbian/moc.prf
+++ b/mkspecs/features/symbian/moc.prf
@@ -1,16 +1,18 @@
 load(moc)
 
-RET = $$find(MOC_DIR, "(/|^)\.[^/]+/?$")
-!isEmpty(RET):{
-    error("Symbian does not support directories starting with a dot. Please set MOC_DIR to a different value in your profile. MOC_DIR: $$MOC_DIR")
-}
+symbian-abld|symbian-sbsv2 {
+    RET = $$find(MOC_DIR, "(/|^)\.[^/]+/?$")
+    !isEmpty(RET):{
+        error("Symbian does not support directories starting with a dot. Please set MOC_DIR to a different value in your profile. MOC_DIR: $$MOC_DIR")
+    }
 
-RET = $$find(RCC_DIR, "(/|^)\.[^/]+/?$")
-!isEmpty(RET):{
-    error("Symbian does not support directories starting with a dot. Please set RCC_DIR to a different value in your profile. RCC_DIR: $$RCC_DIR")
-}
+    RET = $$find(RCC_DIR, "(/|^)\.[^/]+/?$")
+    !isEmpty(RET):{
+        error("Symbian does not support directories starting with a dot. Please set RCC_DIR to a different value in your profile. RCC_DIR: $$RCC_DIR")
+    }
 
-RET = $$find(OBJECTS_DIR, "(/|^)\.[^/]+/?$")
-!isEmpty(RET):{
-    error("Symbian does not support directories starting with a dot. Please set OBJECTS_DIR to a different value in your profile. OBJECTS_DIR: $$OBJECTS_DIR")
+    RET = $$find(OBJECTS_DIR, "(/|^)\.[^/]+/?$")
+    !isEmpty(RET):{
+        error("Symbian does not support directories starting with a dot. Please set OBJECTS_DIR to a different value in your profile. OBJECTS_DIR: $$OBJECTS_DIR")
+    }
 }