diff options
author | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2016-08-08 15:16:24 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2016-10-04 10:03:33 +0000 |
commit | 02937fdc4bdf130e57247dd11c7450551c9df61c (patch) | |
tree | 1684c1e061dc7f0114797040531928cb3dfb07ee /src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp | |
parent | b4ca04346eb427faf077eaad6a4d9cb349493b7b (diff) | |
download | qt-creator-02937fdc4bdf130e57247dd11c7450551c9df61c.tar.gz |
Make lib path chooser case-insensitive on Windows
Clear the old maemo stuff.
Task-number: QTCREATORBUG-16057
Change-Id: Ib349683e979a202c2244d6cdeec18a20517be4f6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp')
-rw-r--r-- | src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp b/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp index ff110d48f5..3fe5583f8b 100644 --- a/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp +++ b/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp @@ -31,10 +31,7 @@ #include <projectexplorer/projectexplorer.h> #include <projectexplorer/session.h> -#include <projectexplorer/project.h> -#include <projectexplorer/kitinformation.h> #include <projectexplorer/target.h> -#include <projectexplorer/toolchain.h> #include <utils/hostosinfo.h> #include <utils/qtcprocess.h> @@ -53,41 +50,16 @@ LibraryDetailsController::LibraryDetailsController( m_proFile(proFile), m_libraryDetailsWidget(libraryDetails) { + m_creatorPlatform = CreatorLinux; switch (Utils::HostOsInfo::hostOs()) { case Utils::OsTypeMac: m_creatorPlatform = CreatorMac; - break; - case Utils::OsTypeLinux: - m_creatorPlatform = CreatorLinux; - break; case Utils::OsTypeWindows: m_creatorPlatform = CreatorWindows; - break; default: break; } - if (!Utils::HostOsInfo::isLinuxHost()) { - // project for which we are going to insert the snippet - const Project *project = SessionManager::projectForFile(Utils::FileName::fromString(proFile)); - if (project && project->activeTarget()) { - // if its tool chain is maemo behave the same as we would be on linux - ProjectExplorer::ToolChain *tc = ToolChainKitInformation::toolChain(project->activeTarget()->kit(), ToolChain::Language::Cxx); - if (tc) { - switch (tc->targetAbi().os()) { - case Abi::WindowsOS: - m_creatorPlatform = CreatorWindows; - break; - case Abi::DarwinOS: - m_creatorPlatform = CreatorMac; - break; - default: - m_creatorPlatform = CreatorLinux; - break; - } - } - } - } setPlatformsVisible(true); setLinkageGroupVisible(true); setMacLibraryGroupVisible(true); |