Merged mainline.

5 files changed, 95 insertions, 0 deletions

diff --git a/examples/info-menumodel.cpp b/examples/info-menumodel.cpp
index d370731..a0bdb0a 100644
--- a/examples/info-menumodel.cpp
+++ b/examples/info-menumodel.cpp
@@ -1,4 +1,23 @@
 /*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Olivier Tilloy <olivier.tilloy@canonical.com>
+ */
+
+/*
  * Example executable that links against libqmenumodel to monitor
  * and print information about a menu model exported on D-Bus.
  */
diff --git a/examples/render-menumodel.qml b/examples/render-menumodel.qml
index d7c650e..7d8e0a1 100644
--- a/examples/render-menumodel.qml
+++ b/examples/render-menumodel.qml
@@ -1,3 +1,22 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Olivier Tilloy <olivier.tilloy@canonical.com>
+ */
+
 // This example QML application renders a menu model exposed on the session bus
 // under the well-known name com.canonical.testmenu and at the object path
 // /com/canonical/testmenu.
diff --git a/libqmenumodel/src/converter.cpp b/libqmenumodel/src/converter.cpp
index 526faba..d9d90bd 100644
--- a/libqmenumodel/src/converter.cpp
+++ b/libqmenumodel/src/converter.cpp
@@ -1,3 +1,22 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Renato Araujo Oliveira Filho <renato@canonical.com>
+ */
+
 extern "C" {
 #include <glib.h>
 }
diff --git a/tests/client/loadmodel.qml b/tests/client/loadmodel.qml
index 7a1f045..fcdb4ba 100644
--- a/tests/client/loadmodel.qml
+++ b/tests/client/loadmodel.qml
@@ -1,3 +1,22 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Renato Araujo Oliveira Filho <renato@canonical.com>
+ */
+
 import QtQuick 2.0
 import QMenuModel 0.1
 
diff --git a/tests/client/loadmodel2.qml b/tests/client/loadmodel2.qml
index dfe265d..4e283bb 100644
--- a/tests/client/loadmodel2.qml
+++ b/tests/client/loadmodel2.qml
@@ -1,3 +1,22 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Renato Araujo Oliveira Filho <renato@canonical.com>
+ */
+
 import QtQuick 2.0
 import QMenuModel 0.1