Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

21 files changed, 28 insertions, 28 deletions

diff --git a/examples/declarative/extending/adding/person.cpp b/examples/declarative/extending/adding/person.cpp
index 0035282..832bcdc 100644
--- a/examples/declarative/extending/adding/person.cpp
+++ b/examples/declarative/extending/adding/person.cpp
@@ -66,5 +66,5 @@ void Person::setShoeSize(int s)
     m_shoeSize = s;
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, Person, Person);
+QML_DEFINE_TYPE(People, 1,0, Person, Person);
 // ![0]
diff --git a/examples/declarative/extending/attached/birthdayparty.cpp b/examples/declarative/extending/attached/birthdayparty.cpp
index 58ea6a0..c1f0fe8 100644
--- a/examples/declarative/extending/attached/birthdayparty.cpp
+++ b/examples/declarative/extending/attached/birthdayparty.cpp
@@ -82,4 +82,4 @@ BirthdayPartyAttached *BirthdayParty::qmlAttachedProperties(QObject *object)
     return new BirthdayPartyAttached(object);
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, BirthdayParty, BirthdayParty);
+QML_DEFINE_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
diff --git a/examples/declarative/extending/attached/person.cpp b/examples/declarative/extending/attached/person.cpp
index a4138c7..8105ee7 100644
--- a/examples/declarative/extending/attached/person.cpp
+++ b/examples/declarative/extending/attached/person.cpp
@@ -113,11 +113,11 @@ Boy::Boy(QObject * parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, Boy, Boy);
+QML_DEFINE_TYPE(People, 1,0, Boy, Boy);
 
 Girl::Girl(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, Girl, Girl);
+QML_DEFINE_TYPE(People, 1,0, Girl, Girl);
diff --git a/examples/declarative/extending/binding/birthdayparty.cpp b/examples/declarative/extending/binding/birthdayparty.cpp
index cfa35c1..13d6bc8 100644
--- a/examples/declarative/extending/binding/birthdayparty.cpp
+++ b/examples/declarative/extending/binding/birthdayparty.cpp
@@ -103,4 +103,4 @@ BirthdayPartyAttached *BirthdayParty::qmlAttachedProperties(QObject *object)
     return new BirthdayPartyAttached(object);
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, BirthdayParty, BirthdayParty);
+QML_DEFINE_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
diff --git a/examples/declarative/extending/binding/happybirthday.cpp b/examples/declarative/extending/binding/happybirthday.cpp
index ffd6de4..9ce5a3d 100644
--- a/examples/declarative/extending/binding/happybirthday.cpp
+++ b/examples/declarative/extending/binding/happybirthday.cpp
@@ -84,4 +84,4 @@ void HappyBirthday::advance()
     m_target.write(m_lyrics.at(m_line));
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, HappyBirthday, HappyBirthday);
+QML_DEFINE_TYPE(People, 1,0, HappyBirthday, HappyBirthday);
diff --git a/examples/declarative/extending/binding/person.cpp b/examples/declarative/extending/binding/person.cpp
index a388452..6ad62e9 100644
--- a/examples/declarative/extending/binding/person.cpp
+++ b/examples/declarative/extending/binding/person.cpp
@@ -133,11 +133,11 @@ Boy::Boy(QObject * parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, Boy, Boy);
+QML_DEFINE_TYPE(People, 1,0, Boy, Boy);
 
 Girl::Girl(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, Girl, Girl);
+QML_DEFINE_TYPE(People, 1,0, Girl, Girl);
diff --git a/examples/declarative/extending/coercion/birthdayparty.cpp b/examples/declarative/extending/coercion/birthdayparty.cpp
index 81303aa..f3e0846 100644
--- a/examples/declarative/extending/coercion/birthdayparty.cpp
+++ b/examples/declarative/extending/coercion/birthdayparty.cpp
@@ -60,4 +60,4 @@ QmlList<Person *> *BirthdayParty::guests()
     return &m_guests;
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, BirthdayParty, BirthdayParty);
+QML_DEFINE_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
diff --git a/examples/declarative/extending/coercion/person.cpp b/examples/declarative/extending/coercion/person.cpp
index 9009612..a897d8d 100644
--- a/examples/declarative/extending/coercion/person.cpp
+++ b/examples/declarative/extending/coercion/person.cpp
@@ -75,12 +75,12 @@ Boy::Boy(QObject * parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, Boy, Boy);
+QML_DEFINE_TYPE(People, 1,0, Boy, Boy);
 
 Girl::Girl(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, Girl, Girl);
