Moved a resource file from the static wrapper app to QtGui.

It's more appropriate to have it in QtGui after the framework classes
were moved there.

This also means that the rsgfix needed earlier is not necessary
anymore, since QtGui is not a static library.

RevBy:    Janne Anttila

3 files changed, 11 insertions, 20 deletions

diff --git a/src/gui/s60framework/s60framework.pri b/src/gui/s60framework/s60framework.pri
index fea74fe..5884b68 100644
--- a/src/gui/s60framework/s60framework.pri
+++ b/src/gui/s60framework/s60framework.pri
@@ -1,3 +1,14 @@
+# This block serves the minimalistic resource file for S60 3.1 platforms.
+# Note there is no way to ifdef S60 version in mmp file, that is why the resource
+# file is always compiled for WINSCW
+minimalAppResource31 = \
+    "SOURCEPATH s60framework" \
+    "START RESOURCE s60main.rss" \
+    "HEADER" \
+    "TARGETPATH resource\apps" \
+    "END"
+MMP_RULES += minimalAppResource31
+
 SOURCES += s60framework/qs60mainapplication.cpp \
            s60framework/qs60mainappui.cpp \
            s60framework/qs60maindocument.cpp
diff --git a/src/s60main/s60main.rss b/src/gui/s60framework/s60main.rss
index 07dc6a1..07dc6a1 100644
--- a/src/s60main/s60main.rss
+++ b/src/gui/s60framework/s60main.rss
diff --git a/src/s60main/s60main.pro b/src/s60main/s60main.pro
index cc3c547..47cf020 100644
--- a/src/s60main/s60main.pro
+++ b/src/s60main/s60main.pro
@@ -16,16 +16,6 @@ symbian {
     SOURCES	 =  qts60main.cpp \
                     qts60main_mcrt0.cpp
 
-    # This block serves the minimalistic resource file for S60 3.1 platforms.
-    # Note there is no way to ifdef S60 version in mmp file, that is why the resource
-    # file is always compiled for WINSCW
-    minimalAppResource31 = \
-        "START RESOURCE s60main.rss" \
-        "HEADER" \
-        "TARGETPATH resource\apps" \
-        "END"
-    MMP_RULES += minimalAppResource31
-
     # s60main needs to be built in ARM mode for GCCE to work.
     MMP_RULES+="ALWAYS_BUILD_AS_ARM"
 
@@ -36,14 +26,4 @@ symbian {
     error("$$_FILE_ is intended only for Symbian!")
 }
 
-symbian-abld: {
-    # abld build commands generated resources after the static library is built, and
-    # we have dependency to resource from static lib -> resources need to be generated
-    # explicitly before library
-    rsgFix2.commands = "-$(DEL_FILE) $(EPOCROOT)Epoc32\Data\z\resource\apps\s60main.rsc >NUL 2>&1"
-    rsgFix.commands = "-$(ABLD) resource $(PLATFORM) $(CFG) 2>NUL"
-    QMAKE_EXTRA_TARGETS += rsgFix rsgFix2
-    PRE_TARGETDEPS += rsgFix rsgFix2
-}
-
 include(../qbase.pri)