← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/ubuntu/ubunturemoterunconfiguration.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Benjamin Zeller, Bin Li
  • Date: 2015-01-14 11:11:03 UTC
  • mfrom: (1.1.76)
  • Revision ID: package-import@ubuntu.com-20150114111103-b0pvphib2u57vi70
Tags: 3.1.1+15.04.20150114-0ubuntu1
https://launchpad.net/bugs/1409815
https://launchpad.net/bugs/1409596
https://launchpad.net/bugs/1409596
[ Benjamin Zeller ]
* Fix bug lp:1409815 "Manifest file with invalid syntax reported as
  missing" -Automatically update default runconfigurations when the
  manifest file changes (LP: #1409815)

[ Bin Li ]
* Skip the incomplete emulator. Fixes LP: #1409596 (LP: #1409596)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ubuntu/ubunturemoterunconfiguration.cpp
307
307
        QString manifestPath = package_dir.absoluteFilePath(QStringLiteral("manifest.json"));
308
308
 
309
309
        //read the manifest
 
310
        if(!QFile::exists(manifestPath)) {
 
311
            if(errorMessage)
 
312
                *errorMessage = tr("Could not find the manifest file in the package directory, make sure its installed into the root of the click package.");
 
313
            return false;
 
314
        }
 
315
 
310
316
        UbuntuClickManifest manifest;
311
 
        if(!manifest.load(manifestPath)) {
 
317
        QString manifestErrMsg;
 
318
        if(!manifest.load(manifestPath,nullptr,&manifestErrMsg)) {
312
319
            if(errorMessage)
313
 
                *errorMessage = tr("Could not open the manifest file in the package directory, make sure its installed into the root of the click package.");
 
320
                *errorMessage = tr("Could not read the manifest file in the package directory: %1").arg(manifestErrMsg);
314
321
            return false;
315
322
        }
316
323