From 0a0f307f92659c3758a87104b94c8325a3a3b9ad Mon Sep 17 00:00:00 2001 From: Aaron Kennedy Date: Thu, 30 Jul 2009 17:42:09 +1000 Subject: Revert "qdoc: Corrected some qdoc warnings." This reverts commit 6df2e157391dd812ee8b71c2373411f2580117d1. Conflicts: src/corelib/animation/qabstractanimation.cpp src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qparallelanimationgroup.cpp src/corelib/animation/qpauseanimation.cpp src/corelib/animation/qpropertyanimation.cpp src/corelib/animation/qsequentialanimationgroup.cpp src/declarative/qml/qmlcontext.cpp --- doc/src/snippets/qprocess-environment/main.cpp | 2 +- src/3rdparty/easing/legal.qdoc | 2 +- src/corelib/animation/qvariantanimation.cpp | 2 +- src/declarative/qml/qmlcontext.cpp | 8 +++----- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/doc/src/snippets/qprocess-environment/main.cpp b/doc/src/snippets/qprocess-environment/main.cpp index baca968..96d1e9e 100644 --- a/doc/src/snippets/qprocess-environment/main.cpp +++ b/doc/src/snippets/qprocess-environment/main.cpp @@ -62,7 +62,7 @@ env.insert("TMPDIR", "C:\\MyApp\\temp"); // Add an environment variable env["PATH"] += ";C:\\Bin"; process.setEnvironment(env); process.start("myapp"); -//! [1] +//! [0] } } diff --git a/src/3rdparty/easing/legal.qdoc b/src/3rdparty/easing/legal.qdoc index 1be5f66..25f67e1 100644 --- a/src/3rdparty/easing/legal.qdoc +++ b/src/3rdparty/easing/legal.qdoc @@ -1,7 +1,7 @@ /*! \page legal-easing.html \title Easing Equations by Robert Penner -\ingroup group_animation +\ingroup animation \legalese \code diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp index d166869..4548a31 100644 --- a/src/corelib/animation/qvariantanimation.cpp +++ b/src/corelib/animation/qvariantanimation.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE /*! \class QVariantAnimation - \ingroup group_animation + \ingroup animation \brief The QVariantAnimation class provides an abstract base class for animations. \since 4.6 diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp index dabaa5e..f347cf3 100644 --- a/src/declarative/qml/qmlcontext.cpp +++ b/src/declarative/qml/qmlcontext.cpp @@ -344,10 +344,10 @@ QmlContext *QmlContext::parentContext() const Add a default \a object to this context. The object will be added after any existing default objects. */ -void QmlContext::addDefaultObject(QObject *object) +void QmlContext::addDefaultObject(QObject *defaultObject) { Q_D(QmlContext); - d->addDefaultObject(object, QmlContextPrivate::NormalPriority); + d->addDefaultObject(defaultObject, QmlContextPrivate::NormalPriority); } /*! @@ -406,9 +406,7 @@ void QmlContext::setContextProperty(const QString &name, QObject *value) /*! Resolves the URL \a src relative to the URL of the - containing component. If \a src is absolute, it is - simply returned. If there is no containing component, - an empty URL is returned. + containing component. \sa QmlEngine::componentUrl(), setBaseUrl() */ -- cgit v0.12