diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2021-03-02 17:42:50 +0300 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-07-27 14:02:06 +0000 |
commit | 0d19ce31ef01e1884fd7ef8d1b5945e5b082d10e (patch) | |
tree | f899df1b6c94672838c8356e2c140d7a9de96741 /src/app/qbs | |
parent | e1f27a9773853c60c9dcefe44d5a6f056e32633b (diff) | |
download | qbs-0d19ce31ef01e1884fd7ef8d1b5945e5b082d10e.tar.gz |
Always build with project file updates support
Since QtGui dependency was removed, there is no reason not to
Change-Id: Ib8975451f3c36a77e22a077bba18b5659f414767
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src/app/qbs')
-rw-r--r-- | src/app/qbs/session.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/app/qbs/session.cpp b/src/app/qbs/session.cpp index 9272ce231..5a1fe145d 100644 --- a/src/app/qbs/session.cpp +++ b/src/app/qbs/session.cpp @@ -399,7 +399,6 @@ void Session::addFiles(const QJsonObject &request) } ErrorInfo error; QStringList failedFiles; -#ifdef QBS_ENABLE_PROJECT_FILE_UPDATES for (const QString &filePath : data.filePaths) { const ErrorInfo e = m_project.addFiles(data.product, data.group, {filePath}); if (e.hasError()) { @@ -408,7 +407,6 @@ void Session::addFiles(const QJsonObject &request) failedFiles.push_back(filePath); } } -#endif QJsonObject reply; reply.insert(StringConstants::type(), QLatin1String("files-added")); insertErrorInfoIfNecessary(reply, error); @@ -435,7 +433,6 @@ void Session::removeFiles(const QJsonObject &request) } ErrorInfo error; QStringList failedFiles; -#ifdef QBS_ENABLE_PROJECT_FILE_UPDATES for (const QString &filePath : data.filePaths) { const ErrorInfo e = m_project.removeFiles(data.product, data.group, {filePath}); if (e.hasError()) { @@ -444,7 +441,6 @@ void Session::removeFiles(const QJsonObject &request) failedFiles.push_back(filePath); } } -#endif QJsonObject reply; reply.insert(StringConstants::type(), QLatin1String("files-removed")); insertErrorInfoIfNecessary(reply, error); @@ -656,9 +652,6 @@ Session::FileUpdateData Session::prepareFileUpdate(const QJsonObject &request) data.error = tr("Cannot update the list of source files while a job is running."); if (!m_project.isValid()) data.error = tr("No valid project. You need to resolve first."); -#ifndef QBS_ENABLE_PROJECT_FILE_UPDATES - data.error = ErrorInfo(tr("Project file updates are not enabled in this build of qbs.")); -#endif return data; } |