summaryrefslogtreecommitdiffstats
path: root/src/s60main/s60main.pro
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-10-30 12:50:04 (GMT)
committeraxis <qt-info@nokia.com>2009-10-30 13:08:54 (GMT)
commitfab1697ff467e6c9ec02ffe6eccf65a6e779fd6b (patch)
treebe2e9cca0119b172bb8c87f53e62f343b2e13d02 /src/s60main/s60main.pro
parent1c44377d84976afa10b5ebae7d6ede5f226a2b3e (diff)
downloadQt-fab1697ff467e6c9ec02ffe6eccf65a6e779fd6b.zip
Qt-fab1697ff467e6c9ec02ffe6eccf65a6e779fd6b.tar.gz
Qt-fab1697ff467e6c9ec02ffe6eccf65a6e779fd6b.tar.bz2
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
Diffstat (limited to 'src/s60main/s60main.pro')
-rw-r--r--src/s60main/s60main.pro20
1 files changed, 0 insertions, 20 deletions
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)