~bzoltan/kubuntu-packaging/decouple_cmake_plugin

« back to all changes in this revision

Viewing changes to src/shared/qbs/src/app/detect-toolchains/probe.cpp

  • Committer: Timo Jyrinki
  • Date: 2013-12-02 09:16:15 UTC
  • mfrom: (1.1.29)
  • Revision ID: timo.jyrinki@canonical.com-20131202091615-xbj1os1f604ber1m
New upstream release candidate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
203
203
        return;
204
204
    }
205
205
 
 
206
    QByteArray architecture = gccMachineName.split('-').first();
 
207
    if (architecture == "mingw32")
 
208
        architecture = "x86";
 
209
    else if (architecture == "mingw64")
 
210
        architecture = "x86_64";
206
211
 
207
212
    Profile profile(QString::fromLocal8Bit(gccMachineName), settings);
208
213
    qbsInfo() << Tr::tr("Platform '%1' detected in '%2'.").arg(profile.name(), mingwPath);
210
215
    profile.setValue("cpp.toolchainInstallPath", mingwBinPath);
211
216
    profile.setValue("cpp.compilerName", QLatin1String("g++.exe"));
212
217
    profile.setValue("qbs.toolchain", QStringList() << "mingw" << "gcc");
 
218
    profile.setValue(QLatin1String("qbs.architecture"),
 
219
                     canonicalizeArchitecture(QString::fromLatin1(architecture)));
 
220
    profile.setValue(QLatin1String("qbs.endianness"),
 
221
                     QLatin1String("little"));
213
222
    profiles << profile;
214
223
}
215
224