From cf01eac77c555fa559e52bdd32c71c960ac741f5 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 24 Jun 2013 13:54:11 +0200 Subject: QQmlPlatform: rename "mac" to "osx" Change-Id: Ie458690b8008b211785cf9dcc0312a7e25c84f6b Reviewed-by: Jake Petroules Reviewed-by: Jens Bache-Wiig --- src/qml/qml/qqmlengine.cpp | 4 ++-- src/qml/qml/qqmlplatform.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/qml') diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 64662138e1..9998af3890 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -391,9 +391,9 @@ The following functions are also on the Qt object. \list \li \c "android" - Android \li \c "blackberry" - BlackBerry OS - \li \c "ios" - Apple iOS + \li \c "ios" - iOS \li \c "linux" - Linux - \li \c "mac" - Mac OS X + \li \c "osx" - OS X \li \c "unix" - Other Unix-based OS \li \c "windows" - Windows \li \c "wince" - Windows CE diff --git a/src/qml/qml/qqmlplatform.cpp b/src/qml/qml/qqmlplatform.cpp index de48f60f56..04862379be 100644 --- a/src/qml/qml/qqmlplatform.cpp +++ b/src/qml/qml/qqmlplatform.cpp @@ -66,7 +66,7 @@ QString QQmlPlatform::os() #elif defined(Q_OS_IOS) return QLatin1String("ios"); #elif defined(Q_OS_MAC) - return QLatin1String("mac"); + return QLatin1String("osx"); #elif defined(Q_OS_WINCE) return QLatin1String("wince"); #elif defined(Q_OS_WIN) -- cgit v1.2.3 From 0f97dd8b3d86d60897fed0e87d95de2e3ed59206 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Fri, 22 Feb 2013 17:50:19 +0100 Subject: Doc: Adding landing page names to navigation variables. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -used by the navigation bar in the HTML output Change-Id: If4689381fb01c0a6fe8adbd966ead1377942a101 Reviewed-by: Martin Smith Reviewed-by: Topi Reiniö Reviewed-by: Venugopal Shivashankar --- src/qml/doc/qtqml.qdocconf | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/qml') diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf index 2198428a38..da596a1d97 100644 --- a/src/qml/doc/qtqml.qdocconf +++ b/src/qml/doc/qtqml.qdocconf @@ -47,3 +47,7 @@ exampledirs += ../../../examples/qml \ snippets imagedirs += images + +navigation.landingpage = "Qt QML" +navigation.cppclassespage = "Qt QML C++ Classes" +navigation.qmltypespage = "Qt QML QML Types" -- cgit v1.2.3 From a4754a30abc6f650885cbd20d0419da26a504220 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Sat, 22 Jun 2013 20:10:21 -0700 Subject: Update 5.1.0 changelog and what's new All the new features should now be listed in those two documents Change-Id: Ifa17581bf589f3a18b602f8a1d10683a5e48c70d Reviewed-by: Jens Bache-Wiig --- src/qml/doc/src/whatsnew.qdoc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/qml') diff --git a/src/qml/doc/src/whatsnew.qdoc b/src/qml/doc/src/whatsnew.qdoc index eece3bcaab..f1c69160b6 100644 --- a/src/qml/doc/src/whatsnew.qdoc +++ b/src/qml/doc/src/whatsnew.qdoc @@ -37,6 +37,11 @@ a summary of the new changes: \li New QQmlApplicationEngine convenience class for QML applications. \li New Instantiatior type for generic, dynamic object creation. \li New properties for \l Qt.application: arguments, name, and version. +\li The 'with' statement has been deprecated and is slated for removal in a + future version of the language. +\li New \l Qt.platform object with an os property +\li New \l qmlClearTypeRegistations() function drops all data from qmlRegisterType calls +\li New \l qmlRegisterType function for registering composite types. \endlist \section2 New Submodule -- cgit v1.2.3 From 78a33f71002428526da9c67bedb2567f0e9715b2 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Thu, 13 Jun 2013 17:07:38 +0200 Subject: QQmlTrace: getpid() requires unistd.h Doesn't build on MacOS if you omit this include and uncomment define QML_ENABLE_TRACE in qqmltrace_p.h Change-Id: I78ed43b16a006699449202dd234e43be2f7b84fd Reviewed-by: Alan Alpert --- src/qml/qml/ftw/qqmltrace.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/qml') diff --git a/src/qml/qml/ftw/qqmltrace.cpp b/src/qml/qml/ftw/qqmltrace.cpp index 98f86dad32..9bf58c245c 100644 --- a/src/qml/qml/ftw/qqmltrace.cpp +++ b/src/qml/qml/ftw/qqmltrace.cpp @@ -43,6 +43,7 @@ #ifdef QML_ENABLE_TRACE #include +#include #endif QT_BEGIN_NAMESPACE -- cgit v1.2.3 From a73aae28ee43b7bfdf8e0d2cade8831ab814f554 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Wed, 26 Jun 2013 17:18:06 -0700 Subject: Undo presumably accidental line deletion Change-Id: I7ddb3ef9b45cfb95c48c2060dc62acd4ed9d64f9 Reviewed-by: Thiago Macieira --- src/qml/qml/qqmlextensionplugin.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/qml') diff --git a/src/qml/qml/qqmlextensionplugin.h b/src/qml/qml/qqmlextensionplugin.h index 170c7915a5..245651979b 100644 --- a/src/qml/qml/qqmlextensionplugin.h +++ b/src/qml/qml/qqmlextensionplugin.h @@ -68,6 +68,7 @@ public: virtual void registerTypes(const char *uri) = 0; virtual void initializeEngine(QQmlEngine *engine, const char *uri); +private: Q_DISABLE_COPY(QQmlExtensionPlugin) }; -- cgit v1.2.3 From a8e904c69a907742a5cc55c524c5432c7a35cba4 Mon Sep 17 00:00:00 2001 From: Alan Alpert <416365416c@gmail.com> Date: Wed, 26 Jun 2013 21:25:04 -0700 Subject: Switch to non-streaming version of qWarning() Allows us to drop the qdebug.h include in a public and frequently used header. Change-Id: I2cb05fbec6298ba600020db684e9eea4093ce663 Reviewed-by: Thiago Macieira Reviewed-by: Christopher Adams --- src/qml/qml/qqml.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/qml') diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h index fb0133f305..b48a776b4f 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -49,7 +49,6 @@ #include #include -#include #define QML_VERSION 0x020000 #define QML_VERSION_STR "2.0" @@ -477,7 +476,7 @@ inline int qmlRegisterType(const QUrl &url, const char *uri, int versionMajor, i { if (url.isRelative()) { // User input check must go here, because QQmlPrivate::qmlregister is also used internally for composite types - qWarning() << "qmlRegisterType requires absolute URLs."; + qWarning("qmlRegisterType requires absolute URLs."); return 0; } -- cgit v1.2.3 From 87a4a3d095f4fbabb91dade7e7313cb844256b9b Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Wed, 26 Jun 2013 16:37:23 +0200 Subject: QtQml: document QQmlExtensionPlugin::baseUrl It was added here https://codereview.qt-project.org/#change,47532 without documentation. Also updated \since because for now qdoc seems to interpret \since 5.0 as QtQml 5.0. Task-number: QTBUG-31928 Change-Id: I652e9471f1ad8e83b355bffc8498a6565dc9aa2b Reviewed-by: Jerome Pasion Reviewed-by: Martin Smith --- src/qml/doc/src/whatsnew.qdoc | 2 ++ src/qml/qml/qqmlextensionplugin.cpp | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'src/qml') diff --git a/src/qml/doc/src/whatsnew.qdoc b/src/qml/doc/src/whatsnew.qdoc index f1c69160b6..9ad8c23a42 100644 --- a/src/qml/doc/src/whatsnew.qdoc +++ b/src/qml/doc/src/whatsnew.qdoc @@ -115,6 +115,8 @@ has now been replaced by the new \l {Qt QML} and \l {Qt Quick} modules. See the \list \li Arbitrary functionality may be provided in a namespace through a singleton type. See qmlRegisterSingletonType() for more information. \li JavaScript (.js) files may now import QML modules and other JavaScript files using the ".import" syntax. +\li Plugins may now use QQmlExtensionPlugin::baseUrl to get the directory from which the plugin is loaded. + This will be useful if the plugin needs to load QML or other assets from the same directory. \endlist \section2 Other diff --git a/src/qml/qml/qqmlextensionplugin.cpp b/src/qml/qml/qqmlextensionplugin.cpp index f77b176404..30eca7b112 100644 --- a/src/qml/qml/qqmlextensionplugin.cpp +++ b/src/qml/qml/qqmlextensionplugin.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE /*! - \since 5.0 + \since Qt 5.0 \inmodule QtQml \class QQmlExtensionPlugin \brief The QQmlExtensionPlugin class provides an abstract base for custom QML extension plugins. @@ -156,6 +156,13 @@ QQmlExtensionPlugin::~QQmlExtensionPlugin() { } +/*! + \since Qt 5.1 + \brief Returns the URL of the directory from which the extension is loaded. + + This is useful when the plugin also needs to load QML files or other + assets from the same directory. +*/ QUrl QQmlExtensionPlugin::baseUrl() const { Q_D(const QQmlExtensionPlugin); -- cgit v1.2.3 From 101a5185138f4eb4d1ed0e69065d8e4c30a7fff7 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 21 Jun 2013 15:08:43 +0200 Subject: Add Qt.application.organization/domain Change-Id: Ic4a161b59d51e621e13c960f104d1a3be2ee64f8 Reviewed-by: Alan Alpert Reviewed-by: Gabriel de Dietrich --- src/qml/qml/qqmlengine.cpp | 10 +++++++++- src/qml/qml/qqmlglobal.cpp | 22 ++++++++++++++++++++++ src/qml/qml/qqmlglobal_p.h | 8 ++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) (limited to 'src/qml') diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 71fea41f78..a7fff20530 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -451,7 +451,15 @@ The following functions are also on the Qt object. \row \li \c application.version \li This is the application version set on the QCoreApplication instance. This property can be written - to in order to set the application name. + to in order to set the application version. + \row + \li \c application.organization + \li This is the organization name set on the QCoreApplication instance. This property can be written + to in order to set the organization name. + \row + \li \c application.domain + \li This is the organization domain set on the QCoreApplication instance. This property can be written + to in order to set the organization domain. \endtable The object also has one signal, aboutToQuit(), which is the same as \l QCoreApplication::aboutToQuit(). diff --git a/src/qml/qml/qqmlglobal.cpp b/src/qml/qml/qqmlglobal.cpp index 607ee4d0ac..78d2f5aa91 100644 --- a/src/qml/qml/qqmlglobal.cpp +++ b/src/qml/qml/qqmlglobal.cpp @@ -432,6 +432,16 @@ QString QQmlApplication::version() const return QCoreApplication::instance()->applicationVersion(); } +QString QQmlApplication::organization() const +{ + return QCoreApplication::instance()->organizationName(); +} + +QString QQmlApplication::domain() const +{ + return QCoreApplication::instance()->organizationDomain(); +} + void QQmlApplication::setName(const QString &arg) { QCoreApplication::instance()->setApplicationName(arg); @@ -444,4 +454,16 @@ void QQmlApplication::setVersion(const QString &arg) emit versionChanged(); //Note that we don't get notified if it's changed from C++ } +void QQmlApplication::setOrganization(const QString &arg) +{ + QCoreApplication::instance()->setOrganizationName(arg); + emit organizationChanged(); //Note that we don't get notified if it's changed from C++ +} + +void QQmlApplication::setDomain(const QString &arg) +{ + QCoreApplication::instance()->setOrganizationDomain(arg); + emit domainChanged(); //Note that we don't get notified if it's changed from C++ +} + QT_END_NAMESPACE diff --git a/src/qml/qml/qqmlglobal_p.h b/src/qml/qml/qqmlglobal_p.h index 114c076c60..d0f408d114 100644 --- a/src/qml/qml/qqmlglobal_p.h +++ b/src/qml/qml/qqmlglobal_p.h @@ -322,6 +322,8 @@ class Q_QML_PRIVATE_EXPORT QQmlApplication : public QObject Q_PROPERTY(QStringList arguments READ args CONSTANT) Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) Q_PROPERTY(QString version READ version WRITE setVersion NOTIFY versionChanged) + Q_PROPERTY(QString organization READ organization WRITE setOrganization NOTIFY organizationChanged) + Q_PROPERTY(QString domain READ domain WRITE setDomain NOTIFY domainChanged) public: QQmlApplication(QObject* parent=0); @@ -329,16 +331,22 @@ public: QString name() const; QString version() const; + QString organization() const; + QString domain() const; public Q_SLOTS: void setName(const QString &arg); void setVersion(const QString &arg); + void setOrganization(const QString &arg); + void setDomain(const QString &arg); Q_SIGNALS: void aboutToQuit(); void nameChanged(); void versionChanged(); + void organizationChanged(); + void domainChanged(); protected: QQmlApplication(QQmlApplicationPrivate &dd, QObject* parent=0); -- cgit v1.2.3 From ecb758910f20fc4ca3269c8c6de6c322844268a4 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 1 Jul 2013 14:07:23 +0200 Subject: Disambiguate name of static helper from QtQuick1 Change name of static 'qmlEnableDebuggingHelper' variable to disambiguate it from QtQuick1 variable with the same name. Task-number: QTBUG-31064 Change-Id: Ia4b0f18a33a383dd4ade1bdb45506304f9066502 Reviewed-by: Aurindam Jana --- src/qml/debugger/qqmldebug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml') diff --git a/src/qml/debugger/qqmldebug.h b/src/qml/debugger/qqmldebug.h index d2b0220bc6..baf42807f9 100644 --- a/src/qml/debugger/qqmldebug.h +++ b/src/qml/debugger/qqmldebug.h @@ -54,9 +54,9 @@ struct Q_QML_EXPORT QQmlDebuggingEnabler // Execute code in constructor before first QQmlEngine is instantiated #if defined(QT_QML_DEBUG_NO_WARNING) -static QQmlDebuggingEnabler qmlEnableDebuggingHelper(false); +static QQmlDebuggingEnabler qQmlEnableDebuggingHelper(false); #elif defined(QT_QML_DEBUG) || defined(QT_DECLARATIVE_DEBUG) -static QQmlDebuggingEnabler qmlEnableDebuggingHelper(true); +static QQmlDebuggingEnabler qQmlEnableDebuggingHelper(true); #endif QT_END_NAMESPACE -- cgit v1.2.3 From ee88f23f430aa266c1cc19e823b1815133df15aa Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 1 Jul 2013 14:10:22 +0200 Subject: Debugger: Remove handling of QT_DECLARATIVE_DEBUG macro This was added originally to keep older Qt Creator versions working. However, any newer versions automatically set QT_QML_DEBUG too, and checking for both actively prevented selectively enabling QtQuick1 or QtQuick2 debuggers only. Change-Id: I4d4a984958ef3430ebe05b267bd87185005bbe51 Reviewed-by: Aurindam Jana --- src/qml/debugger/qqmldebug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml') diff --git a/src/qml/debugger/qqmldebug.h b/src/qml/debugger/qqmldebug.h index baf42807f9..d6b6bb0301 100644 --- a/src/qml/debugger/qqmldebug.h +++ b/src/qml/debugger/qqmldebug.h @@ -55,7 +55,7 @@ struct Q_QML_EXPORT QQmlDebuggingEnabler // Execute code in constructor before first QQmlEngine is instantiated #if defined(QT_QML_DEBUG_NO_WARNING) static QQmlDebuggingEnabler qQmlEnableDebuggingHelper(false); -#elif defined(QT_QML_DEBUG) || defined(QT_DECLARATIVE_DEBUG) +#elif defined(QT_QML_DEBUG) static QQmlDebuggingEnabler qQmlEnableDebuggingHelper(true); #endif -- cgit v1.2.3 From 3fe9adaeb8330df02b63a79a601ac998704fc99b Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 2 Jul 2013 11:18:18 +0200 Subject: Fix access to invalid memory in ~QQmlEnginePrivate ~QQmlEnginePrivate tries to set incubationController->d to 0. However, we're already setting the backpointer (q) of incubationController to 0 in ~QQmlEngine, so that the IncubationController destructor might run in between without being able to reset incubationController. To fix this, just handle the unsetting of incubationController once, in ~QQmlEnginePrivate. Task-number: QTBUG-32161 Change-Id: I43a72dcfc0f95938ebfa67d3998adff1fb2d05a1 Reviewed-by: Alan Alpert --- src/qml/qml/qqmlengine.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/qml') diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 18dbedbed6..5a7a9f1928 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -855,9 +855,6 @@ QQmlEngine::~QQmlEngine() QList singletonTypes = QQmlMetaType::qmlSingletonTypes(); foreach (QQmlType *currType, singletonTypes) currType->singletonInstanceInfo()->destroy(this); - - if (d->incubationController) - d->incubationController->d = 0; } /*! \fn void QQmlEngine::quit() -- cgit v1.2.3 From 3c43b5783e914fd513620dc779afacaee71c495f Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 2 Jul 2013 11:28:01 +0200 Subject: Doc: Fix documentation of ownership of in QmlComponent::create Fixes documentation introduced in b1ee75d377fc9517d6 : Actually the ownership is _always_ transferred to the caller. Change-Id: I3b50588b69fa45730ac09c46912f8319e7581a5f Reviewed-by: Thomas Hartmann Reviewed-by: Alan Alpert --- src/qml/qml/qqmlcomponent.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/qml') diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 1fa1c2382f..df1e7f420e 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -768,8 +768,7 @@ QQmlComponent::QQmlComponent(QQmlComponentPrivate &dd, QObject *parent) If \a context is 0 (the default), it will create the instance in the engine' s \l {QQmlEngine::rootContext()}{root context}. - The ownership of the returned object instance is determined by the QQmlEngine. - By default the caller has to take care that the object is eventually deleted. + The ownership of the returned object instance is transferred to the caller. \sa QQmlEngine::ObjectOwnership */ @@ -810,8 +809,7 @@ QObject *QQmlComponent::create(QQmlContext *context) communicate information to an instantiated component, as it allows their initial values to be configured before property bindings take effect. - The ownership of the returned object instance is determined by the QQmlEngine. - By default the caller has to take care that the object is eventually deleted. + The ownership of the returned object instance is transferred to the caller. \sa completeCreate(), QQmlEngine::ObjectOwnership */ -- cgit v1.2.3 From 8cc60ac9cc33192d8a0bc8ce9412fe059830eabd Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 4 Jul 2013 17:36:14 +0200 Subject: Fix Qt.application.xxx notifier signals QCoreApplication now provides change notifications. Change-Id: Icd7e1247426f4b5ad124d6d9b72a2ba99225ee08 Reviewed-by: Robin Burchell --- src/qml/qml/qqmlglobal.cpp | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'src/qml') diff --git a/src/qml/qml/qqmlglobal.cpp b/src/qml/qml/qqmlglobal.cpp index 78d2f5aa91..25f836a16c 100644 --- a/src/qml/qml/qqmlglobal.cpp +++ b/src/qml/qml/qqmlglobal.cpp @@ -403,6 +403,14 @@ QQmlApplication::QQmlApplication(QObject *parent) { connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SIGNAL(aboutToQuit())); + connect(QCoreApplication::instance(), SIGNAL(applicationNameChanged()), + this, SIGNAL(nameChanged())); + connect(QCoreApplication::instance(), SIGNAL(applicationVersionChanged()), + this, SIGNAL(versionChanged())); + connect(QCoreApplication::instance(), SIGNAL(organizationNameChanged()), + this, SIGNAL(organizationChanged())); + connect(QCoreApplication::instance(), SIGNAL(organizationDomainChanged()), + this, SIGNAL(domainChanged())); } QQmlApplication::QQmlApplication(QQmlApplicationPrivate &dd, QObject *parent) @@ -410,6 +418,14 @@ QQmlApplication::QQmlApplication(QQmlApplicationPrivate &dd, QObject *parent) { connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SIGNAL(aboutToQuit())); + connect(QCoreApplication::instance(), SIGNAL(applicationNameChanged()), + this, SIGNAL(nameChanged())); + connect(QCoreApplication::instance(), SIGNAL(applicationVersionChanged()), + this, SIGNAL(versionChanged())); + connect(QCoreApplication::instance(), SIGNAL(organizationNameChanged()), + this, SIGNAL(organizationChanged())); + connect(QCoreApplication::instance(), SIGNAL(organizationDomainChanged()), + this, SIGNAL(domainChanged())); } QStringList QQmlApplication::args() @@ -445,25 +461,21 @@ QString QQmlApplication::domain() const void QQmlApplication::setName(const QString &arg) { QCoreApplication::instance()->setApplicationName(arg); - emit nameChanged(); //Note that we don't get notified if it's changed from C++ } void QQmlApplication::setVersion(const QString &arg) { QCoreApplication::instance()->setApplicationVersion(arg); - emit versionChanged(); //Note that we don't get notified if it's changed from C++ } void QQmlApplication::setOrganization(const QString &arg) { QCoreApplication::instance()->setOrganizationName(arg); - emit organizationChanged(); //Note that we don't get notified if it's changed from C++ } void QQmlApplication::setDomain(const QString &arg) { QCoreApplication::instance()->setOrganizationDomain(arg); - emit domainChanged(); //Note that we don't get notified if it's changed from C++ } QT_END_NAMESPACE -- cgit v1.2.3 From 7ee4a0643964e6da3bb424e2cd7833dad04dbed8 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 8 Jul 2013 15:55:37 +0200 Subject: Docs: restore missing ListModel methods Change-Id: Icb491d14d42af769928b1663be0877e23ff43850 Reviewed-by: Jerome Pasion --- src/qml/types/qqmllistmodel.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/qml') diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp index 0cfd9c6ccb..b60248fe33 100644 --- a/src/qml/types/qqmllistmodel.cpp +++ b/src/qml/types/qqmllistmodel.cpp @@ -1854,7 +1854,7 @@ int QQmlListModel::count() const } /*! - \qmlmethod QtQml2::ListModel::clear() + \qmlmethod ListModel::clear() Deletes all content from the model. @@ -1876,7 +1876,7 @@ void QQmlListModel::clear() } /*! - \qmlmethod QtQml2::ListModel::remove(int index, int count = 1) + \qmlmethod ListModel::remove(int index, int count = 1) Deletes the content at \a index from the model. @@ -1910,7 +1910,7 @@ void QQmlListModel::remove(QQmlV8Function *args) } /*! - \qmlmethod QtQml2::ListModel::insert(int index, jsobject dict) + \qmlmethod ListModel::insert(int index, jsobject dict) Adds a new item to the list model at position \a index, with the values in \a dict. @@ -1971,7 +1971,7 @@ void QQmlListModel::insert(QQmlV8Function *args) } /*! - \qmlmethod QtQml2::ListModel::move(int from, int to, int n) + \qmlmethod ListModel::move(int from, int to, int n) Moves \a n items \a from one position \a to another. @@ -2024,7 +2024,7 @@ void QQmlListModel::move(int from, int to, int n) } /*! - \qmlmethod QtQml2::ListModel::append(jsobject dict) + \qmlmethod ListModel::append(jsobject dict) Adds a new item to the end of the list model, with the values in \a dict. @@ -2078,7 +2078,7 @@ void QQmlListModel::append(QQmlV8Function *args) } /*! - \qmlmethod object QtQml2::ListModel::get(int index) + \qmlmethod object ListModel::get(int index) Returns the item at \a index in the list model. This allows the item data to be accessed or modified from JavaScript: @@ -2128,7 +2128,7 @@ QQmlV8Handle QQmlListModel::get(int index) const } /*! - \qmlmethod QtQml2::ListModel::set(int index, jsobject dict) + \qmlmethod ListModel::set(int index, jsobject dict) Changes the item at \a index in the list model with the values in \a dict. Properties not appearing in \a dict @@ -2183,7 +2183,7 @@ void QQmlListModel::set(int index, const QQmlV8Handle &handle) } /*! - \qmlmethod QtQml2::ListModel::setProperty(int index, string property, variant value) + \qmlmethod ListModel::setProperty(int index, string property, variant value) Changes the \a property of the item at \a index in the list model to \a value. @@ -2226,7 +2226,7 @@ void QQmlListModel::setProperty(int index, const QString& property, const QVaria } /*! - \qmlmethod QtQml2::ListModel::sync() + \qmlmethod ListModel::sync() Writes any unsaved changes to the list model after it has been modified from a worker script. -- cgit v1.2.3