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

Filtering '-' out of generated projects

Browse Source 
(In QtCreator the wizard would take care of that.)
This commit is contained in:
Alessandro Portale
2010-11-16 20:56:01 +01:00
parent adba4c954c
commit 8eb60c6598
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,20 +157,22 @@ 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() + m_projectName + QLatin1String(".pro"); case AppPro: return outputPathBase() + cleanProjectName + 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 Desktop: return outputPathBase() + m_projectName + QLatin1String(".desktop"); case Desktop: return outputPathBase() + cleanProjectName + QLatin1String(".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() + projectName() + QLatin1String(".svg"); case SymbianSvgIcon: return outputPathBase() + cleanProjectName + QLatin1String(".svg");
case SymbianSvgIconOrigin: return !m_symbianSvgIcon.isEmpty() ? m_symbianSvgIcon case SymbianSvgIconOrigin: return !m_symbianSvgIcon.isEmpty() ? m_symbianSvgIcon
: originsRootShared + symbianIconFileName; : originsRootShared + symbianIconFileName;
case MaemoPngIcon: return outputPathBase() + projectName() + QLatin1String(".png"); case MaemoPngIcon: return outputPathBase() + cleanProjectName + QLatin1String(".png");
case MaemoPngIconOrigin: return !m_maemoPngIcon.isEmpty() ? m_maemoPngIcon case MaemoPngIconOrigin: return !m_maemoPngIcon.isEmpty() ? m_maemoPngIcon
: originsRootShared + QLatin1String("maemoicon.png"); : originsRootShared + QLatin1String("maemoicon.png");
default: return pathExtended(fileType); default: return pathExtended(fileType);

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

@@ -160,8 +160,9 @@ bool QmlStandaloneApp::setExternalModules(const QStringList &uris,
QString QmlStandaloneApp::pathExtended(int fileType) const QString QmlStandaloneApp::pathExtended(int fileType) const
{ {
QString cleanProjectName = projectName().replace(QLatin1Char('-'), QString());
const QString qmlSubDir = QLatin1String("qml/") const QString qmlSubDir = QLatin1String("qml/")
+ (useExistingMainQml() ? m_mainQmlFile.dir().dirName() : projectName()) + (useExistingMainQml() ? m_mainQmlFile.dir().dirName() : cleanProjectName)
+ QLatin1Char('/'); + QLatin1Char('/');
const QString appViewerTargetSubDir = appViewerOriginsSubDir; const QString appViewerTargetSubDir = appViewerOriginsSubDir;
const QString mainQml = QLatin1String("main.qml"); const QString mainQml = QLatin1String("main.qml");