Merge master <-> api_changes

Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f

9 files changed, 9 insertions, 9 deletions

diff --git a/examples/qml/cppextensions/referenceexamples/attached/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/attached/birthdayparty.cpp
index 6b784fdccd..c4f906119a 100644
--- a/examples/qml/cppextensions/referenceexamples/attached/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/attached/birthdayparty.cpp
@@ -69,7 +69,7 @@ void BirthdayParty::setHost(Person *c)
     m_host = c;
 }
 
-QQmlListProperty<Person> BirthdayParty::guests() 
+QQmlListProperty<Person> BirthdayParty::guests()
 {
     return QQmlListProperty<Person>(this, m_guests);
 }
diff --git a/examples/qml/cppextensions/referenceexamples/binding/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/binding/birthdayparty.cpp
index 9a38c3b646..62499862f0 100644
--- a/examples/qml/cppextensions/referenceexamples/binding/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/binding/birthdayparty.cpp
@@ -75,7 +75,7 @@ void BirthdayParty::setHost(Person *c)
     emit hostChanged();
 }
 
-QQmlListProperty<Person> BirthdayParty::guests() 
+QQmlListProperty<Person> BirthdayParty::guests()
 {
     return QQmlListProperty<Person>(this, m_guests);
 }
diff --git a/examples/qml/cppextensions/referenceexamples/coercion/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/coercion/birthdayparty.cpp
index d697ac22b6..e15ffe1604 100644
--- a/examples/qml/cppextensions/referenceexamples/coercion/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/coercion/birthdayparty.cpp
@@ -54,7 +54,7 @@ void BirthdayParty::setHost(Person *c)
     m_host = c;
 }
 
-QQmlListProperty<Person> BirthdayParty::guests() 
+QQmlListProperty<Person> BirthdayParty::guests()
 {
     return QQmlListProperty<Person>(this, m_guests);
 }
diff --git a/examples/qml/cppextensions/referenceexamples/default/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/default/birthdayparty.cpp
index d697ac22b6..e15ffe1604 100644
--- a/examples/qml/cppextensions/referenceexamples/default/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/default/birthdayparty.cpp
@@ -54,7 +54,7 @@ void BirthdayParty::setHost(Person *c)
     m_host = c;
 }
 
-QQmlListProperty<Person> BirthdayParty::guests() 
+QQmlListProperty<Person> BirthdayParty::guests()
 {
     return QQmlListProperty<Person>(this, m_guests);
 }
diff --git a/examples/qml/cppextensions/referenceexamples/grouped/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/grouped/birthdayparty.cpp
index d697ac22b6..e15ffe1604 100644
--- a/examples/qml/cppextensions/referenceexamples/grouped/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/grouped/birthdayparty.cpp
@@ -54,7 +54,7 @@ void BirthdayParty::setHost(Person *c)
     m_host = c;
 }
 
-QQmlListProperty<Person> BirthdayParty::guests() 
+QQmlListProperty<Person> BirthdayParty::guests()
 {
     return QQmlListProperty<Person>(this, m_guests);
 }
diff --git a/examples/qml/cppextensions/referenceexamples/methods/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/methods/birthdayparty.cpp
index 0935d708a7..c96f41d944 100644
--- a/examples/qml/cppextensions/referenceexamples/methods/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/methods/birthdayparty.cpp
@@ -55,7 +55,7 @@ void BirthdayParty::setHost(Person *c)
     m_host = c;
 }
 
-QQmlListProperty<Person> BirthdayParty::guests() 
+QQmlListProperty<Person> BirthdayParty::guests()
 {
     return QQmlListProperty<Person>(this, m_guests);
 }
diff --git a/examples/qml/cppextensions/referenceexamples/properties/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/properties/birthdayparty.cpp
index f7280560ab..8e79d07748 100644
--- a/examples/qml/cppextensions/referenceexamples/properties/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/properties/birthdayparty.cpp
@@ -55,7 +55,7 @@ void BirthdayParty::setHost(Person *c)
     m_host = c;
 }
 
-QQmlListProperty<Person> BirthdayParty::guests() 
+QQmlListProperty<Person> BirthdayParty::guests()
 {
     return QQmlListProperty<Person>(this, m_guests);
 }
diff --git a/examples/qml/cppextensions/referenceexamples/signal/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/signal/birthdayparty.cpp
index 078c5f9a2d..b9f7e15907 100644
--- a/examples/qml/cppextensions/referenceexamples/signal/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/signal/birthdayparty.cpp
@@ -70,7 +70,7 @@ void BirthdayParty::setHost(Person *c)
     m_host = c;
 }
 
-QQmlListProperty<Person> BirthdayParty::guests() 
+QQmlListProperty<Person> BirthdayParty::guests()
 {
     return QQmlListProperty<Person>(this, m_guests);
 }
diff --git a/examples/qml/cppextensions/referenceexamples/valuesource/birthdayparty.cpp b/examples/qml/cppextensions/referenceexamples/valuesource/birthdayparty.cpp
index a69a58557e..aa8bc77116 100644
--- a/examples/qml/cppextensions/referenceexamples/valuesource/birthdayparty.cpp
+++ b/examples/qml/cppextensions/referenceexamples/valuesource/birthdayparty.cpp
@@ -70,7 +70,7 @@ void BirthdayParty::setHost(Person *c)
     m_host = c;
 }
 
-QQmlListProperty<Person> BirthdayParty::guests() 
+QQmlListProperty<Person> BirthdayParty::guests()
 {
     return QQmlListProperty<Person>(this, m_guests);
 }