feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix compilation for latest qt/master

Browse Source 
QmlList has been replaced by QmlListProperty (33eb76f050b45718d87926).

Patch provided by Aaron Kennedy.

Reviewed-by: akennedy
This commit is contained in:
Kai Koehne
2010-02-23 10:39:44 +01:00
parent ec409dc4f3
commit 3f18859252
6 changed files with 110 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp
View File

@@ -14,7 +14,7 @@ public:
QList<QmlFileFilterItem*> qmlFileFilters() const;
// content property
QmlConcreteList<QmlProjectContentItem*> content;
QList<QmlProjectContentItem*> content;
};
QList<QmlFileFilterItem*> QmlProjectItemPrivate::qmlFileFilters() const
@@ -45,10 +45,10 @@ QmlProjectItem::~QmlProjectItem()
delete d_ptr;
}
QmlList<QmlProjectContentItem*> *QmlProjectItem::content()
QmlListProperty<QmlProjectContentItem> QmlProjectItem::content()
{
Q_D(QmlProjectItem);
return &d->content;
return QmlListProperty<QmlProjectContentItem>(this, d->content);
}
QString QmlProjectItem::sourceDirectory() const

4
src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h
View File

@@ -21,7 +21,7 @@ class QmlProjectItem : public QObject {
Q_DECLARE_PRIVATE(QmlProjectItem)
Q_DISABLE_COPY(QmlProjectItem)
Q_PROPERTY(QmlList<QmlProjectManager::QmlProjectContentItem*> *content READ content DESIGNABLE false)
Q_PROPERTY(QmlListProperty<QmlProjectManager::QmlProjectContentItem> content READ content DESIGNABLE false)
Q_PROPERTY(QString sourceDirectory READ sourceDirectory NOTIFY sourceDirectoryChanged)
Q_PROPERTY(QStringList libraryPaths READ libraryPaths WRITE setLibraryPaths NOTIFY libraryPathsChanged)
@@ -31,7 +31,7 @@ public:
QmlProjectItem(QObject *parent = 0);
~QmlProjectItem();
QmlList<QmlProjectContentItem*> *content();
QmlListProperty<QmlProjectContentItem> content();
QString sourceDirectory() const;
void setSourceDirectory(const QString &directoryPath);