diff options
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 6 | ||||
-rw-r--r-- | qmake/library/qmakeevaluator.cpp | 21 |
2 files changed, 4 insertions, 23 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index d2ce3306fb..829be89097 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -154,8 +154,10 @@ DotNET which_dotnet_version(const QByteArray &preferredVersion = QByteArray()) const QString productPath = installPaths.value(dotNetCombo[i].version); if (productPath.isEmpty()) continue; - if (path.startsWith(productPath, Qt::CaseInsensitive)) - return dotNetCombo[i].version; + if (path.startsWith(productPath, Qt::CaseInsensitive)) { + current_version = dotNetCombo[i].version; + return current_version; + } } } diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp index f46eb75670..e17ac16e96 100644 --- a/qmake/library/qmakeevaluator.cpp +++ b/qmake/library/qmakeevaluator.cpp @@ -1118,28 +1118,7 @@ bool QMakeEvaluator::prepareProject(const QString &inDir) } 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(); - } - - dir = m_outputDir; forever { QString stashfile = dir + QLatin1String("/.qmake.stash"); if (dir == (!superdir.isEmpty() ? superdir : m_buildRoot) || m_vfs->exists(stashfile)) { |