[149367] trunk/dports/devel/qt5-creator

[mcalhoun at macports.org]

Revision: 149367
          https://trac.macports.org/changeset/149367
Author:   mcalhoun at macports.org
Date:     2016-06-15 07:46:39 -0700 (Wed, 15 Jun 2016)
Log Message:
-----------
qt5-creator: control use of QtWebengine with variant

Modified Paths:
--------------
    trunk/dports/devel/qt5-creator/Portfile

Added Paths:
-----------
    trunk/dports/devel/qt5-creator/files/patch-no_qtwebengine.diff

Modified: trunk/dports/devel/qt5-creator/Portfile
===================================================================
--- trunk/dports/devel/qt5-creator/Portfile	2016-06-15 14:36:45 UTC (rev 149366)
+++ trunk/dports/devel/qt5-creator/Portfile	2016-06-15 14:46:39 UTC (rev 149367)
@@ -13,7 +13,7 @@
 PortGroup           qmake5 1.0
 
 version             4.0.1
-#revision            0
+revision            1
 categories          devel aqua
 platforms           darwin
 # from https://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
@@ -42,13 +42,22 @@
     depends_lib-append     port:botan
     configure.args-append  "USE_SYSTEM_BOTAN=1"
 
+    # do not opportunistically use QtWebkit
     patchfiles-append      patch-no_qtwebkit.diff
 
+    # do not opportunistically use QtWebengine
+    patchfiles-append      patch-no_qtwebengine.diff
+
     variant qtwebkit description {build with QtWebkit support} {
         patchfiles-delete  patch-no_qtwebkit.diff
         depends_lib-append port:qt5-qtwebkit
     }
 
+    variant qtwebengine description {build with QtWebengine support} {
+        patchfiles-delete  patch-no_qtwebkit.diff
+        depends_lib-append port:qt5-qtwebengine
+    }
+
     if { ![variant_isset universal] } {
         destroot {
             # make install attempts to install command line tools into /bin, etc.

Added: trunk/dports/devel/qt5-creator/files/patch-no_qtwebengine.diff
===================================================================
--- trunk/dports/devel/qt5-creator/files/patch-no_qtwebengine.diff	                        (rev 0)
+++ trunk/dports/devel/qt5-creator/files/patch-no_qtwebengine.diff	2016-06-15 14:46:39 UTC (rev 149367)
@@ -0,0 +1,16 @@
+--- src/plugins/help/help.pro.orig	2016-06-06 06:26:59.000000000 -0700
++++ src/plugins/help/help.pro	2016-06-14 17:50:01.000000000 -0700
+@@ -61,13 +61,6 @@
+     generalsettingspage.ui \
+     remotehelpfilter.ui
+ 
+-!isEmpty(QT.webenginewidgets.name):minQtVersion(5, 6, 0) {
+-    QT += webenginewidgets
+-    HEADERS += webenginehelpviewer.h
+-    SOURCES += webenginehelpviewer.cpp
+-    DEFINES += QTC_WEBENGINE_HELPVIEWER
+-}
+-
+ osx {
+     DEFINES += QTC_MAC_NATIVE_HELPVIEWER
+     QT += macextras
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160615/e6d27584/attachment.html>