Commit a95ed642 authored by Alessandro Portale's avatar Alessandro Portale
Browse files

New wizards: Handle Symbian icon like Maemo icon

De-clutter the app profile:
- Call the Symbian icon <project>.svg
- Define the Symbian icon in the deployment .pri file

Task-Number: QTCREATORBUG-2578
Reviewed-by: ck
parent c03fff09
......@@ -15,8 +15,6 @@ DEFINES += NETWORKACCESS
# TARGETUID3 #
symbian:TARGET.UID3 = 0xE1111234
symbian:ICON = symbianicon.svg
SOURCES += main.cpp mainwindow.cpp
HEADERS += mainwindow.h
FORMS += mainwindow.ui
......
......@@ -20,8 +20,6 @@ DEFINES += NETWORKACCESS
# TARGETUID3 #
symbian:TARGET.UID3 = 0xE1111234
symbian:ICON = symbianicon.svg
# Define QMLJSDEBUGGER to enable basic debugging (setting breakpoints etc)
# Define QMLOBSERVER for advanced features (requires experimental QmlInspector plugin!)
#DEFINES += QMLJSDEBUGGER
......
......@@ -16,6 +16,7 @@ for(deploymentfolder, DEPLOYMENTFOLDERS) {
MAINPROFILEPWD = $$PWD
symbian {
ICON = $${TARGET}.svg
TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
contains(DEFINES, ORIENTATIONLOCK):LIBS += -lavkon -leikcore -leiksrv -lcone
contains(DEFINES, NETWORKACCESS):TARGET.CAPABILITY += NetworkServices
......@@ -81,6 +82,7 @@ symbian {
INSTALLS += desktopfile icon target
}
export (ICON)
export (INSTALLS)
export (DEPLOYMENT)
export (TARGET.EPOCHEAPSIZE)
......
......@@ -167,7 +167,7 @@ QString AbstractMobileApp::path(int fileType) const
case DesktopOrigin: return originsRootShared + QLatin1String("app.desktop");
case DeploymentPri: return outputPathBase() + DeploymentPriFileName;
case DeploymentPriOrigin: return originsRootShared + DeploymentPriFileName;
case SymbianSvgIcon: return outputPathBase() + symbianIconFileName;
case SymbianSvgIcon: return outputPathBase() + projectName() + QLatin1String(".svg");
case SymbianSvgIconOrigin: return !m_symbianSvgIcon.isEmpty() ? m_symbianSvgIcon
: originsRootShared + symbianIconFileName;
case MaemoPngIcon: return outputPathBase() + projectName() + QLatin1String(".png");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment