From 5728f7e6736fc0ad7e51a240f729ee51be536842 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Fri, 5 Jul 2013 10:00:19 +0200
Subject: [PATCH] qbs updates.
- Make project files buildable with current qbs.
- Update qbs submodule to enable Qt Creator to open these project files.
- Fix an invalid access that caused a soft assert.
Change-Id: I976d19240112d1ff048e51036e6702383735352b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
qbs/pluginspec/pluginspec.qbs | 1 +
src/app/app_version_header.qbs | 1 +
src/plugins/qbsprojectmanager/qbsnodes.cpp | 2 +-
src/shared/qbs | 2 +-
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/qbs/pluginspec/pluginspec.qbs b/qbs/pluginspec/pluginspec.qbs
index c8c09084852..c852d1082dd 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 3b3ebf0e0a4..4dfc1f5b37e 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 8606d73646b..3a334ba1f8d 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 604aa765a83..6e432eef926 160000
--- a/src/shared/qbs
+++ b/src/shared/qbs
@@ -1 +1 @@
-Subproject commit 604aa765a8389bfaf3c97465d4903f709c4e09cd
+Subproject commit 6e432eef926e40278bca6c0281a6f36c56b099af
--
GitLab