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

2 files changed, 0 insertions, 105 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)
diff --git a/src/s60main/s60main.rss b/src/s60main/s60main.rss
deleted file mode 100644
index 07dc6a1..0000000
--- a/src/s60main/s60main.rss
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Symbian application wrapper of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Even S60 application have ENoAppResourceFile and ENonStandardResourceFile
-// flags set, the S60 3rd Edition FP1 emulator requires applications to have
-// very minimalistic application resource file, otherwise apps refures to start
-// This file serves the minimalistic resource file for S60 3.1 platforms.
-
-//  RESOURCE IDENTIFIER
-NAME QTMA    // 4 letter ID
-
-//  INCLUDES
-//#include <eikon.rh>
-#include <appinfo.rh>
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-
-//  RESOURCE DEFINITIONS
-RESOURCE RSS_SIGNATURE
-    {
-    }
-
-RESOURCE TBUF r_default_document_name
-    {
-    buf="QTMA";
-    }
-
-RESOURCE EIK_APP_INFO
-    {
-    menubar = r_qt_wrapperapp_menubar;
-    cba = R_AVKON_SOFTKEYS_EXIT;
-    }
-
-RESOURCE MENU_BAR r_qt_wrapperapp_menubar
-    {
-    titles =
-        {
-        MENU_TITLE { menu_pane = r_qt_wrapperapp_menu; }
-        };
-    }
-
-RESOURCE MENU_PANE r_qt_wrapperapp_menu
-    {
-    }
-// End of File