<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/60bd6e19c8f5198bd49cafbb51f8087541b4a531">https://github.com/macports/macports-ports/commit/60bd6e19c8f5198bd49cafbb51f8087541b4a531</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 60bd6e19c8f5198bd49cafbb51f8087541b4a531
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Dec 31 10:11:12 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5 PG: add qt5.get_default_name procedure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> qt5.get_default_name allows client code to test for the Qt version
</span><span style='display:block; white-space:pre;color:#404040;'> recommended for the current system configuration.
</span>---
_resources/port1.0/group/qt5-1.0.tcl | 43 +++++++++++++++++++++++++-----------
1 file changed, 30 insertions(+), 13 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 d962afc..014549d 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;'>@@ -40,17 +40,15 @@ set available_qt_versions {
</span> qt55
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# standard Qt5 name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-global qt_name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ![info exists qt_name] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc qt5.get_default_name {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global os.major cxx_stdlib
</span>
if { ${os.major} <= 7 } {
#
# Qt 5 does not support ppc
# see http://doc.qt.io/qt-5/osx-requirements.html
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_name qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt55
</span> #
} elseif { ${os.major} <= 9 } {
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +57,7 @@ if { ![info exists qt_name] } {
</span> #
# never supported by Qt 5
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_name qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt55
</span> #
} elseif { ${os.major} == 10 } {
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +66,7 @@ if { ![info exists qt_name] } {
</span> # Qt 5.3: Deployment only
# Qt 5.0-5.2: Occasionally tested
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_name qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt55
</span> #
} elseif { ${os.major} == 11 } {
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,9 +76,9 @@ if { ![info exists qt_name] } {
</span> # Qt 5.5: Occasionally tested
# Qt 5.4: Supported
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_name qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt56
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${os.major} <= 12 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${os.major} <= 15 } {
</span> #
# OS X Mountain Lion (10.8)
# OS X Mavericks (10.9)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,24 +88,43 @@ if { ![info exists qt_name] } {
</span> # Qt 5.7: Supported
# Qt 5.6: Supported
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_name qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${cxx_stdlib} eq "libstdc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> #
} elseif { ${os.major} <= 16 } {
#
# macOS Sierra (10.12)
# as of Qt version 5.7, there is no official support
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_name qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${cxx_stdlib} eq "libstdc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> #
} else {
#
# macOS ??? (???)
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_name qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${cxx_stdlib} eq "libstdc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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;'>+# standard Qt5 name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+global qt_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [info exists qt_name] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_name [qt5.get_default_name]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Qt has what is calls reference configurations, which are said to be thoroughly tested
# Qt also has configurations which are "occasionally tested" or are "[d]eployment only"
# see http://doc.qt.io/qt-5/supported-platforms.html#reference-configurations
</pre><pre style='margin:0'>
</pre>