← Back to branch summary

~ubuntu-branches/ubuntu/vivid/qtcreator-plugin-ubuntu/vivid

« back to all changes in this revision

Viewing changes to src/ubuntu/ubuntuclicktool.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Benjamin Zeller
  • Date: 2015-02-09 12:39:40 UTC
  • mfrom: (1.1.87)
  • Revision ID: package-import@ubuntu.com-20150209123940-v34y8crkv29c18u1
Tags: 3.1.1+15.04.20150209-0ubuntu1
[ Benjamin Zeller ]
Make use of the backend in the qmake+backend app template. Fix
passing of the "CLICK_NO_LOCAL_MIRROR" env var to the chroot
creation script .

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ubuntu/ubuntuclicktool.cpp
112
112
    bool useLocalMirror = settings.value(QLatin1String(Constants::SETTINGS_KEY_CHROOT_USE_LOCAL_MIRROR),false).toBool();
113
113
    settings.endGroup();
114
114
 
115
 
    Utils::Environment env = Utils::Environment::systemEnvironment();
116
115
    if(!useLocalMirror)
117
 
        env.set(QStringLiteral("CLICK_NO_LOCAL_MIRROR"),QStringLiteral("1"));
 
116
        command.prepend(QStringLiteral("env CLICK_NO_LOCAL_MIRROR=1 "));
118
117
 
119
118
    params->setCommand(QLatin1String(Constants::UBUNTU_SUDO_BINARY));
120
 
    params->setEnvironment(env);
 
119
    params->setEnvironment(Utils::Environment::systemEnvironment());
121
120
    params->setArguments(command);
122
121
}
123
122