Skip to content
Snippets Groups Projects
Commit 5728f7e6 authored by Christian Kandeler's avatar Christian Kandeler Committed by Tobias Hunger
Browse files

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: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent bcb74fa9
No related branches found
No related tags found
No related merge requests found
import qbs.base 1.0 import qbs.base 1.0
import qbs.TextFile
import qbs.fileinfo as FileInfo import qbs.fileinfo as FileInfo
Module { Module {
......
import qbs import qbs
import qbs.TextFile
Product { Product {
name: "app_version_header" name: "app_version_header"
......
...@@ -489,7 +489,7 @@ void QbsProductNode::setQbsProductData(const qbs::ProductData prd) ...@@ -489,7 +489,7 @@ void QbsProductNode::setQbsProductData(const qbs::ProductData prd)
if (m_qbsProductData == prd) if (m_qbsProductData == prd)
return; return;
bool productWasEnabled = m_qbsProductData.isEnabled(); bool productWasEnabled = m_qbsProductData.isValid() && m_qbsProductData.isEnabled();
bool productIsEnabled = prd.isEnabled(); bool productIsEnabled = prd.isEnabled();
bool updateExisting = productWasEnabled != productIsEnabled; bool updateExisting = productWasEnabled != productIsEnabled;
......
Subproject commit 604aa765a8389bfaf3c97465d4903f709c4e09cd Subproject commit 6e432eef926e40278bca6c0281a6f36c56b099af
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment