Commit ea9607958547a695475788f3eb8b3c1b4ef60d3d

Fix bug with importanting a build with an not yet existing qt.
(cherry picked from commit ee92e82cb89f8d648212113706d8b22cb4968c26)


364	364
365	365	// Ensure that the qt version and tool chain in each build configuration is valid
366	366	// or if not, is reset to the default
	367
367	368	foreach (BuildConfiguration *bc, buildConfigurations()) {
368	369	qtVersionId(bc);
369	370	toolChainType(bc);


145	145	void Qt4ProjectConfigWidget::init(const QString &buildConfiguration)
146	146	{
147	147	if (debug)
148		qDebug() << "Qt4ProjectConfigWidget::init()";
	148	qDebug() << "Qt4ProjectConfigWidget::init() for"<<buildConfiguration;
149	149
150	150	m_buildConfiguration = buildConfiguration;
151	151	ProjectExplorer::BuildConfiguration *bc = m_pro->buildConfiguration(buildConfiguration);
…	…
183	183	m_ui->qtVersionComboBox->addItem(tr("Default Qt Version (%1)").arg(vm->defaultVersion()->name()), 0);
184	184
185	185	int qtVersionId = m_pro->qtVersionId(m_pro->buildConfiguration(m_buildConfiguration));
	186
186	187	if (qtVersionId == 0) {
187	188	m_ui->qtVersionComboBox->setCurrentIndex(0);
188	189	m_ui->invalidQtWarningLabel->setVisible(false);


159	159	void QtVersionManager::addVersion(QtVersion *version)
160	160	{
161	161	m_versions.append(version);
	162	m_uniqueIdToIndex.insert(version->uniqueId(), m_versions.count() - 1);
162	163	emit qtVersionsChanged();
163	164	writeVersionsIntoSettings();
164	165	}
…	…
824	824	{
825	825	if (m_versionInfoUpToDate)
826	826	return;
	827
827	828	// extract data from qmake executable
828	829	m_versionInfo.clear();
829	830	m_notInstalled = false;
…	…
939	939	mkspecPath = versionInfo().value("QT_INSTALL_DATA") + "/mkspecs/default";
940	940	else
941	941	mkspecPath = mkspecPath + "/default";
942		// qDebug() << "default mkspec is located at" << mkspecPath;
	942	// qDebug() << "default mkspec is located at" << mkspecPath;
943	943	#ifdef Q_OS_WIN
944	944	QFile f2(mkspecPath + "/qmake.conf");
945	945	if (f2.exists() && f2.open(QIODevice::ReadOnly)) {