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

don't use HostOsInfo class in shared/proparser

Browse Source 
this class cannot be used in code which is shared outside creator.

Change-Id: I0f4a6c1599bdf21fab532c974acf8ccd82ad318e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-08-28 16:31:18 +02:00
parent 037f055473
commit 1ed3538b21
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/shared/proparser/profileevaluator.cpp
View File

@@ -33,8 +33,6 @@
#include "qmakeglobals.h" #include "qmakeglobals.h"
#include "ioutils.h" #include "ioutils.h"
#include <utils/hostosinfo.h>
#include <QDir> #include <QDir>
using namespace ProFileEvaluatorInternal; using namespace ProFileEvaluatorInternal;
@@ -95,8 +93,11 @@ QStringList ProFileEvaluator::values(const QString &variableName, const ProFile
QString ProFileEvaluator::sysrootify(const QString &path, const QString &baseDir) const QString ProFileEvaluator::sysrootify(const QString &path, const QString &baseDir) const
{ {
const Qt::CaseSensitivity cs = Utils::HostOsInfo::isWindowsHost() #ifdef Q_OS_WIN
? Qt::CaseInsensitive : Qt::CaseSensitive; Qt::CaseSensitivity cs = Qt::CaseInsensitive;
#else
Qt::CaseSensitivity cs = Qt::CaseSensitive;
#endif
const bool isHostSystemPath = const bool isHostSystemPath =
d->m_option->sysroot.isEmpty() || path.startsWith(d->m_option->sysroot, cs) d->m_option->sysroot.isEmpty() || path.startsWith(d->m_option->sysroot, cs)
|| path.startsWith(baseDir, cs) || path.startsWith(d->m_outputDir, cs); || path.startsWith(baseDir, cs) || path.startsWith(d->m_outputDir, cs);