+QML_DEFINE_TYPE(People, 1,0, Girl, Girl);
 // ![1]
diff --git a/examples/declarative/extending/default/birthdayparty.cpp b/examples/declarative/extending/default/birthdayparty.cpp
index 81303aa..f3e0846 100644
--- a/examples/declarative/extending/default/birthdayparty.cpp
+++ b/examples/declarative/extending/default/birthdayparty.cpp
@@ -60,4 +60,4 @@ QmlList<Person *> *BirthdayParty::guests()
     return &m_guests;
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, BirthdayParty, BirthdayParty);
+QML_DEFINE_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
diff --git a/examples/declarative/extending/default/person.cpp b/examples/declarative/extending/default/person.cpp
index 2c93f5b..a5eafc4 100644
--- a/examples/declarative/extending/default/person.cpp
+++ b/examples/declarative/extending/default/person.cpp
@@ -72,11 +72,11 @@ Boy::Boy(QObject * parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, Boy, Boy);
+QML_DEFINE_TYPE(People, 1,0, Boy, Boy);
 
 Girl::Girl(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, Girl, Girl);
+QML_DEFINE_TYPE(People, 1,0, Girl, Girl);
diff --git a/examples/declarative/extending/extended/lineedit.cpp b/examples/declarative/extending/extended/lineedit.cpp
index c6015ff..8a31004 100644
--- a/examples/declarative/extending/extended/lineedit.cpp
+++ b/examples/declarative/extending/extended/lineedit.cpp
@@ -103,4 +103,4 @@ void LineEditExtension::setBottomMargin(int m)
 }
 
 QML_DECLARE_TYPE(QLineEdit);
-QML_DEFINE_EXTENDED_TYPE(People, 1, 0, 0, QLineEdit, QLineEdit, LineEditExtension);
+QML_DEFINE_EXTENDED_TYPE(People, 1,0, QLineEdit, QLineEdit, LineEditExtension);
diff --git a/examples/declarative/extending/grouped/birthdayparty.cpp b/examples/declarative/extending/grouped/birthdayparty.cpp
index 81303aa..f3e0846 100644
--- a/examples/declarative/extending/grouped/birthdayparty.cpp
+++ b/examples/declarative/extending/grouped/birthdayparty.cpp
@@ -60,4 +60,4 @@ QmlList<Person *> *BirthdayParty::guests()
     return &m_guests;
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, BirthdayParty, BirthdayParty);
+QML_DEFINE_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
diff --git a/examples/declarative/extending/grouped/person.cpp b/examples/declarative/extending/grouped/person.cpp
index a4138c7..8105ee7 100644
--- a/examples/declarative/extending/grouped/person.cpp
+++ b/examples/declarative/extending/grouped/person.cpp
@@ -113,11 +113,11 @@ Boy::Boy(QObject * parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, Boy, Boy);
+QML_DEFINE_TYPE(People, 1,0, Boy, Boy);
 
 Girl::Girl(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, Girl, Girl);
+QML_DEFINE_TYPE(People, 1,0, Girl, Girl);
diff --git a/examples/declarative/extending/properties/birthdayparty.cpp b/examples/declarative/extending/properties/birthdayparty.cpp
index 0e82b87..b98a691 100644
--- a/examples/declarative/extending/properties/birthdayparty.cpp
+++ b/examples/declarative/extending/properties/birthdayparty.cpp
@@ -62,4 +62,4 @@ QmlList<Person *> *BirthdayParty::guests()
 }
 // ![0]
 
