Review fixes for qmake (project.cpp cleanup)

Removed symbian specific functionality from project.cpp:
 - generate_test_uid qmake function removed
   - Uids are now generated automatically for projects that don't have
     one.
   - Usage of ICON (in application_icon.prf) now requires explicit
     UID3 definition.
   - Autotests that require UID3 in .pro now define it explicitly
 - Move most symbian specific function implementations away from
   project.cpp to files under generators/symbian

Reviewed-by: Janne Anttila

6 files changed, 6 insertions, 0 deletions

diff --git a/tests/auto/qdatastream/qdatastream.pro b/tests/auto/qdatastream/qdatastream.pro
index 317c3bf..5b90357 100644
--- a/tests/auto/qdatastream/qdatastream.pro
+++ b/tests/auto/qdatastream/qdatastream.pro
@@ -22,6 +22,7 @@ wince*: {
    addFiles.path = .
    DEPLOYMENT += addFiles
    TARGET.EPOCHEAPSIZE = 1000000 10000000
+   TARGET.UID3 = 0xE0340001
    DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x",""))
 }else {
    DEFINES += SRCDIR=\\\"$$PWD/\\\"
diff --git a/tests/auto/qdir/qdir.pro b/tests/auto/qdir/qdir.pro
index 8fe5d83..0111672 100644
--- a/tests/auto/qdir/qdir.pro
+++ b/tests/auto/qdir/qdir.pro
@@ -16,6 +16,7 @@ wince*:{
   QT = core
   TARGET.CAPABILITY += AllFiles
 
+  TARGET.UID3 = 0xE0340002
   DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x",""))
 } else {
   QT = core
diff --git a/tests/auto/qdirmodel/qdirmodel.pro b/tests/auto/qdirmodel/qdirmodel.pro
index 6b3a707..19ec231 100644
--- a/tests/auto/qdirmodel/qdirmodel.pro
+++ b/tests/auto/qdirmodel/qdirmodel.pro
@@ -14,6 +14,7 @@ wince*|symbian: {
 wince*: {
     DEFINES += SRCDIR=\\\"./\\\"
 } symbian: {
+    TARGET.UID3 = 0xE0340003
     DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x",""))
 } else {
     DEFINES += SRCDIR=\\\"$$PWD/\\\"
diff --git a/tests/auto/qicoimageformat/qicoimageformat.pro b/tests/auto/qicoimageformat/qicoimageformat.pro
index 45f616a..c0aa4b5 100644
--- a/tests/auto/qicoimageformat/qicoimageformat.pro
+++ b/tests/auto/qicoimageformat/qicoimageformat.pro
@@ -18,6 +18,7 @@ wince*: {
    addPlugins.sources = qico.dll
    addPlugins.path = imageformats
    DEPLOYMENT += addFiles addPlugins
+   TARGET.UID3 = 0xE0340004
    DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x",""))
 } else {
    DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/qlocalsocket/test/test.pro b/tests/auto/qlocalsocket/test/test.pro
index da741b9..503f769 100644
--- a/tests/auto/qlocalsocket/test/test.pro
+++ b/tests/auto/qlocalsocket/test/test.pro
@@ -35,6 +35,7 @@ wince* {
 symbian {
     additionalFiles.sources = lackey.exe
     additionalFiles.path = \sys\bin
+    TARGET.UID3 = 0xE0340005
     DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x",""))
 }
 
diff --git a/tests/auto/qscriptengine/qscriptengine.pro b/tests/auto/qscriptengine/qscriptengine.pro
index 4d1828f..f72c070 100644
--- a/tests/auto/qscriptengine/qscriptengine.pro
+++ b/tests/auto/qscriptengine/qscriptengine.pro
@@ -10,6 +10,7 @@ wince*|symbian*: {
 }
 
 symbian: {
+   TARGET.UID3 = 0xE0340006
    DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x",""))
    TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb"
 }