diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2019-06-26 11:52:23 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2019-06-26 11:52:23 +0000 |
| commit | d2eb50ab00d0df6d35cf7a85da0a04f92638b1c7 (patch) | |
| tree | 98bd11bbc78254c28d6911f7ea7651047ebaca9d /Mk | |
| parent | c65748b136fdc615b71616a367ad8cf8f3102c68 (diff) | |
| download | ports-d2eb50ab00d0df6d35cf7a85da0a04f92638b1c7.tar.gz ports-d2eb50ab00d0df6d35cf7a85da0a04f92638b1c7.zip | |
Clean up final leftovers from Qt4.
Submitted by: rene
Reviewed by: mat, tcberner
Differential Revision: https://reviews.freebsd.org/D20725
Notes
Notes:
svn path=/head/; revision=505150
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/qmake.mk | 2 | ||||
| -rw-r--r-- | Mk/Uses/qt.mk | 4 | ||||
| -rw-r--r-- | Mk/bsd.options.desc.mk | 1 | ||||
| -rw-r--r-- | Mk/bsd.sanity.mk | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/Mk/Uses/qmake.mk b/Mk/Uses/qmake.mk index ce9b0ebc4646..f078592952b9 100644 --- a/Mk/Uses/qmake.mk +++ b/Mk/Uses/qmake.mk @@ -3,7 +3,7 @@ # There are three Qt related USES files with different access to Qt. # - qmake: The port requires Qt's qmake to build -- creates the configure target # - auto includes qt.mk -# - qt-dist: The port is a port for an part of Qt4 or Qt5 +# - qt-dist: The port is a port for a part of Qt5 # - auto inclues qt.mk # - qt.mk - Dependency handling. USE_QT=foo bar # diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index 7061160583f7..d99d4c6aa9cc 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -3,14 +3,14 @@ # There are three Qt related USES files with different access to Qt. # - qmake: The port requires Qt's qmake to build -- creates the configure target # - auto includes qt.mk -# - qt-dist: The port is a port for an part of Qt4 or Qt5 +# - qt-dist: The port is a port for a part of Qt5 # - auto includes qt.mk and qmake.mk # - qt.mk - Dependency handling. USE_QT=foo bar # # Usage: # USES=qt:<version>[,no_env] # -# Versions: 4 5 +# Versions: 5 # # Port variables: # USE_QT - List of Qt modules to depend on, with optional '_build' diff --git a/Mk/bsd.options.desc.mk b/Mk/bsd.options.desc.mk index 5737733f2ffc..1b01fe9ad345 100644 --- a/Mk/bsd.options.desc.mk +++ b/Mk/bsd.options.desc.mk @@ -415,7 +415,6 @@ PYMALLOC_DESC?= Use Python's internal malloc() PYTHON_DESC?= Python bindings or support PYTHON2_DESC?= Python 2.x bindings or support PYTHON3_DESC?= Python 3.x bindings or support -QT4_DESC?= Qt 4 toolkit support QT5_DESC?= Qt 5 toolkit support QUICKTIME_DESC?= QuickTime media support RADIUS_DESC?= RADIUS protocol support diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index 5bd2f506dff7..2aa0f21fe4c8 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -279,7 +279,7 @@ APACHE_PORT_ALT= DEFAULT_VERSIONS+=apache=${APACHE_PORT:S/www\/apache//:C/2(0-9) USE_FPC_RUN_ALT= USES=fpc:run WANT_FPC_BASE_ALT= USES=fpc:base WANT_FPC_ALL_ALT= USES=fpc:all -USE_QT4_ALT= USES=qt:4 and USE_QT=${USE_QT4} +USE_QT4_ALT= USES=qt:5 and USE_QT=${USE_QT4} (beware) as Qt4 has been removed USE_QT5_ALT= USES=qt:5 and USE_QT=${USE_QT5} QT_NONSTANDARD_ALT= USES=qmake:no_env |