diff --git a/qbs/pluginspec/pluginspec.qbs b/qbs/pluginspec/pluginspec.qbs index c8c0908485251b64784615a6f10fdc16c961dc72..c852d1082dd49a10855e925c8139c4c651df433e 100644 --- a/qbs/pluginspec/pluginspec.qbs +++ b/qbs/pluginspec/pluginspec.qbs @@ -1,4 +1,5 @@ import qbs.base 1.0 +import qbs.TextFile import qbs.fileinfo as FileInfo Module { diff --git a/src/app/app_version_header.qbs b/src/app/app_version_header.qbs index 3b3ebf0e0a40997f9534d6fa0adfc9efe618bcd5..4dfc1f5b37e8c187a3f526f8c0240786a9cdfb4c 100644 --- a/src/app/app_version_header.qbs +++ b/src/app/app_version_header.qbs @@ -1,4 +1,5 @@ import qbs +import qbs.TextFile Product { name: "app_version_header" diff --git a/src/plugins/qbsprojectmanager/qbsnodes.cpp b/src/plugins/qbsprojectmanager/qbsnodes.cpp index 8606d73646b95c0e452b631f1ee8b559795c959e..3a334ba1f8d18ea16e8cc35124eff50f408e3cd7 100644 --- a/src/plugins/qbsprojectmanager/qbsnodes.cpp +++ b/src/plugins/qbsprojectmanager/qbsnodes.cpp @@ -489,7 +489,7 @@ void QbsProductNode::setQbsProductData(const qbs::ProductData prd) if (m_qbsProductData == prd) return; - bool productWasEnabled = m_qbsProductData.isEnabled(); + bool productWasEnabled = m_qbsProductData.isValid() && m_qbsProductData.isEnabled(); bool productIsEnabled = prd.isEnabled(); bool updateExisting = productWasEnabled != productIsEnabled; diff --git a/src/shared/qbs b/src/shared/qbs index 604aa765a8389bfaf3c97465d4903f709c4e09cd..6e432eef926e40278bca6c0281a6f36c56b099af 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 604aa765a8389bfaf3c97465d4903f709c4e09cd +Subproject commit 6e432eef926e40278bca6c0281a6f36c56b099af