← Back to branch summary

~bzoltan/kubuntu-packaging/decouple_cmake_plugin

« back to all changes in this revision

Viewing changes to src/plugins/projectexplorer/wincetoolchain.cpp

  • Committer: Timo Jyrinki
  • Date: 2013-11-15 12:25:23 UTC
  • mfrom: (1.1.28)
  • Revision ID: timo.jyrinki@canonical.com-20131115122523-i2kyamsu4gs2mu1m
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/projectexplorer/wincetoolchain.cpp
67
67
    if (version == 10)
68
68
        return QLatin1String("msvc2010");
69
69
    if (version == 9)
70
 
        return QLatin1String("msvc2008");;
 
70
        return QLatin1String("msvc2008");
71
71
    return QLatin1String("msvc2005");
72
72
}
73
73
 
93
93
        if (replacement.isEmpty()) {
94
94
            qWarning() << "No replacement for var: " << var;
95
95
            pos = nextPos;
96
 
        }
97
 
        else {
 
96
        } else {
98
97
            // Not sure about this, but we need to account for the case where
99
98
            // the end of the replacement doesn't have the directory seperator and
100
99
            // neither does the start of the insert. This solution assumes:
241
240
                               const QString &binPath,
242
241
                               const QString &includePath,
243
242
                               const QString &libPath,
244
 
                               bool autodetect) :
245
 
    AbstractMsvcToolChain(QLatin1String(Constants::WINCE_TOOLCHAIN_ID), autodetect, abi, vcvarsBat),
 
243
                               Detection d) :
 
244
    AbstractMsvcToolChain(QLatin1String(Constants::WINCE_TOOLCHAIN_ID), d, abi, vcvarsBat),
246
245
    m_msvcVer(msvcVer),
247
246
    m_ceVer(ceVer),
248
247
    m_binPath(binPath),
258
257
}
259
258
 
260
259
WinCEToolChain::WinCEToolChain() :
261
 
    AbstractMsvcToolChain(QLatin1String(Constants::WINCE_TOOLCHAIN_ID), false)
 
260
    AbstractMsvcToolChain(QLatin1String(Constants::WINCE_TOOLCHAIN_ID), ManualDetection)
262
261
{
263
262
}
264
263
 
352
351
// WinCEToolChainFactory
353
352
// --------------------------------------------------------------------------
354
353
 
355
 
QString WinCEToolChainFactory::displayName() const
356
 
{
357
 
    return tr("WinCE");
358
 
}
359
 
 
360
 
QString WinCEToolChainFactory::id() const
361
 
{
362
 
    return QLatin1String(Constants::WINCE_TOOLCHAIN_ID);
 
354
WinCEToolChainFactory::WinCEToolChainFactory()
 
355
{
 
356
    setId(Constants::WINCE_TOOLCHAIN_ID);
 
357
    setDisplayName(tr("WinCE"));
363
358
}
364
359
 
365
360
 
415
410
                                                                        binPath,
416
411
                                                                        includePath,
417
412
                                                                        libPath,
418
 
                                                                        true);
 
413
                                                                        ToolChain::AutoDetection);
419
414
                            results.append(pChain);
420
415
                        }
421
416
                    }