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

Qt4ProjectManager: Support Makefile variable

Browse Source 
Pass on the makefile to make, check the right makefile for importing.

Task-Nr: QTCREATORBUG-102
This commit is contained in:
dt
2010-10-05 17:38:45 +02:00
parent 51bfe658da
commit a36dc1d41e
10 changed files with 91 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
View File

@@ -299,7 +299,13 @@ void Qt4ProjectConfigWidget::updateImportLabel()
QtVersionManager *vm = QtVersionManager::instance();
// we only show if we actually have a qmake and makestep
if (m_buildConfiguration->qmakeStep() && m_buildConfiguration->makeStep()) {
QString qmakePath = QtVersionManager::findQMakeBinaryFromMakefile(m_buildConfiguration->buildDirectory());
QString makefile = m_buildConfiguration->buildDirectory();
if (m_buildConfiguration->makefile().isEmpty())
makefile.append("/Makefile");
else
makefile.append(m_buildConfiguration->makefile());
QString qmakePath = QtVersionManager::findQMakeBinaryFromMakefile(makefile);
QtVersion *version = m_buildConfiguration->qtVersion();
// check that there's a makefile
if (!qmakePath.isEmpty()) {
@@ -318,7 +324,7 @@ void Qt4ProjectConfigWidget::updateImportLabel()
delete newVersion;
} else {
// check that the qmake flags, arguments match
visible = !m_buildConfiguration->compareToImportFrom(m_buildConfiguration->buildDirectory());
visible = !m_buildConfiguration->compareToImportFrom(makefile);
targetMatches = true;
}
} else {
@@ -377,7 +383,13 @@ void Qt4ProjectConfigWidget::importLabelClicked()
return;
QString directory = m_buildConfiguration->buildDirectory();
if (!directory.isEmpty()) {
QString qmakePath = QtVersionManager::findQMakeBinaryFromMakefile(directory);
QString makefile = directory;
if (m_buildConfiguration->makefile().isEmpty())
makefile.append("/Makefile");
else
makefile.append(m_buildConfiguration->makefile());
QString qmakePath = QtVersionManager::findQMakeBinaryFromMakefile(makefile);
if (!qmakePath.isEmpty()) {
QtVersionManager *vm = QtVersionManager::instance();
QtVersion *version = vm->qtVersionForQMakeBinary(qmakePath);