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>

8 files changed, 10 insertions, 41 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;
 }
 
diff --git a/src/lib/corelib/CMakeLists.txt b/src/lib/corelib/CMakeLists.txt
index 06e725ab4..2a38a4943 100644
--- a/src/lib/corelib/CMakeLists.txt
+++ b/src/lib/corelib/CMakeLists.txt
@@ -421,8 +421,6 @@ add_qbs_library(qbscore
         "QBS_RELATIVE_LIBEXEC_PATH=\"${QBS_RELATIVE_LIBEXEC_PATH}\""
         "QBS_LIBRARY"
         ${QBS_UNIT_TESTS_DEFINES}
-    PUBLIC_DEFINES
-        ${QBS_PROJECT_FILE_UPDATES_DEFINES}
     DEPENDS
         Qt${QT_VERSION_MAJOR}::CorePrivate
         Qt${QT_VERSION_MAJOR}::Network
diff --git a/src/lib/corelib/api/api.pri b/src/lib/corelib/api/api.pri
index ddb1171d4..69443dffc 100644
--- a/src/lib/corelib/api/api.pri
+++ b/src/lib/corelib/api/api.pri
@@ -38,15 +38,12 @@ SOURCES += \
     INSTALLS += api_headers
 }
 
-qbs_enable_project_file_updates {
-    HEADERS += \
-        $$PWD/changeset.h \
-        $$PWD/projectfileupdater.h \
-        $$PWD/qmljsrewriter.h
+HEADERS += \
+    $$PWD/changeset.h \
+    $$PWD/projectfileupdater.h \
+    $$PWD/qmljsrewriter.h
 
-    SOURCES += \
-        $$PWD/changeset.cpp \
-        $$PWD/projectfileupdater.cpp \
-        $$PWD/qmljsrewriter.cpp
-    DEFINES += QBS_ENABLE_PROJECT_FILE_UPDATES
-}
+SOURCES += \
+    $$PWD/changeset.cpp \
+    $$PWD/projectfileupdater.cpp \
+    $$PWD/qmljsrewriter.cpp
diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index 65b9b4efa..23513564b 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -39,13 +39,10 @@
 #include "project.h"
 #include "project_p.h"
 
-#ifdef QBS_ENABLE_PROJECT_FILE_UPDATES
-#include "projectfileupdater.h"
-#endif
-
 #include "internaljobs.h"
 #include "jobs.h"
 #include "projectdata_p.h"
+#include "projectfileupdater.h"
 #include "propertymap_p.h"
 #include "rulecommand_p.h"
 #include "runenvironment.h"
@@ -343,7 +340,6 @@ void ProjectPrivate::setupInstallData(ArtifactData &artifact,
     }
 }
 
