From a95ed6420ddab14d8928646954f21d9b8e395bba Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Sun, 3 Oct 2010 00:28:36 +0200 Subject: [PATCH] New wizards: Handle Symbian icon like Maemo icon De-clutter the app profile: - Call the Symbian icon .svg - Define the Symbian icon in the deployment .pri file Task-Number: QTCREATORBUG-2578 Reviewed-by: ck --- share/qtcreator/templates/mobileapp/app.pro | 2 -- share/qtcreator/templates/qmlapp/app.pro | 2 -- share/qtcreator/templates/shared/deployment.pri | 2 ++ src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/templates/mobileapp/app.pro b/share/qtcreator/templates/mobileapp/app.pro index 8d2933ce19..9936500fe3 100644 --- a/share/qtcreator/templates/mobileapp/app.pro +++ b/share/qtcreator/templates/mobileapp/app.pro @@ -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 diff --git a/share/qtcreator/templates/qmlapp/app.pro b/share/qtcreator/templates/qmlapp/app.pro index d441773ecd..f488604cbf 100644 --- a/share/qtcreator/templates/qmlapp/app.pro +++ b/share/qtcreator/templates/qmlapp/app.pro @@ -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 diff --git a/share/qtcreator/templates/shared/deployment.pri b/share/qtcreator/templates/shared/deployment.pri index bb79115aaf..7ec5a99ae5 100644 --- a/share/qtcreator/templates/shared/deployment.pri +++ b/share/qtcreator/templates/shared/deployment.pri @@ -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) diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp index 422ddd246a..e9775f3f13 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp @@ -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"); -- 2.11.0