diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp index 01e32da9b01956d7373ea2c9d1fda72f267a704d..812edad8a3b83880c47ca1ed4c4a1ea9c5106632 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp @@ -157,20 +157,22 @@ QString AbstractMobileApp::path(int fileType) const const QString originsRootShared = templatesRoot() + QLatin1String("shared/"); const QString mainCppFileName = QLatin1String("main.cpp"); const QString symbianIconFileName = QLatin1String("symbianicon.svg"); + QString cleanProjectName = m_projectName; + cleanProjectName.replace(QLatin1Char('-'), QString()); switch (fileType) { case MainCpp: return outputPathBase() + mainCppFileName; case MainCppOrigin: return originsRootApp + mainCppFileName; - case AppPro: return outputPathBase() + m_projectName + QLatin1String(".pro"); + case AppPro: return outputPathBase() + cleanProjectName + QLatin1String(".pro"); case AppProOrigin: return originsRootApp + QLatin1String("app.pro"); case AppProPath: return outputPathBase(); - case Desktop: return outputPathBase() + m_projectName + QLatin1String(".desktop"); + case Desktop: return outputPathBase() + cleanProjectName + QLatin1String(".desktop"); case DesktopOrigin: return originsRootShared + QLatin1String("app.desktop"); case DeploymentPri: return outputPathBase() + DeploymentPriFileName; case DeploymentPriOrigin: return originsRootShared + DeploymentPriFileName; - case SymbianSvgIcon: return outputPathBase() + projectName() + QLatin1String(".svg"); + case SymbianSvgIcon: return outputPathBase() + cleanProjectName + QLatin1String(".svg"); case SymbianSvgIconOrigin: return !m_symbianSvgIcon.isEmpty() ? m_symbianSvgIcon : originsRootShared + symbianIconFileName; - case MaemoPngIcon: return outputPathBase() + projectName() + QLatin1String(".png"); + case MaemoPngIcon: return outputPathBase() + cleanProjectName + QLatin1String(".png"); case MaemoPngIconOrigin: return !m_maemoPngIcon.isEmpty() ? m_maemoPngIcon : originsRootShared + QLatin1String("maemoicon.png"); default: return pathExtended(fileType); diff --git a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp index 3a3586229abd6dcdb8d642ce7a7cd70fbd64526d..517e8c4c250654184a21ef492a82c282ba69b425 100644 --- a/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/qmlstandaloneapp.cpp @@ -160,8 +160,9 @@ bool QmlStandaloneApp::setExternalModules(const QStringList &uris, QString QmlStandaloneApp::pathExtended(int fileType) const { + QString cleanProjectName = projectName().replace(QLatin1Char('-'), QString()); const QString qmlSubDir = QLatin1String("qml/") - + (useExistingMainQml() ? m_mainQmlFile.dir().dirName() : projectName()) + + (useExistingMainQml() ? m_mainQmlFile.dir().dirName() : cleanProjectName) + QLatin1Char('/'); const QString appViewerTargetSubDir = appViewerOriginsSubDir; const QString mainQml = QLatin1String("main.qml");