diff options
| author | tcberner <tcberner@FreeBSD.org> | 2018-11-05 03:00:53 +0800 |
|---|---|---|
| committer | tcberner <tcberner@FreeBSD.org> | 2018-11-05 03:00:53 +0800 |
| commit | 5585578a6babb4a495d0e30671713171095fc52f (patch) | |
| tree | e0f4b7d2567ee42aa9691bf31504507d0e3eaaca /Mk/Uses/qt.mk | |
| parent | b7ef4f6570cdbff99ccb96d5b08880146186685d (diff) | |
| download | freebsd-ports-gnome-5585578a6babb4a495d0e30671713171095fc52f.tar.gz freebsd-ports-gnome-5585578a6babb4a495d0e30671713171095fc52f.tar.zst freebsd-ports-gnome-5585578a6babb4a495d0e30671713171095fc52f.zip | |
Merge lang/qt5-qml and x11-toolkits/qt5-quick into x11-toolkits/qt5-declarative
- There was no obvious reason to split these ports, and it makes
porting simpler; the set of ports using either mostly coincided.
Exp-run by: antoine
PR: 223687
PR: 232751
Diffstat (limited to 'Mk/Uses/qt.mk')
| -rw-r--r-- | Mk/Uses/qt.mk | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index b06963f26fbb..93643f864451 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -137,7 +137,7 @@ _USES_POST+= qt _QT_MK_POST_INCLUDED= qt.mk # The Qt components supported by qt.mk: list of shared, and version specific ones -_USE_QT_ALL= assistant dbus designer doc gui help \ +_USE_QT_ALL= assistant dbus declarative designer doc gui help \ imageformats l10n linguist linguisttools multimedia \ network opengl pixeltool qdbusviewer qmake script \ scripttools sql sql-ibase sql-mysql sql-odbc sql-pgsql \ @@ -145,7 +145,7 @@ _USE_QT_ALL= assistant dbus designer doc gui help \ xml xmlpatterns _USE_QT4_ONLY= accessible assistant-adp assistantclient clucene codecs-cn codecs-jp \ - codecs-kr codecs-tw corelib declarative demo graphicssystems-opengl \ + codecs-kr codecs-tw corelib demo graphicssystems-opengl \ help-tools iconengines inputmethods makeqpf moc phonon \ phonon-gst porting qdoc3 qmlviewer qt3support qtconfig \ qtestlib qvfb rcc uic uic3 xmlpatterns-tool @@ -153,7 +153,7 @@ _USE_QT4_ONLY= accessible assistant-adp assistantclient clucene codecs-cn codec _USE_QT5_ONLY= 3d buildtools canvas3d charts concurrent connectivity \ core datavis3d diag examples gamepad \ graphicaleffects location paths phonon4 plugininfo printsupport \ - qdbus qdoc qdoc-data qev qml quick quickcontrols \ + qdbus qdoc qdoc-data qev quickcontrols \ quickcontrols2 scxml sensors serialbus serialport speech \ sql-tds uiplugin uitools virtualkeyboard wayland webchannel \ webengine websockets websockets-qml widgets x11extras @@ -217,7 +217,11 @@ dbus_PORT= devel/${_QT_RELNAME}-dbus dbus_LIB= libQt${_QT_LIBVER}DBus.so declarative_PORT= x11-toolkits/${_QT_RELNAME}-declarative +. if ${_QT_VER:M4} declarative_LIB= libQt${_QT_LIBVER}Declarative.so +. else +declarative_LIB= libQt${_QT_LIBVER}Qml.so +. endif demo_PORT= misc/${_QT_RELNAME}-qtdemo demo_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtdemo @@ -333,9 +337,6 @@ qev_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qev qmake_PORT= devel/${_QT_RELNAME}-qmake qmake_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qmake -qml_PORT= lang/${_QT_RELNAME}-qml -qml_LIB= libQt${_QT_LIBVER}Qml.so - qmlviewer_PORT= devel/${_QT_RELNAME}-qmlviewer qmlviewer_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qmlviewer @@ -348,9 +349,6 @@ qtconfig_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtconfig qtestlib_PORT= ${testlib_PORT} qtestlib_LIB= ${testlib_LIB} -quick_PORT= x11-toolkits/${_QT_RELNAME}-quick -quick_LIB= libQt${_QT_LIBVER}Quick.so - quickcontrols_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols quickcontrols_PATH= ${LOCALBASE}/${QT_QMLDIR_REL}/QtQuick/Controls/qmldir |