From f8b67dcdd6e85f9b4661baa8826b21a49fe43376 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Wed, 28 Oct 2009 14:51:39 +0100
Subject: [PATCH] Fix importing via "import settings" label addind a unecessary
-spec
---
.../qt4projectconfigwidget.cpp | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index 74f364880b2..fa068f4da72 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -290,13 +290,18 @@ void Qt4ProjectConfigWidget::importLabelClicked()
QString versionSpec = version->sourcePath() + "/mkspecs/" + version->mkspec();
QString parsedSpec = Qt4Project::extractSpecFromArgumentList(additionalArguments);
- QString parsedSpecOrginal = parsedSpec;
- if (QFileInfo(parsedSpec).isRelative())
- parsedSpec = QDir::cleanPath(directory + "/" + parsedSpec);
- additionalArguments = Qt4Project::removeSpecFromArgumentList(additionalArguments);
- if (parsedSpec != versionSpec) {
- additionalArguments.prepend(parsedSpecOrginal);
- additionalArguments.prepend("-spec");
+
+ 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);
+ additionalArguments = Qt4Project::removeSpecFromArgumentList(additionalArguments);
+ if (parsedSpec != versionSpec) {
+ additionalArguments.prepend(parsedSpecOrginal);
+ additionalArguments.prepend("-spec");
+ }
}
// So we got all the information now apply it...
--
GitLab