← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/plugins/declarative/MarbleDeclarativeObject.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/plugins/declarative/MarbleDeclarativeObject.cpp
5
5
// find a copy of this license in LICENSE.txt in the top directory of
6
6
// the source code.
7
7
//
8
 
// Copyright 2012      Dennis Nienhüser <earthwings@gentoo.org>
 
8
// Copyright 2012      Dennis Nienhüser <nienhueser@kde.org>
9
9
//
10
10
 
11
11
#include "MarbleDeclarativeObject.h"
56
56
    return false;
57
57
}
58
58
 
59
 
#include "MarbleDeclarativeObject.moc"
 
59
#include "moc_MarbleDeclarativeObject.cpp"