summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2021-03-02 17:42:50 +0300
committerIvan Komissarov <ABBAPOH@gmail.com>2021-07-27 14:02:06 +0000
commit0d19ce31ef01e1884fd7ef8d1b5945e5b082d10e (patch)
treef899df1b6c94672838c8356e2c140d7a9de96741 /tests
parente1f27a9773853c60c9dcefe44d5a6f056e32633b (diff)
downloadqbs-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 'tests')
-rw-r--r--tests/auto/api/api.pro1
-rw-r--r--tests/auto/api/api.qbs2
-rw-r--r--tests/auto/api/tst_api.cpp4
-rw-r--r--tests/auto/api/tst_api.h2
4 files changed, 1 insertions, 8 deletions
diff --git a/tests/auto/api/api.pro b/tests/auto/api/api.pro
index d9c42e7bb..36dcec237 100644
--- a/tests/auto/api/api.pro
+++ b/tests/auto/api/api.pro
@@ -13,7 +13,6 @@ isEmpty(QBS_RELATIVE_SEARCH_PATH):QBS_RELATIVE_SEARCH_PATH=..
DEFINES += QBS_RELATIVE_LIBEXEC_PATH=\\\"$${QBS_RELATIVE_LIBEXEC_PATH}\\\"
DEFINES += QBS_RELATIVE_PLUGINS_PATH=\\\"$${QBS_RELATIVE_PLUGINS_PATH}\\\"
DEFINES += QBS_RELATIVE_SEARCH_PATH=\\\"$${QBS_RELATIVE_SEARCH_PATH}\\\"
-qbs_enable_project_file_updates:DEFINES += QBS_ENABLE_PROJECT_FILE_UPDATES
include(../auto.pri)
diff --git a/tests/auto/api/api.qbs b/tests/auto/api/api.qbs
index 09e0af7dc..21ff86a90 100644
--- a/tests/auto/api/api.qbs
+++ b/tests/auto/api/api.qbs
@@ -9,7 +9,7 @@ QbsAutotest {
"QBS_RELATIVE_LIBEXEC_PATH=" + Utilities.cStringQuote(qbsbuildconfig.relativeLibexecPath),
"QBS_RELATIVE_SEARCH_PATH=" + Utilities.cStringQuote(qbsbuildconfig.relativeSearchPath),
"QBS_RELATIVE_PLUGINS_PATH=" + Utilities.cStringQuote(qbsbuildconfig.relativePluginsPath)
- ]).concat(qbsbuildconfig.enableProjectFileUpdates ? ["QBS_ENABLE_PROJECT_FILE_UPDATES"] : [])
+ ])
Group {
name: "testdata"
diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp
index a51eb3e0c..ac37139a3 100644
--- a/tests/auto/api/tst_api.cpp
+++ b/tests/auto/api/tst_api.cpp
@@ -620,8 +620,6 @@ qbs::GroupData findGroup(const qbs::ProductData &product, const QString &name)
return qbs::GroupData();
}
-#ifdef QBS_ENABLE_PROJECT_FILE_UPDATES
-
static qbs::Project::ProductSelection defaultProducts()
{
return qbs::Project::ProductSelectionDefaultOnly;
@@ -852,8 +850,6 @@ void TestApi::changeContent()
QVERIFY2(!job->error().hasError(), qPrintable(job->error().toString()));
}
-#endif // QBS_ENABLE_PROJECT_FILE_UPDATES
-
void TestApi::commandExtraction()
{
qbs::SetupProjectParameters setupParams = defaultSetupParameters("/command-extraction");
diff --git a/tests/auto/api/tst_api.h b/tests/auto/api/tst_api.h
index d6514e17c..cca6d4970 100644
--- a/tests/auto/api/tst_api.h
+++ b/tests/auto/api/tst_api.h
@@ -69,9 +69,7 @@ private slots:
void buildProjectDryRun_data();
void buildSingleFile();
void canonicalToolchainList();
-#ifdef QBS_ENABLE_PROJECT_FILE_UPDATES
void changeContent();
-#endif
void changeDependentLib();
void checkOutputs();
void checkOutputs_data();