feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Allow dashes in project names...

Browse Source 
... for mobile and QtQuick projects.
This effectively reverts 8eb60c6598, which
was probably done for the then-relevant Symbian platform.

Change-Id: I2bfdec822dfdcc353790f0b5980960e30336d147
Task-number: QTCREATORBUG-7602
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
This commit is contained in:
Christian Kandeler
2012-07-20 14:25:32 +02:00
parent e3a5e27eb7
commit 0c0c592038
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
View File

@@ -164,26 +164,24 @@ QString AbstractMobileApp::path(int fileType) const
const QString originsRootShared = templatesRoot() + QLatin1String("shared/"); const QString originsRootShared = templatesRoot() + QLatin1String("shared/");
const QString mainCppFileName = QLatin1String("main.cpp"); const QString mainCppFileName = QLatin1String("main.cpp");
const QString symbianIconFileName = QLatin1String("symbianicon.svg"); const QString symbianIconFileName = QLatin1String("symbianicon.svg");
QString cleanProjectName = m_projectName;
cleanProjectName.replace(QLatin1Char('-'), QString());
switch (fileType) { switch (fileType) {
case MainCpp: return outputPathBase() + mainCppFileName; case MainCpp: return outputPathBase() + mainCppFileName;
case MainCppOrigin: return originsRootApp + 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 AppProOrigin: return originsRootApp + QLatin1String("app.pro");
case AppProPath: return outputPathBase(); case AppProPath: return outputPathBase();
case DesktopFremantle: return outputPathBase() + cleanProjectName + QLatin1String(".desktop"); case DesktopFremantle: return outputPathBase() + m_projectName + QLatin1String(".desktop");
case DesktopHarmattan: return outputPathBase() + cleanProjectName + QLatin1String("_harmattan.desktop"); case DesktopHarmattan: return outputPathBase() + m_projectName + QLatin1String("_harmattan.desktop");
case DesktopOrigin: return originsRootShared + QLatin1String("app.desktop"); case DesktopOrigin: return originsRootShared + QLatin1String("app.desktop");
case DeploymentPri: return outputPathBase() + DeploymentPriFileName; case DeploymentPri: return outputPathBase() + DeploymentPriFileName;
case DeploymentPriOrigin: return originsRootShared + 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 case SymbianSvgIconOrigin: return !m_symbianSvgIcon.isEmpty() ? m_symbianSvgIcon
: originsRootShared + symbianIconFileName; : 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 case PngIconOrigin64: return !m_pngIcon64.isEmpty() ? m_pngIcon64
: originsRootShared + QLatin1String("icon64.png"); : 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 case PngIconOrigin80: return !m_pngIcon80.isEmpty() ? m_pngIcon80
: originsRootShared + QLatin1String("icon80.png"); : originsRootShared + QLatin1String("icon80.png");
default: return pathExtended(fileType); default: return pathExtended(fileType);

3
src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
View File

@@ -173,10 +173,9 @@ bool QtQuickApp::setExternalModules(const QStringList &uris,
QString QtQuickApp::pathExtended(int fileType) const QString QtQuickApp::pathExtended(int fileType) const
{ {
QString cleanProjectName = projectName().replace(QLatin1Char('-'), QString());
const bool importQmlFile = m_mainQmlMode == ModeImport; const bool importQmlFile = m_mainQmlMode == ModeImport;
const QString qmlSubDir = QLatin1String("qml/") const QString qmlSubDir = QLatin1String("qml/")
+ (importQmlFile ? m_mainQmlFile.dir().dirName() : cleanProjectName) + (importQmlFile ? m_mainQmlFile.dir().dirName() : projectName())
+ QLatin1Char('/'); + QLatin1Char('/');
const QString appViewerTargetSubDir = appViewerOriginsSubDir; const QString appViewerTargetSubDir = appViewerOriginsSubDir;