<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e15d234e48bfd4cf2e3c5a3415d507c4705965ba">https://github.com/macports/macports-ports/commit/e15d234e48bfd4cf2e3c5a3415d507c4705965ba</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 e15d234 qt5 PG: reconfigure default Qt version used
</span>e15d234 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e15d234e48bfd4cf2e3c5a3415d507c4705965ba
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Feb 18 20:37:53 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5 PG: reconfigure default Qt version used
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See
</span><span style='display:block; white-space:pre;color:#404040;'> https://lists.macports.org/pipermail/macports-dev/2017-January/035273.html
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/macports/macports-ports/commit/fd4e329a25e85ba8f91666b794e6de8a23237c02
</span>---
_resources/port1.0/group/qt5-1.0.tcl | 39 ++++++++++++++++++------------------
1 file changed, 20 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt5-1.0.tcl b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 6846916..7514fdb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,48 +76,49 @@ proc qt5.get_default_name {} {
</span> #
# Mac OS X Lion (10.7)
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Qt 5.6: Deployment only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5.7: Not Supported and is known not to work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5.6: Deployment only but seems to work (except QtWebEngine)
</span> # Qt 5.5: Occasionally tested
# Qt 5.4: Supported
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return qt56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt5
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${os.major} <= 15 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${os.major} == 12 } {
</span> #
# OS X Mountain Lion (10.8)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5.8: Not Supported
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5.7: Supported (except QtWebEngine)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5.6: Supported
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${os.major} <= 15 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span> # OS X Mavericks (10.9)
# OS X Yosemite (10.10)
# OS X El Capitan (10.11)
#
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5.8: Supported
</span> # Qt 5.7: Supported
# Qt 5.6: Supported
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${cxx_stdlib} eq "libstdc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return qt56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt5
</span> #
} elseif { ${os.major} <= 16 } {
#
# macOS Sierra (10.12)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # as of Qt version 5.7, there is no official support
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${cxx_stdlib} eq "libstdc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return qt56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5.8: Supported
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5.7: Not Supported but seems to work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt5
</span> #
} else {
#
# macOS ??? (???)
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${cxx_stdlib} eq "libstdc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return qt56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt5
</span> }
}
</pre><pre style='margin:0'>
</pre>