forked from qt-creator/qt-creator
QmlProjectManager: Rename 'libraryPaths' property to 'importPaths'
Suggested by Erik Verbruggen
This commit is contained in:
@@ -9,7 +9,7 @@ class QmlProjectItemPrivate : public QObject {
|
||||
|
||||
public:
|
||||
QString sourceDirectory;
|
||||
QStringList libraryPaths;
|
||||
QStringList importPaths;
|
||||
|
||||
QList<QmlFileFilterItem*> qmlFileFilters() const;
|
||||
|
||||
@@ -79,21 +79,21 @@ void QmlProjectItem::setSourceDirectory(const QString &directoryPath)
|
||||
emit sourceDirectoryChanged();
|
||||
}
|
||||
|
||||
QStringList QmlProjectItem::libraryPaths() const
|
||||
QStringList QmlProjectItem::importPaths() const
|
||||
{
|
||||
Q_D(const QmlProjectItem);
|
||||
return d->libraryPaths;
|
||||
return d->importPaths;
|
||||
}
|
||||
|
||||
void QmlProjectItem::setLibraryPaths(const QStringList &libraryPaths)
|
||||
void QmlProjectItem::setImportPaths(const QStringList &libraryPaths)
|
||||
{
|
||||
Q_D(QmlProjectItem);
|
||||
|
||||
if (d->libraryPaths == libraryPaths)
|
||||
if (d->importPaths == libraryPaths)
|
||||
return;
|
||||
|
||||
d->libraryPaths = libraryPaths;
|
||||
emit libraryPathsChanged();
|
||||
d->importPaths = libraryPaths;
|
||||
emit importPathsChanged();
|
||||
}
|
||||
|
||||
/* Returns list of absolute paths */
|
||||
|
||||
@@ -24,7 +24,7 @@ class QmlProjectItem : public QObject {
|
||||
|
||||
Q_PROPERTY(QDeclarativeListProperty<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)
|
||||
Q_PROPERTY(QStringList importPaths READ importPaths WRITE setImportPaths NOTIFY importPathsChanged)
|
||||
|
||||
Q_CLASSINFO("DefaultProperty", "content");
|
||||
|
||||
@@ -37,8 +37,8 @@ public:
|
||||
QString sourceDirectory() const;
|
||||
void setSourceDirectory(const QString &directoryPath);
|
||||
|
||||
QStringList libraryPaths() const;
|
||||
void setLibraryPaths(const QStringList &paths);
|
||||
QStringList importPaths() const;
|
||||
void setImportPaths(const QStringList &paths);
|
||||
|
||||
QStringList files() const;
|
||||
bool matchesFile(const QString &filePath) const;
|
||||
@@ -46,7 +46,7 @@ public:
|
||||
signals:
|
||||
void qmlFilesChanged();
|
||||
void sourceDirectoryChanged();
|
||||
void libraryPathsChanged();
|
||||
void importPathsChanged();
|
||||
|
||||
protected:
|
||||
QmlProjectItemPrivate *d_ptr;
|
||||
|
||||
Reference in New Issue
Block a user