From bc18941eb077b55827fc8b56aacfba4cc1b0e90c Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 18 Jan 2018 01:30:39 +0200 Subject: [PATCH] Fix project generator for Qt Creator IDE // Resolve #1299 Resolve #1290 --- HISTORY.rst | 3 ++- docs | 2 +- platformio/ide/tpls/qtcreator/platformio.pro.tpl | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 3e79b6e9..0552f745 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -17,7 +17,8 @@ PlatformIO 3.0 * Refactored code without "arrow" dependency (resolve issue with "ImportError: No module named backports.functools_lru_cache") * Improved support of PIO Unified Debugger for Eclipse Oxygen * Improved a work in off-line mode -* Fixed project generator for CLion IDE +* Fixed project generator for CLion and Qt Creator IDE + (`issue #1299 `_) * Fixed PIO Unified Debugger for mbed framework * Fixed library updates when a version is declared in VCS format (not SemVer) diff --git a/docs b/docs index 61405e97..776ccf73 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 61405e97cd86083ee4d72ddd9aed61231ba58d38 +Subproject commit 776ccf73d030cb5e9c253ce067637b7b29a6ac99 diff --git a/platformio/ide/tpls/qtcreator/platformio.pro.tpl b/platformio/ide/tpls/qtcreator/platformio.pro.tpl index 2ae9d49d..1ef5f8eb 100644 --- a/platformio/ide/tpls/qtcreator/platformio.pro.tpl +++ b/platformio/ide/tpls/qtcreator/platformio.pro.tpl @@ -14,7 +14,7 @@ INCLUDEPATH += "{{include}}" % end % for define in defines: -DEFINES += "{{define}}" +DEFINES += {{!define}} % end OTHER_FILES += platformio.ini