<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4b6c3feaec0994530ccefcfe0e0932437d33b1d1">https://github.com/macports/macports-ports/commit/4b6c3feaec0994530ccefcfe0e0932437d33b1d1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 4b6c3fe  qbs: install missing header file
</span>4b6c3fe is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 4b6c3feaec0994530ccefcfe0e0932437d33b1d1
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Aug 12 06:47:07 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    qbs: install missing header file
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See https://bugreports.qt.io/browse/QBS-1370
</span><span style='display:block; white-space:pre;color:#404040;'>    See https://codereview.qt-project.org/#/c/234944/
</span>---
 devel/qbs/Portfile                        |  5 ++++
 devel/qbs/files/patch-missing_header.diff | 44 +++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qbs/Portfile b/devel/qbs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6253db9..68f7007 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qbs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qbs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,6 +7,7 @@ PortGroup           cxx11 1.1
</span> name                qbs
 
 version             1.12.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories          devel
 platforms           darwin
 license             LGPL-2.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +38,10 @@ configure.post_args QBS_INSTALL_PREFIX=${prefix} \
</span> #    SOFT ASSERT: job->state() == AbstractJob::StateRunning in api/project.cpp:153
 patchfiles-append patch-environment.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://bugreports.qt.io/browse/QBS-1370
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://codereview.qt-project.org/#/c/234944/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-missing_header.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type      regex
 livecheck.url       https://download.qt.io/official_releases/qbs/
 livecheck.regex     {(\d+(?:\.\d+)+)/}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qbs/files/patch-missing_header.diff b/devel/qbs/files/patch-missing_header.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..28d5411
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qbs/files/patch-missing_header.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Christian Kandeler <christian.kandeler@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 20 Jul 2018 08:31:53 +0000 (+0200)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Install missing header file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+X-Git-Url: https://codereview.qt-project.org/gitweb?p=qbs%2Fqbs.git;a=commitdiff_plain;h=7878d02359115a5f1bd50d56c01823fc3df9575e;hp=415fe94f60a44aae19663cab36b6c381a871ca2c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Install missing header file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Task-number: QBS-1370
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: Ib541db1c783a6b7878d1712fd735dbb4779d2d96
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 08733b624..93509763b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lib/corelib/corelib.qbs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lib/corelib/corelib.qbs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -440,7 +440,6 @@ QbsLibrary {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "settingscreator.h",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "settingsmodel.cpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "settingsrepresentation.cpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            "settingsrepresentation.h",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "setupprojectparameters.cpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "shellutils.cpp",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "shellutils.h",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -475,6 +474,7 @@ QbsLibrary {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "qbs_export.h",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "settings.h",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "settingsmodel.h",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            "settingsrepresentation.h",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "setupprojectparameters.h",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "toolchains.h",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             "version.h",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9db30664f..bb3a55f12 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lib/corelib/tools/tools.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lib/corelib/tools/tools.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,6 +131,7 @@ osx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         $$PWD/qbs_export.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         $$PWD/settings.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         $$PWD/settingsmodel.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        $$PWD/settingsrepresentation.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         $$PWD/setupprojectparameters.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         $$PWD/toolchains.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         $$PWD/version.h
</span></pre><pre style='margin:0'>

</pre>