-QML_DEFINE_TYPE(People, 1, 0, 0, BirthdayParty, BirthdayParty);
+QML_DEFINE_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
diff --git a/examples/declarative/extending/properties/person.cpp b/examples/declarative/extending/properties/person.cpp
index 764e159..b41d0b6 100644
--- a/examples/declarative/extending/properties/person.cpp
+++ b/examples/declarative/extending/properties/person.cpp
@@ -65,4 +65,4 @@ void Person::setShoeSize(int s)
     m_shoeSize = s;
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, Person, Person);
+QML_DEFINE_TYPE(People, 1,0, Person, Person);
diff --git a/examples/declarative/extending/signal/birthdayparty.cpp b/examples/declarative/extending/signal/birthdayparty.cpp
index 49072e0..178ce0e 100644
--- a/examples/declarative/extending/signal/birthdayparty.cpp
+++ b/examples/declarative/extending/signal/birthdayparty.cpp
@@ -88,4 +88,4 @@ BirthdayPartyAttached *BirthdayParty::qmlAttachedProperties(QObject *object)
     return new BirthdayPartyAttached(object);
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, BirthdayParty, BirthdayParty);
+QML_DEFINE_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
diff --git a/examples/declarative/extending/signal/person.cpp b/examples/declarative/extending/signal/person.cpp
index a4138c7..8105ee7 100644
--- a/examples/declarative/extending/signal/person.cpp
+++ b/examples/declarative/extending/signal/person.cpp
@@ -113,11 +113,11 @@ Boy::Boy(QObject * parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, Boy, Boy);
+QML_DEFINE_TYPE(People, 1,0, Boy, Boy);
 
 Girl::Girl(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, Girl, Girl);
+QML_DEFINE_TYPE(People, 1,0, Girl, Girl);
diff --git a/examples/declarative/extending/valuesource/birthdayparty.cpp b/examples/declarative/extending/valuesource/birthdayparty.cpp
index c2e8346..b0472d0 100644
--- a/examples/declarative/extending/valuesource/birthdayparty.cpp
+++ b/examples/declarative/extending/valuesource/birthdayparty.cpp
@@ -98,4 +98,4 @@ BirthdayPartyAttached *BirthdayParty::qmlAttachedProperties(QObject *object)
     return new BirthdayPartyAttached(object);
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, BirthdayParty, BirthdayParty);
+QML_DEFINE_TYPE(People, 1,0, BirthdayParty, BirthdayParty);
diff --git a/examples/declarative/extending/valuesource/happybirthday.cpp b/examples/declarative/extending/valuesource/happybirthday.cpp
index 8c9763b..b453944 100644
--- a/examples/declarative/extending/valuesource/happybirthday.cpp
+++ b/examples/declarative/extending/valuesource/happybirthday.cpp
@@ -79,4 +79,4 @@ void HappyBirthday::advance()
     m_target.write(m_lyrics.at(m_line));
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, HappyBirthday, HappyBirthday);
+QML_DEFINE_TYPE(People, 1,0, HappyBirthday, HappyBirthday);
diff --git a/examples/declarative/extending/valuesource/person.cpp b/examples/declarative/extending/valuesource/person.cpp
index a4138c7..8105ee7 100644
--- a/examples/declarative/extending/valuesource/person.cpp
+++ b/examples/declarative/extending/valuesource/person.cpp
@@ -113,11 +113,11 @@ Boy::Boy(QObject * parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, Boy, Boy);
+QML_DEFINE_TYPE(People, 1,0, Boy, Boy);
 
 Girl::Girl(QObject * parent)
 : Person(parent)
 {
 }
 
-QML_DEFINE_TYPE(People, 1, 0, 0, Girl, Girl);
+QML_DEFINE_TYPE(People, 1,0, Girl, Girl);
diff --git a/examples/declarative/loader/qmlfolderlistmodel.cpp b/examples/declarative/loader/qmlfolderlistmodel.cpp
index a90ff61..14d2324 100644
--- a/examples/declarative/loader/qmlfolderlistmodel.cpp
+++ b/examples/declarative/loader/qmlfolderlistmodel.cpp
@@ -382,7 +382,7 @@ void  QmlFolderListModel::setShowOnlyReadable(bool on)
 }
 
 
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,FolderListModel,QmlFolderListModel)
+QML_DEFINE_TYPE(Qt,4,6,FolderListModel,QmlFolderListModel)
 
 QT_END_NAMESPACE