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

QmlDesigner: Remove globalBaseUrl

Browse Source 
It is not used anymore.

Change-Id: I1d436888b5a93a187065cd8276b55a233a0f374c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Thomas Hartmann
2022-03-22 18:02:48 +01:00
parent 6662e138d7
commit bf2ece2d15
4 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
View File

@@ -416,15 +416,6 @@ QQmlComponent *PropertyEditorContextObject::specificQmlComponent()
return m_qmlComponent; return m_qmlComponent;
} }
void PropertyEditorContextObject::setGlobalBaseUrl(const QUrl &newBaseUrl)
{
if (newBaseUrl == m_globalBaseUrl)
return;
m_globalBaseUrl = newBaseUrl;
emit globalBaseUrlChanged();
}
void PropertyEditorContextObject::setSpecificsUrl(const QUrl &newSpecificsUrl) void PropertyEditorContextObject::setSpecificsUrl(const QUrl &newSpecificsUrl)
{ {
if (newSpecificsUrl == m_specificsUrl) if (newSpecificsUrl == m_specificsUrl)

5
src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h
View File

@@ -42,7 +42,6 @@ class PropertyEditorContextObject : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QUrl globalBaseUrl READ globalBaseUrl WRITE setGlobalBaseUrl NOTIFY globalBaseUrlChanged)
Q_PROPERTY(QUrl specificsUrl READ specificsUrl WRITE setSpecificsUrl NOTIFY specificsUrlChanged) Q_PROPERTY(QUrl specificsUrl READ specificsUrl WRITE setSpecificsUrl NOTIFY specificsUrlChanged)
Q_PROPERTY(QString specificQmlData READ specificQmlData WRITE setSpecificQmlData NOTIFY specificQmlDataChanged) Q_PROPERTY(QString specificQmlData READ specificQmlData WRITE setSpecificQmlData NOTIFY specificQmlDataChanged)
@@ -68,7 +67,6 @@ class PropertyEditorContextObject : public QObject
public: public:
PropertyEditorContextObject(QObject *parent = nullptr); PropertyEditorContextObject(QObject *parent = nullptr);
QUrl globalBaseUrl() const {return m_globalBaseUrl; }
QUrl specificsUrl() const {return m_specificsUrl; } QUrl specificsUrl() const {return m_specificsUrl; }
QString specificQmlData() const {return m_specificQmlData; } QString specificQmlData() const {return m_specificQmlData; }
QString stateName() const {return m_stateName; } QString stateName() const {return m_stateName; }
@@ -122,7 +120,6 @@ public:
bool hasAliasExport() const { return m_aliasExport; } bool hasAliasExport() const { return m_aliasExport; }
signals: signals:
void globalBaseUrlChanged();
void specificsUrlChanged(); void specificsUrlChanged();
void specificQmlDataChanged(); void specificQmlDataChanged();
void stateNameChanged(); void stateNameChanged();
@@ -139,7 +136,6 @@ signals:
void hasActiveTimelineChanged(); void hasActiveTimelineChanged();
public slots: public slots:
void setGlobalBaseUrl(const QUrl &newBaseUrl);
void setSpecificsUrl(const QUrl &newSpecificsUrl); void setSpecificsUrl(const QUrl &newSpecificsUrl);
@@ -161,7 +157,6 @@ public slots:
void setHasAliasExport(bool hasAliasExport); void setHasAliasExport(bool hasAliasExport);
private: private:
QUrl m_globalBaseUrl;
QUrl m_specificsUrl; QUrl m_specificsUrl;
QString m_specificQmlData; QString m_specificQmlData;

2
src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
View File

@@ -549,8 +549,6 @@ void PropertyEditorQmlBackend::initialSetup(const TypeName &typeName, const QUrl
contextObject()->setIsBaseState(true); contextObject()->setIsBaseState(true);
contextObject()->setSpecificQmlData(QStringLiteral("")); contextObject()->setSpecificQmlData(QStringLiteral(""));
contextObject()->setGlobalBaseUrl(QUrl());
} }
QString PropertyEditorQmlBackend::propertyEditorResourcesPath() QString PropertyEditorQmlBackend::propertyEditorResourcesPath()

2
src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
View File

@@ -498,7 +498,6 @@ void PropertyEditorView::setupQmlBackend()
if (specificQmlData.isEmpty()) if (specificQmlData.isEmpty())
currentQmlBackend->contextObject()->setSpecificQmlData(specificQmlData); currentQmlBackend->contextObject()->setSpecificQmlData(specificQmlData);
currentQmlBackend->contextObject()->setGlobalBaseUrl(qmlFile);
currentQmlBackend->contextObject()->setSpecificQmlData(specificQmlData); currentQmlBackend->contextObject()->setSpecificQmlData(specificQmlData);
currentQmlBackend->setSource(qmlFile); currentQmlBackend->setSource(qmlFile);
} else { } else {
@@ -511,7 +510,6 @@ void PropertyEditorView::setupQmlBackend()
if (specificQmlData.isEmpty()) if (specificQmlData.isEmpty())
currentQmlBackend->contextObject()->setSpecificQmlData(specificQmlData); currentQmlBackend->contextObject()->setSpecificQmlData(specificQmlData);
currentQmlBackend->setup(*qmlObjectNode, currentStateName, qmlSpecificsFile, this); currentQmlBackend->setup(*qmlObjectNode, currentStateName, qmlSpecificsFile, this);
currentQmlBackend->contextObject()->setGlobalBaseUrl(qmlFile);
currentQmlBackend->contextObject()->setSpecificQmlData(specificQmlData); currentQmlBackend->contextObject()->setSpecificQmlData(specificQmlData);
} }