From f84a144e01ac03fe63cd8a05dc219dc09735191b Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Mon, 2 Nov 2009 17:36:29 +0100
Subject: [PATCH] Make the display for qws mkspecs nicer.
---
.../qt4projectmanager/qtversionmanager.cpp | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 4e3cc684319..ab028a43eba 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1049,9 +1049,18 @@ void QtVersion::updateMkSpec() const
}
#endif
- int index = qMax(mkspec.lastIndexOf('/'), mkspec.lastIndexOf('\\'));
- if (index >= 0)
- mkspec = mkspec.mid(index+1).trimmed();
+ QString mkspecdir = versionInfo().value("QMAKE_MKSPECS");
+ if (mkspecdir.isEmpty())
+ mkspecdir = versionInfo().value("QT_INSTALL_DATA") + "/mkspecs";
+
+ if (mkspec.startsWith(mkspecdir)) {
+ mkspec = mkspec.mid(mkspecdir.length() + 1);
+ qDebug() << "Setting mkspec to"<<mkspec;
+ } else {
+ int index = qMax(mkspec.lastIndexOf('/'), mkspec.lastIndexOf('\\'));
+ if (index >= 0)
+ mkspec = mkspec.mid(index+1).trimmed();
+ }
m_mkspec = mkspec;
m_mkspecUpToDate = true;
--
GitLab