From 6492101ea308f410c03a4641726a4d161fd0a389 Mon Sep 17 00:00:00 2001 From: dt Date: Tue, 1 Sep 2009 12:27:25 +0200 Subject: [PATCH] Fix importing adding a empty spec argument to qmake --- .../qt4projectmanager/projectloadwizard.cpp | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/plugins/qt4projectmanager/projectloadwizard.cpp b/src/plugins/qt4projectmanager/projectloadwizard.cpp index 6d4899f031e..91e155e68db 100644 --- a/src/plugins/qt4projectmanager/projectloadwizard.cpp +++ b/src/plugins/qt4projectmanager/projectloadwizard.cpp @@ -69,15 +69,20 @@ ProjectLoadWizard::ProjectLoadWizard(Qt4Project *project, QWidget *parent, Qt::W QString versionSpec = m_importVersion->sourcePath() + "/mkspecs/" + m_importVersion->mkspec(); QString parsedSpec = Qt4Project::extractSpecFromArgumentList(m_additionalArguments); - QString parsedSpecOrginal = parsedSpec; - if (QFileInfo(parsedSpec).isRelative()) - parsedSpec = QDir::cleanPath(directory + "/" + parsedSpec); - m_additionalArguments = Qt4Project::removeSpecFromArgumentList(m_additionalArguments); - if (parsedSpec != versionSpec) { - m_additionalArguments.prepend(parsedSpecOrginal); - m_additionalArguments.prepend("-spec"); - } + // Compare mkspecs and add to additional arguments + if (parsedSpec.isEmpty()) { + // using the default spec, don't modify additional arguments + } else { + QString parsedSpecOrginal = parsedSpec; + if (QFileInfo(parsedSpec).isRelative()) + parsedSpec = QDir::cleanPath(directory + "/" + parsedSpec); + m_additionalArguments = Qt4Project::removeSpecFromArgumentList(m_additionalArguments); + if (parsedSpec != versionSpec) { + m_additionalArguments.prepend(parsedSpecOrginal); + m_additionalArguments.prepend("-spec"); + } + } } // So now we have the version and the configuration for that version