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

explicitly look for mkspecs/ directories

Browse Source 
follow suit with qmake ...

Change-Id: Ia4f28cf200076824043e4626d4144a6d34e68623
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-06-18 11:31:51 +02:00
parent a0515b3b55
commit d4900ceddc
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -939,13 +939,14 @@ void QMakeEvaluator::loadDefaults()
bool QMakeEvaluator::prepareProject(const QString &inDir) bool QMakeEvaluator::prepareProject(const QString &inDir)
{ {
QString superdir;
if (m_option->do_cache) { if (m_option->do_cache) {
QString conffile; QString conffile;
QString cachefile = m_option->cachefile; QString cachefile = m_option->cachefile;
if (cachefile.isEmpty()) { //find it as it has not been specified if (cachefile.isEmpty()) { //find it as it has not been specified
if (m_outputDir.isEmpty()) if (m_outputDir.isEmpty())
goto no_cache; goto no_cache;
QString superdir = m_outputDir; superdir = m_outputDir;
forever { forever {
QString superfile = superdir + QLatin1String("/.qmake.super"); QString superfile = superdir + QLatin1String("/.qmake.super");
if (IoUtils::exists(superfile)) { if (IoUtils::exists(superfile)) {
@@ -989,6 +990,28 @@ bool QMakeEvaluator::prepareProject(const QString &inDir)
m_cachefile = cachefile; m_cachefile = cachefile;
} }
no_cache: no_cache:
// Look for mkspecs/ in source and build. First to win determines the root.
QString sdir = inDir;
QString dir = m_outputDir;
while (dir != m_buildRoot) {
if ((dir != sdir && QFileInfo(sdir, QLatin1String("mkspecs")).isDir())
|| QFileInfo(dir, QLatin1String("mkspecs")).isDir()) {
if (dir != sdir)
m_sourceRoot = sdir;
m_buildRoot = dir;
break;
}
if (dir == superdir)
break;
QFileInfo qsdfi(sdir);
QFileInfo qdfi(dir);
if (qsdfi.isRoot() || qdfi.isRoot())
break;
sdir = qsdfi.path();
dir = qdfi.path();
}
return true; return true;
} }