From 0c0c592038e4c362b4bf9760d4bf1272f135c6e0 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 20 Jul 2012 14:25:32 +0200 Subject: [PATCH] Allow dashes in project names... ... for mobile and QtQuick projects. This effectively reverts 8eb60c6598ae4b59a7f58d5b504d2facd051bcb5, which was probably done for the then-relevant Symbian platform. Change-Id: I2bfdec822dfdcc353790f0b5980960e30336d147 Task-number: QTCREATORBUG-7602 Reviewed-by: Alessandro Portale --- .../wizards/abstractmobileapp.cpp | 14 ++++++-------- .../qt4projectmanager/wizards/qtquickapp.cpp | 3 +-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp index 21a529aa762..2bfc698a9f4 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp @@ -164,26 +164,24 @@ 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() + cleanProjectName + QLatin1String(".pro"); + case AppPro: return outputPathBase() + m_projectName + QLatin1String(".pro"); case AppProOrigin: return originsRootApp + QLatin1String("app.pro"); case AppProPath: return outputPathBase(); - case DesktopFremantle: return outputPathBase() + cleanProjectName + QLatin1String(".desktop"); - case DesktopHarmattan: return outputPathBase() + cleanProjectName + QLatin1String("_harmattan.desktop"); + case DesktopFremantle: return outputPathBase() + m_projectName + QLatin1String(".desktop"); + case DesktopHarmattan: return outputPathBase() + m_projectName + QLatin1String("_harmattan.desktop"); case DesktopOrigin: return originsRootShared + QLatin1String("app.desktop"); case DeploymentPri: return outputPathBase() + DeploymentPriFileName; case DeploymentPriOrigin: return originsRootShared + DeploymentPriFileName; - case SymbianSvgIcon: return outputPathBase() + cleanProjectName + QLatin1String(".svg"); + case SymbianSvgIcon: return outputPathBase() + m_projectName + QLatin1String(".svg"); case SymbianSvgIconOrigin: return !m_symbianSvgIcon.isEmpty() ? m_symbianSvgIcon : originsRootShared + symbianIconFileName; - case PngIcon64: return outputPathBase() + cleanProjectName + QLatin1String("64.png"); + case PngIcon64: return outputPathBase() + m_projectName + QLatin1String("64.png"); case PngIconOrigin64: return !m_pngIcon64.isEmpty() ? m_pngIcon64 : originsRootShared + QLatin1String("icon64.png"); - case PngIcon80: return outputPathBase() + cleanProjectName + QLatin1String("80.png"); + case PngIcon80: return outputPathBase() + m_projectName + QLatin1String("80.png"); case PngIconOrigin80: return !m_pngIcon80.isEmpty() ? m_pngIcon80 : originsRootShared + QLatin1String("icon80.png"); default: return pathExtended(fileType); diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp index be2c8cf42d3..5abba5fa3a5 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp @@ -173,10 +173,9 @@ bool QtQuickApp::setExternalModules(const QStringList &uris, QString QtQuickApp::pathExtended(int fileType) const { - QString cleanProjectName = projectName().replace(QLatin1Char('-'), QString()); const bool importQmlFile = m_mainQmlMode == ModeImport; const QString qmlSubDir = QLatin1String("qml/") - + (importQmlFile ? m_mainQmlFile.dir().dirName() : cleanProjectName) + + (importQmlFile ? m_mainQmlFile.dir().dirName() : projectName()) + QLatin1Char('/'); const QString appViewerTargetSubDir = appViewerOriginsSubDir;