summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/src/declarative/effects.qdoc29
-rw-r--r--doc/src/declarative/qmlreference.qdoc1
-rw-r--r--doc/src/declarative/qtdeclarative.qdoc1
-rw-r--r--examples/declarative/extending/properties/birthdayparty.cpp25
-rw-r--r--examples/declarative/extending/properties/birthdayparty.h35
-rw-r--r--src/declarative/3rdparty/qlistmodelinterface.cpp1
-rw-r--r--src/declarative/fx/qfxgridview.cpp21
-rw-r--r--src/declarative/fx/qfxitem.cpp55
-rw-r--r--src/declarative/fx/qfxlistview.cpp12
-rw-r--r--src/declarative/fx/qfxloader.cpp7
-rw-r--r--src/declarative/fx/qfxmouseregion.cpp4
-rw-r--r--src/declarative/qml/qmlcontext.cpp9
-rw-r--r--src/declarative/qml/qmlengine.cpp9
-rw-r--r--src/declarative/qml/qmlengine.h1
-rw-r--r--src/declarative/qml/qmlmetaproperty.cpp4
-rw-r--r--src/declarative/util/qfxview.cpp4
-rw-r--r--src/declarative/util/qfxview.h3
-rw-r--r--tools/qdoc3/test/classic.css39
18 files changed, 99 insertions, 161 deletions
diff --git a/doc/src/declarative/effects.qdoc b/doc/src/declarative/effects.qdoc
deleted file mode 100644
index 7879260..0000000
--- a/doc/src/declarative/effects.qdoc
+++ /dev/null
@@ -1,29 +0,0 @@
-/*!
-\page effects.html
-\target qmleffects
-\title Visual Effects
-
-\section1 Basic Effects
-
-\list
-\o Scaling (\l Item \bold scale property)
-\o Opacity (\l Item \bold opacity property)
-\o Rotation (\l Item \bold rotation property)
-\o Affine Transforms (\l Squish)
-\endlist
-
-\section1 Advanced Effects
-
-These effects are currently only supported by the OpenGL canvas
-backend. Support for other backends may be added if the performance
-can be made acceptable.
-
-\list
-\o \l Shadow
-\o \l Blur
-\o \l Reflection
-\o \l Highlight
-\o \l Particles
-\endlist
-
-*/
diff --git a/doc/src/declarative/qmlreference.qdoc b/doc/src/declarative/qmlreference.qdoc
index cbd086c..da955dc 100644
--- a/doc/src/declarative/qmlreference.qdoc
+++ b/doc/src/declarative/qmlreference.qdoc
@@ -29,7 +29,6 @@
\o \l {binding}{Data Binding}
\o \l {anchor-layout}{Layout Anchors}
\o \l {qmlanimation}{Animation}
- \o \l {qmleffects}{Visual Effects}
\o \l {components}{Components}
\o \l {qmlmodules}{Modules}
\o \l {qmlfocus}{Keyboard Focus}
diff --git a/doc/src/declarative/qtdeclarative.qdoc b/doc/src/declarative/qtdeclarative.qdoc
index c5d32fe..ccfe4a6 100644
--- a/doc/src/declarative/qtdeclarative.qdoc
+++ b/doc/src/declarative/qtdeclarative.qdoc
@@ -73,7 +73,6 @@
\o \l {binding}{Data Binding}
\o \l {anchor-layout}{Layout Anchors}
\o \l {qmlanimation}{Animation}
- \o \l {qmleffects}{Visual Effects}
\o \l {qmlmodules}{Modules}
\o \l {qmlfocus}{Keyboard Focus}
\o \l {Extending types from QML}
diff --git a/examples/declarative/extending/properties/birthdayparty.cpp b/examples/declarative/extending/properties/birthdayparty.cpp
new file mode 100644
index 0000000..92bc3ba
--- /dev/null
+++ b/examples/declarative/extending/properties/birthdayparty.cpp
@@ -0,0 +1,25 @@
+#include "birthdayparty.h"
+
+BirthdayParty::BirthdayParty(QObject *parent)
+: QObject(parent), m_celebrant(0)
+{
+}
+
+// ![0]
+Person *BirthdayParty::celebrant() const
+{
+ return m_celebrant;
+}
+
+void BirthdayParty::setCelebrant(Person *c)
+{
+ m_celebrant = c;
+}
+
+QmlList<Person *> *BirthdayParty::guests()
+{
+ return &m_guests;
+}
+// ![0]
+
+QML_DEFINE_TYPE(People, 1, 0, 0, BirthdayParty, BirthdayParty);
diff --git a/examples/declarative/extending/properties/birthdayparty.h b/examples/declarative/extending/properties/birthdayparty.h
new file mode 100644
index 0000000..1804980
--- /dev/null
+++ b/examples/declarative/extending/properties/birthdayparty.h
@@ -0,0 +1,35 @@
+#ifndef BIRTHDAYPARTY_H
+#define BIRTHDAYPARTY_H
+
+#include <QObject>
+#include <qml.h>
+#include "person.h"
+
+// ![0]
+class BirthdayParty : public QObject
+{
+Q_OBJECT
+// ![0]
+// ![1]
+Q_PROPERTY(Person *celebrant READ celebrant WRITE setCelebrant)
+// ![1]
+// ![2]
+Q_PROPERTY(QmlList<Person *> *guests READ guests)
+// ![2]
+// ![3]
+public:
+ BirthdayParty(QObject *parent = 0);
+
+ Person *celebrant() const;
+ void setCelebrant(Person *);
+
+ QmlList<Person *> *guests();
+
+private:
+ Person *m_celebrant;
+ QmlConcreteList<Person *> m_guests;
+};
+QML_DECLARE_TYPE(BirthdayParty);
+// ![3]
+
+#endif // BIRTHDAYPARTY_H
diff --git a/src/declarative/3rdparty/qlistmodelinterface.cpp b/src/declarative/3rdparty/qlistmodelinterface.cpp
index 75960a1..4213ff2 100644
--- a/src/declarative/3rdparty/qlistmodelinterface.cpp
+++ b/src/declarative/3rdparty/qlistmodelinterface.cpp
@@ -44,6 +44,7 @@
QT_BEGIN_NAMESPACE
/*!
+ \internal
\class QListModelInterface
\brief The QListModelInterface class can be subclassed to provide C++ models to QFx Views
diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp
index 6c5a712..28f2219 100644
--- a/src/declarative/fx/qfxgridview.cpp
+++ b/src/declarative/fx/qfxgridview.cpp
@@ -1028,18 +1028,12 @@ void QFxGridView::sizeChange()
}
}
-/*!
- \reimp
-*/
void QFxGridView::viewportMoved()
{
QFxFlickable::viewportMoved();
refill();
}
-/*!
- \reimp
-*/
qreal QFxGridView::minYExtent() const
{
Q_D(const QFxGridView);
@@ -1048,9 +1042,6 @@ qreal QFxGridView::minYExtent() const
return -d->startPosition();
}
-/*!
- \reimp
-*/
qreal QFxGridView::maxYExtent() const
{
Q_D(const QFxGridView);
@@ -1059,9 +1050,6 @@ qreal QFxGridView::maxYExtent() const
return -(d->endPosition() - height());
}
-/*!
- \reimp
-*/
qreal QFxGridView::minXExtent() const
{
Q_D(const QFxGridView);
@@ -1070,9 +1058,6 @@ qreal QFxGridView::minXExtent() const
return -d->startPosition();
}
-/*!
- \reimp
-*/
qreal QFxGridView::maxXExtent() const
{
Q_D(const QFxGridView);
@@ -1081,9 +1066,6 @@ qreal QFxGridView::maxXExtent() const
return -(d->endPosition() - height());
}
-/*!
- \reimp
-*/
void QFxGridView::keyPressEvent(QKeyEvent *event)
{
Q_D(QFxGridView);
@@ -1131,9 +1113,6 @@ void QFxGridView::keyPressEvent(QKeyEvent *event)
QFxFlickable::keyPressEvent(event);
}
-/*!
- \reimp
-*/
void QFxGridView::componentComplete()
{
Q_D(QFxGridView);
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index cca21b9..4ec0a85 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -893,18 +893,6 @@ QFxKeysAttached *QFxKeysAttached::qmlAttachedProperties(QObject *obj)
*/
/*!
- \fn void QFxItem::hcenterChanged()
-
- This signal is emitted when the horizontal center coordinate of the item changes.
-*/
-
-/*!
- \fn void QFxItem::vcenterChanged()
-
- This signal is emitted when the vertical center coordinate of the item changes.
-*/
-
-/*!
\fn void QFxItem::stateChanged(const QString &state)
This signal is emitted when the \a state of the item changes.
@@ -1334,27 +1322,6 @@ void QFxItem::setClip(bool c)
*/
/*!
- \property QFxItem::x
-
- The x coordinate of the item relative to its parent.
-*/
-
-/*!
- \property QFxItem::y
-
- The y coordinate of the item relative to its parent.
-*/
-
-/*!
- \property QFxItem::z
-
- The z coordinate of the item relative to its parent.
-
- A negative z coordinate means the item will be painted below its parent.
-*/
-
-
-/*!
\qmlproperty real Item::z
Sets the stacking order of the item. By default the stacking order is 0.
@@ -1977,12 +1944,7 @@ QmlList<QmlTransition *>* QFxItem::transitions()
return d->states()->transitionsProperty();
}
-/*!
- \internal
- \property QFxItem::filter
-*/
-
-/*!
+/*
\qmlproperty list<Filter> Item::filter
This property holds a list of graphical filters to be applied to the item.
@@ -2205,11 +2167,17 @@ QPointF QFxItemPrivate::computeTransformOrigin() const
}
}
+/*!
+ \reimp
+*/
bool QFxItem::sceneEvent(QEvent *event)
{
return QGraphicsItem::sceneEvent(event);
}
+/*!
+ \reimp
+*/
QVariant QFxItem::itemChange(GraphicsItemChange change,
const QVariant &value)
{
@@ -2220,6 +2188,9 @@ QVariant QFxItem::itemChange(GraphicsItemChange change,
return QGraphicsItem::itemChange(change, value);
}
+/*!
+ \reimp
+*/
QRectF QFxItem::boundingRect() const
{
Q_D(const QFxItem);
@@ -2441,10 +2412,16 @@ bool QFxItem::hasActiveFocus() const
return QGraphicsItem::hasFocus();
}
+/*!
+ \reimp
+*/
void QFxItem::paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *)
{
}
+/*!
+ \reimp
+*/
bool QFxItem::event(QEvent *ev)
{
return QGraphicsObject::event(ev);
diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qfxlistview.cpp
index 0232717..b6301f6 100644
--- a/src/declarative/fx/qfxlistview.cpp
+++ b/src/declarative/fx/qfxlistview.cpp
@@ -1260,9 +1260,6 @@ void QFxListView::viewportMoved()
}
}
-/*!
- \reimp
-*/
qreal QFxListView::minYExtent() const
{
Q_D(const QFxListView);
@@ -1275,9 +1272,6 @@ qreal QFxListView::minYExtent() const
return extent;
}
-/*!
- \reimp
-*/
qreal QFxListView::maxYExtent() const
{
Q_D(const QFxListView);
@@ -1294,9 +1288,6 @@ qreal QFxListView::maxYExtent() const
return extent;
}
-/*!
- \reimp
-*/
qreal QFxListView::minXExtent() const
{
Q_D(const QFxListView);
@@ -1309,9 +1300,6 @@ qreal QFxListView::minXExtent() const
return extent;
}
-/*!
- \reimp
-*/
qreal QFxListView::maxXExtent() const
{
Q_D(const QFxListView);
diff --git a/src/declarative/fx/qfxloader.cpp b/src/declarative/fx/qfxloader.cpp
index 6d06ee9..95ddae3 100644
--- a/src/declarative/fx/qfxloader.cpp
+++ b/src/declarative/fx/qfxloader.cpp
@@ -85,13 +85,6 @@ QFxLoader::~QFxLoader()
}
/*!
- \internal
- \fn void QFxItem::sourceChanged()
- This signal is emitted whenever the item's dynamic QML
- source url changes.
- */
-
-/*!
\qmlproperty url Loader::source
This property holds the dynamic URL of the QML for the item.
diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qfxmouseregion.cpp
index 1da3c69..858764a 100644
--- a/src/declarative/fx/qfxmouseregion.cpp
+++ b/src/declarative/fx/qfxmouseregion.cpp
@@ -481,8 +481,8 @@ void QFxMouseRegion::timerEvent(QTimerEvent *event)
\qmlproperty bool MouseRegion::containsMouse
This property holds whether the mouse is currently inside the mouse region.
- \warning This property is only partially implemented -- it is only valid when the mouse is moved over the
- region. If the region moves under the mouse, \e containsMouse will not change.
+ \warning This property is not updated if the region moves under the mouse: \e containsMouse will not change.
+ In addition, if hoverEnabled is false, containsMouse will only be valid when the mouse is pressed.
*/
bool QFxMouseRegion::hovered() const
{
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index 365c0e8..61850c3 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -339,7 +339,7 @@ QmlContext *QmlContext::parentContext() const
}
/*!
- Add a default \a object to this context. The object will be added after
+ Add \a defaultObject to this context. The object will be added after
any existing default objects.
*/
void QmlContext::addDefaultObject(QObject *defaultObject)
@@ -417,7 +417,7 @@ void QmlContext::setContextProperty(const QString &name, QObject *value)
Resolves the URL \a src relative to the URL of the
containing component.
- \sa QmlEngine::componentUrl(), setBaseUrl()
+ \sa QmlEngine::baseUrl(), setBaseUrl()
*/
QUrl QmlContext::resolvedUrl(const QUrl &src)
{
@@ -441,13 +441,12 @@ QUrl QmlContext::resolvedUrl(const QUrl &src)
}
/*!
- Explicitly sets the url both resolveUri() and resolveUrl() will
- use for relative references to \a baseUrl.
+ Explicitly sets the url resolveUrl() will use for relative references to \a baseUrl.
Calling this function will override the url of the containing
component used by default.
- \sa resolvedUrl(), resolvedUri()
+ \sa resolvedUrl()
*/
void QmlContext::setBaseUrl(const QUrl &baseUrl)
{
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 558bd49..52fd0b7 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -532,15 +532,6 @@ void QmlDeclarativeData::destroyed(QObject *object)
delete this;
}
-/*! \internal */
-/*
-QScriptEngine *QmlEngine::scriptEngine()
-{
- Q_D(QmlEngine);
- return &d->scriptEngine;
-}
-*/
-
/*!
Creates a QScriptValue allowing you to use \a object in QML script.
\a engine is the QmlEngine it is to be created in.
diff --git a/src/declarative/qml/qmlengine.h b/src/declarative/qml/qmlengine.h
index 6066059..8caa505 100644
--- a/src/declarative/qml/qmlengine.h
+++ b/src/declarative/qml/qmlengine.h
@@ -74,7 +74,6 @@ public:
void clearComponentCache();
-
void addImportPath(const QString& dir);
void setNetworkAccessManager(QNetworkAccessManager *);
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index e69746e..99f9f0c 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -540,10 +540,10 @@ QmlAbstractBinding *QmlMetaProperty::binding() const
}
/*!
- Set the binding associated with this property to \a binding. Returns
+ Set the binding associated with this property to \a newBinding. Returns
the existing binding (if any), otherwise 0.
- \a binding will be enabled, and the returned binding (if any) will be
+ \a newBinding will be enabled, and the returned binding (if any) will be
disabled.
*/
QmlAbstractBinding *
diff --git a/src/declarative/util/qfxview.cpp b/src/declarative/util/qfxview.cpp
index 2c02cee..3acbf56 100644
--- a/src/declarative/util/qfxview.cpp
+++ b/src/declarative/util/qfxview.cpp
@@ -310,8 +310,8 @@ void QFxView::continueExecute()
This signal is emitted when the view is resized to \a size.
*/
-/*! \fn void QFxView::error(const QList<QmlError> &errors)
- This signal is emitted when the qml loaded contains errors.
+/*! \fn void QFxView::errors(const QList<QmlError> &errors)
+ This signal is emitted when the qml loaded contains \a errors.
*/
/*!
diff --git a/src/declarative/util/qfxview.h b/src/declarative/util/qfxview.h
index 03557a3..25e2997 100644
--- a/src/declarative/util/qfxview.h
+++ b/src/declarative/util/qfxview.h
@@ -62,7 +62,8 @@ class QmlError;
class QFxViewPrivate;
class Q_DECLARATIVE_EXPORT QFxView : public QGraphicsView
{
-Q_OBJECT
+ Q_OBJECT
+ Q_PROPERTY(bool contentResizable READ contentResizable WRITE setContentResizable)
public:
explicit QFxView(QWidget *parent = 0);
diff --git a/tools/qdoc3/test/classic.css b/tools/qdoc3/test/classic.css
index f97bdbe..b02edec 100644
--- a/tools/qdoc3/test/classic.css
+++ b/tools/qdoc3/test/classic.css
@@ -251,45 +251,26 @@ span.string,span.char
.qmlname {
white-space: nowrap;
- font-weight: bold;
- font-size: 125%;
}
.qmltype {
- font-weight: bold;
- font-size: 125%;
-}
-
-.qmlproto, .qmldoc {
- // border-top: 1px solid #84b0c7;
+ // font-weight: bold;
+ text-align: center;
+ font-size: 160%;
}
.qmlproto {
- padding: 0;
- //background-color: #e4e4e4;//#d5e1e8;
- //font-weight: bold;
- //-webkit-border-top-left-radius: 8px;
- //-webkit-border-top-right-radius: 8px;
- //-moz-border-radius-topleft: 8px;
- //-moz-border-radius-topright: 8px;
+ background-color: #eee;
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ddd;
+ font-weight: bold;
+ padding: 6px 0px 6px 10px;
+ margin: 42px 0px 0px 0px;
}
.qmldoc {
- border-top: 1px solid #e4e4e4;
- //padding: 2px 5px;
- //background-color: #eef3f5;
- //border-top-width: 0;
- //-webkit-border-bottom-left-radius: 8px;
- //-webkit-border-bottom-right-radius: 8px;
- //-moz-border-radius-bottomleft: 8px;
- //-moz-border-radius-bottomright: 8px;
-}
-
-.qmldoc p, .qmldoc dl, .qmldoc ul {
- //margin: 6px 0;
}
*.qmlitem p {
- //margin-top: 0px;
- //margin-bottom: 0px;
}
generated by cgit v0.12 at 2025-08-05 09:23:57 (GMT)