-#ifdef QBS_ENABLE_PROJECT_FILE_UPDATES
 void ProjectPrivate::addGroup(const ProductData &product, const QString &groupName)
 {
     if (groupName.isEmpty())
@@ -520,7 +516,6 @@ void ProjectPrivate::removeGroup(const ProductData &product, const GroupData &gr
     remover.apply();
 
 }
-#endif // QBS_ENABLE_PROJECT_FILE_UPDATES
 
 void ProjectPrivate::prepareChangeToProject()
 {
@@ -1057,7 +1052,6 @@ Project::BuildGraphInfo Project::getBuildGraphInfo() const
     return info;
 }
 
-#ifdef QBS_ENABLE_PROJECT_FILE_UPDATES
 /*!
  * \brief Adds a new empty group to the given product.
  * Returns an \c ErrorInfo object for which \c hasError() is false in case of a success
@@ -1155,6 +1149,5 @@ ErrorInfo Project::removeGroup(const ProductData &product, const GroupData &grou
         return errorInfo;
     }
 }
-#endif // QBS_ENABLE_PROJECT_FILE_UPDATES
 
 } // namespace qbs
diff --git a/src/lib/corelib/api/project.h b/src/lib/corelib/api/project.h
index 9000d6548..380806f3a 100644
--- a/src/lib/corelib/api/project.h
+++ b/src/lib/corelib/api/project.h
@@ -159,14 +159,12 @@ public:
     BuildGraphInfo getBuildGraphInfo() const;
 
 
-#ifdef QBS_ENABLE_PROJECT_FILE_UPDATES
     ErrorInfo addGroup(const ProductData &product, const QString &groupName);
     ErrorInfo addFiles(const ProductData &product, const GroupData &group,
                        const QStringList &filePaths);
     ErrorInfo removeFiles(const ProductData &product, const GroupData &group,
                           const QStringList &filePaths);
     ErrorInfo removeGroup(const ProductData &product, const GroupData &group);
-#endif // QBS_ENABLE_PROJECT_FILE_UPDATES
 
 private:
     Project(const Internal::TopLevelProjectPtr &internalProject, const Internal::Logger &logger);
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
index 65644ea32..cece18126 100644
--- a/src/lib/corelib/corelib.qbs
+++ b/src/lib/corelib/corelib.qbs
@@ -24,8 +24,6 @@ QbsLibrary {
         ".",
         "../.." // for the plugin headers
     ])
-    property stringList projectFileUpdateDefines:
-        qbsbuildconfig.enableProjectFileUpdates ? ["QBS_ENABLE_PROJECT_FILE_UPDATES"] : []
     property stringList enableUnitTestsDefines:
         qbsbuildconfig.enableUnitTests ? ["QBS_ENABLE_UNIT_TESTS"] : []
     property stringList systemSettingsDirDefines: qbsbuildconfig.systemSettingsDir
@@ -33,8 +31,7 @@ QbsLibrary {
     cpp.defines: base.concat([
         "QBS_RELATIVE_LIBEXEC_PATH=" + Utilities.cStringQuote(qbsbuildconfig.relativeLibexecPath),
         "QBS_VERSION=" + Utilities.cStringQuote(version),
-    ]).concat(projectFileUpdateDefines).concat(enableUnitTestsDefines)
-    .concat(systemSettingsDirDefines)
+    ]).concat(enableUnitTestsDefines).concat(systemSettingsDirDefines)
 
     Properties {
         condition: qbs.targetOS.contains("windows")
@@ -55,7 +52,6 @@ QbsLibrary {
     }
     Group {
         name: "project file updating"
-        condition: qbsbuildconfig.enableProjectFileUpdates
         prefix: "api/"
         files: [
             "changeset.cpp",
@@ -530,8 +526,4 @@ QbsLibrary {
         qbs.install: qbsbuildconfig.installApiHeaders
         qbs.installDir: headerInstallPrefix
     }
-    Export {
-        Depends { name: "cpp" }
-        cpp.defines: base.concat(exportingProduct.projectFileUpdateDefines)
-    }
 }
diff --git a/src/lib/corelib/use_corelib.pri b/src/lib/corelib/use_corelib.pri
index c674ee664..a0bb90e8b 100644
--- a/src/lib/corelib/use_corelib.pri
+++ b/src/lib/corelib/use_corelib.pri
@@ -43,5 +43,4 @@ INCLUDEPATH += \
 CONFIG(static, static|shared) {
     DEFINES += QBS_STATIC_LIB
 }
-qbs_enable_project_file_updates:DEFINES += QBS_ENABLE_PROJECT_FILE_UPDATES
 qbs_enable_unit_tests:DEFINES += QBS_ENABLE_UNIT_TESTS
diff --git a/src/lib/corelib/use_installed_corelib.pri b/src/lib/corelib/use_installed_corelib.pri
index 4ff72414d..48e020c7b 100644
--- a/src/lib/corelib/use_installed_corelib.pri
+++ b/src/lib/corelib/use_installed_corelib.pri
@@ -34,5 +34,4 @@ INCLUDEPATH += $${PWD}
 CONFIG(static, static|shared) {
     DEFINES += QBS_STATIC_LIB
 }
-qbs_enable_project_file_updates:DEFINES += QBS_ENABLE_PROJECT_FILE_UPDATES
 qbs_enable_unit_tests:DEFINES += QBS_ENABLE_UNIT_TESTS