← Back to branch summary

~ubuntu-branches/ubuntu/wily/marble/wily

« back to all changes in this revision

Viewing changes to src/lib/marble/TemplateDocument.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell, José Manuel Santamaría Lema, Jonathan Riddell, Philip Muškovac
  • Date: 2015-08-13 11:44:25 UTC
  • mfrom: (1.5.12)
  • Revision ID: package-import@ubuntu.com-20150813114425-kdwa08ijv9p1f1rt
Tags: 4:15.08.0-0ubuntu1
[ José Manuel Santamaría Lema ]
* Update symbols: mark as optional symbols gone after building with
  GCC 5

[ Jonathan Riddell ]
* New upstream release
* Port to frameworks 5
* new upstream beta release

[ Philip Muškovac ]
* Add upstream_fix-vtable-linking.diff to fix vtable linking

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lib/marble/TemplateDocument.cpp
95
95
    typedef QMap<QString, QString>::ConstIterator ConstIterator;
96
96
    ConstIterator end = d->templateEntries.constEnd();
97
97
    for (ConstIterator i = d->templateEntries.constBegin(); i != end; i++) {
98
 
        ready.replace("%" + i.key() + "%", i.value());
 
98
        ready.replace('%' + i.key() + '%', i.value());
99
99
    }
100
100
    d->processTemplateIncludes(ready);
101
101
    return ready;