diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-10-09 12:22:20 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2013-10-15 10:27:28 +0200 |
| commit | 0ee5389017f3fa2b1407b00944369ac29389a0da (patch) | |
| tree | 1492e11d3699b18769885efa892d3fd509c00919 /src/plugins/projectexplorer/gcctoolchain.cpp | |
| parent | 520bd9ad536702339cda799ea43a489e7119859d (diff) | |
| download | qt-creator-0ee5389017f3fa2b1407b00944369ac29389a0da.tar.gz | |
Remove support for Madde-based platforms.
With Nokia's decision to stop support for Harmattan applications
in their app store, the last remains of a use case have disappeared.
Change-Id: Ia036112de01c8c3a866da3529b4a941db11c7358
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/projectexplorer/gcctoolchain.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/gcctoolchain.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index ed0c2fca86..936505369d 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -67,8 +67,6 @@ static const char compilerPlatformLinkerFlagsKeyC[] = "ProjectExplorer.GccToolCh static const char targetAbiKeyC[] = "ProjectExplorer.GccToolChain.TargetAbi"; static const char supportedAbisKeyC[] = "ProjectExplorer.GccToolChain.SupportedAbis"; -static const char LEGACY_MAEMO_ID[] = "Qt4ProjectManager.ToolChain.Maemo:"; - static QByteArray runGcc(const FileName &gcc, const QStringList &arguments, const QStringList &env) { if (gcc.isEmpty() || !gcc.toFileInfo().isExecutable()) @@ -748,8 +746,7 @@ QList<ToolChain *> GccToolChainFactory::autoDetect() bool GccToolChainFactory::canRestore(const QVariantMap &data) { const QString id = idFromMap(data); - return id.startsWith(QLatin1String(Constants::GCC_TOOLCHAIN_ID) + QLatin1Char(':')) - || id.startsWith(QLatin1String(LEGACY_MAEMO_ID)); + return id.startsWith(QLatin1String(Constants::GCC_TOOLCHAIN_ID) + QLatin1Char(':')); } ToolChain *GccToolChainFactory::restore(const QVariantMap &data) @@ -758,11 +755,6 @@ ToolChain *GccToolChainFactory::restore(const QVariantMap &data) // Updating from 2.5: QVariantMap updated = data; QString id = idFromMap(updated); - if (id.startsWith(QLatin1String(LEGACY_MAEMO_ID))) { - id = QString::fromLatin1(Constants::GCC_TOOLCHAIN_ID).append(id.mid(id.indexOf(QLatin1Char(':')))); - idToMap(updated, id); - autoDetectionToMap(updated, false); - } if (tc->fromMap(updated)) return tc; @@ -1376,10 +1368,6 @@ void ProjectExplorerPlugin::testGccAbiGuessing_data() << QByteArray("#define __ARM_64 1\n#define __Something\n") << (QStringList()); - QTest::newRow("Maemo 1") - << QString::fromLatin1("arm-none-linux-gnueabi") - << QByteArray("") - << (QStringList() << QLatin1String("arm-linux-generic-elf-32bit")); QTest::newRow("Linux 1 (32bit intel)") << QString::fromLatin1("i686-linux-gnu") << QByteArray("") |