From 162dd1adb3e6369e85af09f34dc56b70eeb43f4c Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Mon, 22 Jun 2009 10:13:48 +1000
Subject: Only objects or lists of objects can be default properties.

---
 src/declarative/extra/qmlsqlconnection.cpp | 1 -
 src/declarative/extra/qmlsqlconnection.h   | 1 -
 src/declarative/extra/qmlsqlquery.cpp      | 1 -
 src/declarative/extra/qmlsqlquery.h        | 2 --
 src/declarative/fx/qfxtext.cpp             | 1 -
 src/declarative/fx/qfxtext.h               | 1 -
 src/declarative/fx/qfxtextedit.cpp         | 1 -
 src/declarative/util/qmlconnection.h       | 1 -
 8 files changed, 9 deletions(-)

diff --git a/src/declarative/extra/qmlsqlconnection.cpp b/src/declarative/extra/qmlsqlconnection.cpp
index a329f3c..5cf572b 100644
--- a/src/declarative/extra/qmlsqlconnection.cpp
+++ b/src/declarative/extra/qmlsqlconnection.cpp
@@ -92,7 +92,6 @@ public:
 
 /*!
     \qmlproperty QString SqlConnection::name
-    \default
 
     Defines the connection's name.  The name allows the connection to be
     retrieved using the connection property of SqlQuery or when
diff --git a/src/declarative/extra/qmlsqlconnection.h b/src/declarative/extra/qmlsqlconnection.h
index 306db8d..ede8bcb 100644
--- a/src/declarative/extra/qmlsqlconnection.h
+++ b/src/declarative/extra/qmlsqlconnection.h
@@ -67,7 +67,6 @@ class Q_DECLARATIVE_EXPORT QmlSqlConnection : public QObject, public QmlParserSt
     Q_PROPERTY(QString userName READ userName WRITE setUserName)
     Q_PROPERTY(QString password READ password WRITE setPassword)
     Q_PROPERTY(QString lastError READ lastError)
-    Q_CLASSINFO("DefaultProperty", "name")
 public:
     QmlSqlConnection(QObject *parent = 0);
     ~QmlSqlConnection();
diff --git a/src/declarative/extra/qmlsqlquery.cpp b/src/declarative/extra/qmlsqlquery.cpp
index 82ac50062..2b11774 100644
--- a/src/declarative/extra/qmlsqlquery.cpp
+++ b/src/declarative/extra/qmlsqlquery.cpp
@@ -290,7 +290,6 @@ public:
 
 /*!
     \qmlproperty QString SqlQuery::query
-    \default
 
     Defines the query text.
 */
diff --git a/src/declarative/extra/qmlsqlquery.h b/src/declarative/extra/qmlsqlquery.h
index 7aa0709..06ade08 100644
--- a/src/declarative/extra/qmlsqlquery.h
+++ b/src/declarative/extra/qmlsqlquery.h
@@ -96,8 +96,6 @@ class Q_DECLARATIVE_EXPORT QmlSqlQuery : public QListModelInterface, public QmlP
     Q_PROPERTY(QString lastError READ lastError)
     
     Q_PROPERTY(QmlList<QmlSqlBind *> *bindings READ bindings)
-
-    Q_CLASSINFO("DefaultProperty", "query")
 public:
     QmlSqlQuery(QObject *parent = 0);
     ~QmlSqlQuery();
diff --git a/src/declarative/fx/qfxtext.cpp b/src/declarative/fx/qfxtext.cpp
index 031c0f8..9550af9 100644
--- a/src/declarative/fx/qfxtext.cpp
+++ b/src/declarative/fx/qfxtext.cpp
@@ -183,7 +183,6 @@ void QFxText::setText(const QString &n)
 
 /*!
     \qmlproperty string Text::text
-    \default
 
     The text to display.  Text supports both plain and rich text strings.
 
diff --git a/src/declarative/fx/qfxtext.h b/src/declarative/fx/qfxtext.h
index 99ab2be..b929a6f 100644
--- a/src/declarative/fx/qfxtext.h
+++ b/src/declarative/fx/qfxtext.h
@@ -69,7 +69,6 @@ class Q_DECLARATIVE_EXPORT QFxText : public QFxItem
     Q_PROPERTY(bool wrap READ wrap WRITE setWrap)
     Q_PROPERTY(Qt::TextElideMode elide READ elideMode WRITE setElideMode)
     Q_PROPERTY(QString activeLink READ activeLink)
-    Q_CLASSINFO("DefaultProperty", "text")
 
 public:
     QFxText(QFxItem *parent=0);
diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp
index 5f2f36c..03dd63f 100644
--- a/src/declarative/fx/qfxtextedit.cpp
+++ b/src/declarative/fx/qfxtextedit.cpp
@@ -138,7 +138,6 @@ QString QFxTextEdit::text() const
 
 /*!
     \qmlproperty string TextEdit::text
-    \default
 
     The text to display.  If the text format is AutoText the text edit will
     automatically determine whether the text should be treated as
diff --git a/src/declarative/util/qmlconnection.h b/src/declarative/util/qmlconnection.h
index 4350123..d61659f 100644
--- a/src/declarative/util/qmlconnection.h
+++ b/src/declarative/util/qmlconnection.h
@@ -61,7 +61,6 @@ class Q_DECLARATIVE_EXPORT QmlConnection : public QObject, public QmlParserStatu
     Q_DECLARE_PRIVATE(QmlConnection)
 
     Q_INTERFACES(QmlParserStatus)
-    Q_CLASSINFO("DefaultProperty", "script")
     Q_PROPERTY(QObject *sender READ signalSender WRITE setSignalSender)
     Q_PROPERTY(QString script READ script WRITE setScript)
     Q_PROPERTY(QString signal READ signal WRITE setSignal)
-- 
cgit v0.12