View | Details | Raw Unified | Return to bug 245895 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/Uses/qt.mk (-1 / +6 lines)
Lines 324-329 qt-webchannel_LIB= libQt${_QT_LIBVER}WebChannel.so Link Here
324
324
325
qt-webengine_PORT=	www/${_QT_RELNAME}-webengine
325
qt-webengine_PORT=	www/${_QT_RELNAME}-webengine
326
qt-webengine_LIB=	libQt${_QT_LIBVER}WebEngine.so
326
qt-webengine_LIB=	libQt${_QT_LIBVER}WebEngine.so
327
qt-webengine_VERSION=	5.14.0
327
328
328
qt-webglplugin_PORT=     www/${_QT_RELNAME}-webglplugin
329
qt-webglplugin_PORT=     www/${_QT_RELNAME}-webglplugin
329
qt-webglplugin_PATH=     ${LOCALBASE}/${QT_PLUGINDIR_REL}/platforms/libqwebgl.so
330
qt-webglplugin_PATH=     ${LOCALBASE}/${QT_PLUGINDIR_REL}/platforms/libqwebgl.so
Lines 336-341 qt-websockets-qml_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtWebSockets/qmldir Link Here
336
337
337
qt-webkit_PORT=		www/${_QT_RELNAME}-webkit
338
qt-webkit_PORT=		www/${_QT_RELNAME}-webkit
338
qt-webkit_LIB=		libQt${_QT_LIBVER}WebKit.so
339
qt-webkit_LIB=		libQt${_QT_LIBVER}WebKit.so
340
qt-webkit_VERSION=	5.212
339
341
340
qt-webview_PORT=	www/${_QT_RELNAME}-webview
342
qt-webview_PORT=	www/${_QT_RELNAME}-webview
341
qt-webview_LIB=		libQt${_QT_LIBVER}WebView.so
343
qt-webview_LIB=		libQt${_QT_LIBVER}WebView.so
Lines 361-366 _USE_QT= ${USE_QT} Link Here
361
.    if ${_USE_QT_ALL:M${component}} != ""
363
.    if ${_USE_QT_ALL:M${component}} != ""
362
# Skip meta-components (currently none).
364
# Skip meta-components (currently none).
363
.      if defined(qt-${component}_PORT) && (defined(qt-${component}_PATH) || defined(qt-${component}_LIB))
365
.      if defined(qt-${component}_PORT) && (defined(qt-${component}_PATH) || defined(qt-${component}_LIB))
366
# Define version and package name
367
qt-${component}_VERSION?=	${_QT_VERSION}
368
qt-${component}_PACKAGE?=	${qt-${component}_PORT:C/^.+\///}
364
# Check if a dependency type is explicitly requested.
369
# Check if a dependency type is explicitly requested.
365
.        if ${_USE_QT:M${component}_*} != "" && ${_USE_QT:M${component}} == ""
370
.        if ${_USE_QT:M${component}_*} != "" && ${_USE_QT:M${component}} == ""
366
qt-${component}_TYPE=		# empty
371
qt-${component}_TYPE=		# empty
Lines 378-383 qt-${component}_TYPE= build run Link Here
378
# Set real dependencies.
383
# Set real dependencies.
379
.        if defined(qt-${component}_LIB) && ${qt-${component}_TYPE:Mbuild} && ${qt-${component}_TYPE:Mrun}
384
.        if defined(qt-${component}_LIB) && ${qt-${component}_TYPE:Mbuild} && ${qt-${component}_TYPE:Mrun}
380
LIB_DEPENDS+=			${qt-${component}_LIB}:${qt-${component}_PORT}
385
LIB_DEPENDS+=			${qt-${component}_LIB}:${qt-${component}_PORT}
386
BUILD_DEPENDS+=			${qt-${component}_PACKAGE}>=${qt-${component}_VERSION}:${qt-${component}_PORT}
381
.        else
387
.        else
382
qt-${component}_PATH?=		${QT_LIBDIR}/${qt-${component}_LIB}
388
qt-${component}_PATH?=		${QT_LIBDIR}/${qt-${component}_LIB}
383
qt-${component}_DEPENDS=	${qt-${component}_PATH}:${qt-${component}_PORT}
389
qt-${component}_DEPENDS=	${qt-${component}_PATH}:${qt-${component}_PORT}
384
- 

Return to bug 245895