aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED3
-rw-r--r--Mk/Uses/qt.mk16
-rw-r--r--astro/kstars/Makefile5
-rw-r--r--astro/marble/Makefile5
-rw-r--r--astro/qmapshack/Makefile5
-rw-r--r--audio/musescore/Makefile6
-rw-r--r--audio/plasma5-plasma-pa/Makefile3
-rw-r--r--audio/supercollider/Makefile6
-rw-r--r--comms/qt5-connectivity/Makefile3
-rw-r--r--comms/qt5-sensors/Makefile3
-rw-r--r--databases/kbibtex/Makefile4
-rw-r--r--databases/kexi/Makefile4
-rw-r--r--databases/redisdesktopmanager/Makefile3
-rw-r--r--deskutils/akregator/Makefile3
-rw-r--r--deskutils/grantlee-editor/Makefile3
-rw-r--r--deskutils/kdeconnect-kde/Makefile3
-rw-r--r--deskutils/kdepim-addons/Makefile3
-rw-r--r--deskutils/kdepim-runtime/Makefile3
-rw-r--r--deskutils/kmail/Makefile3
-rw-r--r--deskutils/kontact/Makefile3
-rw-r--r--deskutils/latte-dock/Makefile3
-rw-r--r--deskutils/plasma5-milou/Makefile3
-rw-r--r--deskutils/plasma5-sddm-kcm/Makefile3
-rw-r--r--deskutils/zanshin/Makefile2
-rw-r--r--devel/RStudio/Makefile4
-rw-r--r--devel/kdevelop/Makefile4
-rw-r--r--devel/kf5-kcmutils/Makefile5
-rw-r--r--devel/kf5-kdeclarative/Makefile5
-rw-r--r--devel/kf5-ki18n/Makefile2
-rw-r--r--devel/kf5-knewstuff/Makefile5
-rw-r--r--devel/kf5-kpeople/Makefile2
-rw-r--r--devel/kf5-solid/Makefile4
-rw-r--r--devel/kio-extras/Makefile3
-rw-r--r--devel/okteta/Makefile2
-rw-r--r--devel/plasma5-plasma-sdk/Makefile3
-rw-r--r--devel/qt5-designer/Makefile3
-rw-r--r--devel/qt5-linguisttools/Makefile2
-rw-r--r--devel/qt5-location/Makefile3
-rw-r--r--devel/qt5-qdoc/Makefile2
-rw-r--r--devel/qt5-scxml/Makefile2
-rw-r--r--devel/qtcreator/Makefile6
-rw-r--r--editors/calligra/Makefile8
-rw-r--r--editors/tea/Makefile3
-rw-r--r--emulators/qmc2/Makefile5
-rw-r--r--emulators/rpcs3/Makefile2
-rw-r--r--finance/kmymoney/Makefile4
-rw-r--r--finance/skrooge/Makefile5
-rw-r--r--games/2048-qt/Makefile3
-rw-r--r--games/bomber/Makefile3
-rw-r--r--games/bovo/Makefile3
-rw-r--r--games/flightgear/Makefile4
-rw-r--r--games/gcompris-qt/Makefile4
-rw-r--r--games/granatier/Makefile3
-rw-r--r--games/kanagram/Makefile3
-rw-r--r--games/kapman/Makefile3
-rw-r--r--games/katomic/Makefile3
-rw-r--r--games/kblackbox/Makefile3
-rw-r--r--games/kblocks/Makefile3
-rw-r--r--games/kbounce/Makefile3
-rw-r--r--games/kbreakout/Makefile3
-rw-r--r--games/kdiamond/Makefile3
-rw-r--r--games/kfourinline/Makefile3
-rw-r--r--games/kgoldrunner/Makefile3
-rw-r--r--games/khangman/Makefile3
-rw-r--r--games/kigo/Makefile3
-rw-r--r--games/killbots/Makefile3
-rw-r--r--games/kiriki/Makefile3
-rw-r--r--games/kjumpingcube/Makefile3
-rw-r--r--games/klickety/Makefile3
-rw-r--r--games/klines/Makefile3
-rw-r--r--games/kmahjongg/Makefile3
-rw-r--r--games/kmines/Makefile3
-rw-r--r--games/knavalbattle/Makefile3
-rw-r--r--games/knetwalk/Makefile3
-rw-r--r--games/kolf/Makefile3
-rw-r--r--games/kollision/Makefile3
-rw-r--r--games/konquest/Makefile3
-rw-r--r--games/kpat/Makefile3
-rw-r--r--games/kreversi/Makefile3
-rw-r--r--games/kshisen/Makefile3
-rw-r--r--games/ksirk/Makefile3
-rw-r--r--games/ksnakeduel/Makefile3
-rw-r--r--games/kspaceduel/Makefile3
-rw-r--r--games/ksquares/Makefile3
-rw-r--r--games/ksudoku/Makefile3
-rw-r--r--games/ktuberling/Makefile5
-rw-r--r--games/kubrick/Makefile3
-rw-r--r--games/libkdegames/Makefile3
-rw-r--r--games/lskat/Makefile3
-rw-r--r--games/openage/Makefile3
-rw-r--r--games/picmi/Makefile3
-rw-r--r--graphics/krita/Makefile5
-rw-r--r--graphics/okular/Makefile3
-rw-r--r--graphics/photoqt/Makefile4
-rw-r--r--graphics/qt5-3d/Makefile3
-rw-r--r--graphics/qt5-graphicaleffects/Makefile3
-rw-r--r--graphics/qt5-wayland/Makefile4
-rw-r--r--graphics/radiance/Makefile3
-rw-r--r--graphics/spectacle/Makefile3
-rw-r--r--lang/Makefile1
-rw-r--r--lang/py-qt5-qml/Makefile2
-rw-r--r--lang/qt5-qml/files/patch-configure.json12
-rw-r--r--lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARM64Assembler.h11
-rw-r--r--lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMAssembler.h11
-rw-r--r--lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h11
-rw-r--r--lang/qt5-qml/files/patch-src_3rdparty_masm_wtf_Platform.h17
-rw-r--r--lang/qt5-qml/files/patch-src__src.pro34
-rw-r--r--lang/qt5-qml/pkg-plist274
-rw-r--r--math/analitza/Makefile3
-rw-r--r--math/kalgebra/Makefile3
-rw-r--r--math/rocs/Makefile3
-rw-r--r--misc/artikulate/Makefile3
-rw-r--r--misc/kf5-purpose/Makefile3
-rw-r--r--misc/ktouch/Makefile3
-rw-r--r--misc/parley/Makefile3
-rw-r--r--multimedia/QtAV/Makefile4
-rw-r--r--multimedia/gstreamer1-qt/Makefile6
-rw-r--r--multimedia/kamoso/Makefile3
-rw-r--r--multimedia/kdenlive/Makefile5
-rw-r--r--multimedia/minitube/Makefile2
-rw-r--r--multimedia/mkvtoolnix/Makefile3
-rw-r--r--multimedia/qt5-multimedia/Makefile4
-rw-r--r--multimedia/shotcut/Makefile6
-rw-r--r--multimedia/webcamoid/Makefile4
-rw-r--r--multimedia/webvfx-qt5/Makefile4
-rw-r--r--net-im/cutegram/Makefile3
-rw-r--r--net-im/kaccounts-integration/Makefile2
-rw-r--r--net-im/kaccounts-providers/Makefile3
-rw-r--r--net-im/ktp-accounts-kcm/Makefile2
-rw-r--r--net-im/ktp-call-ui/Makefile3
-rw-r--r--net-im/ktp-common-internals/Makefile2
-rw-r--r--net-im/ktp-desktop-applets/Makefile2
-rw-r--r--net-im/ktp-text-ui/Makefile3
-rw-r--r--net-im/ricochet/Makefile4
-rw-r--r--net-im/telegramqml/Makefile4
-rw-r--r--net/kf5-kholidays/Makefile2
-rw-r--r--net/kitinerary/Makefile2
-rw-r--r--net/libkgapi/Makefile3
-rw-r--r--net/libksieve/Makefile3
-rw-r--r--net/linphone/Makefile5
-rw-r--r--net/messagelib/Makefile5
-rw-r--r--polish/kadu/Makefile6
-rw-r--r--ports-mgmt/octopkg/Makefile4
-rw-r--r--print/print-manager/Makefile3
-rw-r--r--print/scribus-devel/Makefile4
-rw-r--r--science/kalzium/Makefile3
-rw-r--r--science/step/Makefile3
-rw-r--r--security/plasma5-kscreenlocker/Makefile3
-rw-r--r--sysutils/kf5-baloo/Makefile5
-rw-r--r--sysutils/plasma5-discover/Makefile3
-rw-r--r--sysutils/plasma5-systemsettings/Makefile3
-rw-r--r--textproc/kreport/Makefile2
-rw-r--r--www/falkon/Makefile4
-rw-r--r--www/otter-browser/Makefile7
-rw-r--r--www/py-qt5-webchannel/Makefile2
-rw-r--r--www/py-qt5-webengine/Makefile4
-rw-r--r--www/qt5-webchannel/Makefile3
-rw-r--r--www/qt5-webengine/Makefile4
-rw-r--r--www/qt5-webkit/Makefile4
-rw-r--r--www/qt5-websockets-qml/Makefile3
-rw-r--r--x11-fm/konqueror/Makefile3
-rw-r--r--x11-themes/kf5-qqc2-desktop-style/Makefile3
-rw-r--r--x11-themes/plasma5-breeze/Makefile3
-rw-r--r--x11-themes/plasma5-oxygen/Makefile3
-rw-r--r--x11-toolkits/Makefile2
-rw-r--r--x11-toolkits/kf5-kirigami2/Makefile5
-rw-r--r--x11-toolkits/kproperty/Makefile4
-rw-r--r--x11-toolkits/plasma5-kdeplasma-addons/Makefile5
-rw-r--r--x11-toolkits/py-qt5-quick/Makefile4
-rw-r--r--x11-toolkits/py-qt5-quickwidgets/Makefile3
-rw-r--r--x11-toolkits/qml-box2d/Makefile3
-rw-r--r--x11-toolkits/qt5-canvas3d/Makefile3
-rw-r--r--x11-toolkits/qt5-charts/Makefile3
-rw-r--r--x11-toolkits/qt5-datavis3d/Makefile3
-rw-r--r--x11-toolkits/qt5-declarative/Makefile (renamed from lang/qt5-qml/Makefile)27
-rw-r--r--x11-toolkits/qt5-declarative/files/patch-tools_qmlcachegen_qmlcachegen.pro (renamed from x11-toolkits/qt5-quick/files/patch-tools_qmlcachegen_qmlcachegen.pro)0
-rw-r--r--x11-toolkits/qt5-declarative/pkg-descr (renamed from x11-toolkits/qt5-quick/pkg-descr)0
-rw-r--r--x11-toolkits/qt5-declarative/pkg-plist (renamed from x11-toolkits/qt5-quick/pkg-plist)296
-rw-r--r--x11-toolkits/qt5-gamepad/Makefile3
-rw-r--r--x11-toolkits/qt5-quick/Makefile48
-rw-r--r--x11-toolkits/qt5-quickcontrols/Makefile3
-rw-r--r--x11-toolkits/qt5-quickcontrols2/Makefile3
-rw-r--r--x11-toolkits/qt5-virtualkeyboard/Makefile3
-rw-r--r--x11-wm/plasma5-kwin/Makefile3
-rw-r--r--x11/cool-retro-term/Makefile4
-rw-r--r--x11/kf5-kactivities/Makefile5
-rw-r--r--x11/kf5-krunner/Makefile5
-rw-r--r--x11/kf5-plasma-framework/Makefile5
-rw-r--r--x11/plasma5-kscreen/Makefile3
-rw-r--r--x11/plasma5-plasma-desktop/Makefile5
-rw-r--r--x11/plasma5-plasma-integration/Makefile5
-rw-r--r--x11/plasma5-plasma-workspace/Makefile5
-rw-r--r--x11/radare-cutter/Makefile5
-rw-r--r--x11/sddm/Makefile4
194 files changed, 680 insertions, 698 deletions
diff --git a/MOVED b/MOVED
index 78defbeb107e..c3e46b077a38 100644
--- a/MOVED
+++ b/MOVED
@@ -9378,7 +9378,6 @@ www/apache22-event-mpm||2017-07-01|Has expired: Upstream propose EoL of apache 2
net/freeradius2|net/freeradius3|2017-07-01|Has expired: EoL, use net/freeradius3 instead
net/abills||2017-07-01|Removed, unmaintained and depends on expired net/freeradius2
net-mgmt/ezradius||2017-07-01|Removed, unmaintained and depends on expired net/freeradius2
-x11-toolkits/qt5-declarative||2017-07-01|Has expired: Has not been released since Qt 5.5 -- installation can lead to runtime conflicts with qt5-quick
deskutils/california|deskutils/gnome-calendar|2017-07-02|Has expired: Orphaned upstream, replaced by gnome-calendar
devel/etcd3|devel/etcd31|2017-07-07|Version 3.2 introduces breaking changes
sysutils/py-iocage|sysutils/py3-iocage|2017-07-10|Has expired: obsoleted by sysutils/py3-iocage port using Python 3 instead of Python 2
@@ -10616,3 +10615,5 @@ www/rubygem-dropzonejs-rails07|www/rubygem-dropzonejs-rails|2018-11-01|Obsolete
audio/icecast2|audio/icecast|2018-11-03|Use upstream naming
security/openssl-devel|security/openssl111|2018-11-04|Use security/openssl111 instead
irc/netwalker-ircc||2018-11-04|Has expired: Upstream gone, very old code base, use modern irc client instead
+x11-toolkits/qt5-quick|x11-toolkits/qt5-declarative|2018-11-04|Remove unnecessary split
+lang/qt5-qml|x11-toolkits/qt5-declarative|2018-11-04|Remove unnecessary split
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
diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
index 60e70814a618..626c95673982 100644
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kstars
DISTVERSION= 2.9.8
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= astro kde
MASTER_SITES= KDE/stable/${PORTNAME}
@@ -25,8 +26,8 @@ USE_KDE= attica auth bookmarks codecs completion config configwidgets\
iconthemes init itemviews jobwidgets kio newstuff notifications \
notifyconfig parts plotting service solid texteditor \
widgetsaddons xmlgui
-USE_QT= concurrent core dbus gui multimedia network opengl printsupport \
- qml quick sql svg testlib websockets widgets xml \
+USE_QT= concurrent core dbus declarative gui multimedia network opengl printsupport \
+ sql svg testlib websockets widgets xml \
buildtools_build qmake_build
post-patch:
diff --git a/astro/marble/Makefile b/astro/marble/Makefile
index 228fdf67410f..9986435f35e4 100644
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -2,6 +2,7 @@
PORTNAME= marble
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= astro kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -18,8 +19,8 @@ USE_KDE= attica auth codecs completion config configwidgets coreaddons \
crash doctools ecm i18n jobwidgets kio newstuff package parts \
plasma-framework runner service sonnet textwidgets wallet \
widgetsaddons xmlgui
-USE_QT= concurrent core dbus designer gui location network opengl \
- phonon4 printsupport qml quick script sql svg webkit widgets xml \
+USE_QT= concurrent core dbus declarative designer gui location network opengl \
+ phonon4 printsupport script sql svg webkit widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/astro/qmapshack/Makefile b/astro/qmapshack/Makefile
index 95407698cef2..87b73fa20c2e 100644
--- a/astro/qmapshack/Makefile
+++ b/astro/qmapshack/Makefile
@@ -3,6 +3,7 @@
PORTNAME= qmapshack
PORTVERSION= 1.12.0
+PORTREVISION= 1
CATEGORIES= astro
MASTER_SITES= https://bitbucket.org/maproom/qmapshack/downloads/
@@ -19,8 +20,8 @@ LIB_DEPENDS= libgdal.so:graphics/gdal \
RUN_DEPENDS= ${LOCALBASE}/bin/bsdisks:sysutils/bsdisks
USES= cmake compiler:c++11-lib desktop-file-utils jpeg qt:5
-USE_QT= buildtools core dbus gui linguisttools location network \
- printsupport qmake qml quick sql sql-sqlite3 uitools \
+USE_QT= buildtools core dbus declarative gui linguisttools location network \
+ printsupport qmake sql sql-sqlite3 uitools \
webchannel webengine widgets xml
.include <bsd.port.mk>
diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile
index 77497c9d4e96..5883a6c8a371 100644
--- a/audio/musescore/Makefile
+++ b/audio/musescore/Makefile
@@ -3,7 +3,7 @@
PORTNAME= musescore
PORTVERSION= 2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://ftp.osuosl.org/pub/musescore/releases/MuseScore-${PORTVERSION}/
DISTNAME= MuseScore-${PORTVERSION}
@@ -24,8 +24,8 @@ LIB_DEPENDS= libmp3lame.so:audio/lame \
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
pkgconfig qt:5 shared-mime-info zip
-USE_QT= core gui widgets opengl concurrent designer help network \
- scripttools qml quick svg sql printsupport testlib webkit \
+USE_QT= core declarative gui widgets opengl concurrent designer help network \
+ scripttools svg sql printsupport testlib webkit \
xml xmlpatterns \
buildtools_build linguisttools_build qmake_build uitools_build
ALL_TARGET= lrelease manpages all
diff --git a/audio/plasma5-plasma-pa/Makefile b/audio/plasma5-plasma-pa/Makefile
index 2e5a58821370..3715eb27efab 100644
--- a/audio/plasma5-plasma-pa/Makefile
+++ b/audio/plasma5-plasma-pa/Makefile
@@ -2,6 +2,7 @@
PORTNAME= plasma-pa
DISTVERSION= ${KDE_PLASMA_VERSION}
+PORTREVISION= 1
CATEGORIES= audio kde kde-plasma
MAINTAINER= kde@FreeBSD.org
@@ -15,7 +16,7 @@ USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 \
USE_GNOME= gconf2
USE_KDE= config configwidgets coreaddons ecm globalaccel i18n \
kdeclarative package plasma-framework
-USE_QT= core dbus gui network qml quick widgets \
+USE_QT= core dbus declarative gui network widgets \
buildtools_build qmake_build
SHEBANG_FILES= data/plasmaVolumeDisableKMixAutostart.pl
diff --git a/audio/supercollider/Makefile b/audio/supercollider/Makefile
index e0426bcf76fa..df864cc60018 100644
--- a/audio/supercollider/Makefile
+++ b/audio/supercollider/Makefile
@@ -2,7 +2,7 @@
PORTNAME= supercollider
DISTVERSION= 3.9.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= https://github.com/supercollider/supercollider/releases/download/Version-${PORTVERSION}/
DISTNAME= SuperCollider-${PORTVERSION}-Source-linux
@@ -22,8 +22,8 @@ LIB_DEPENDS= libavahi-client.so:net/avahi-app \
USES= cmake:outsource compiler:c++11-lang iconv localbase pkgconfig \
qt:5 readline shared-mime-info tar:bzip2
-USE_QT= buildtools_build concurrent core gui linguisttools location \
- network opengl printsupport qmake_build qml quick sensors \
+USE_QT= buildtools_build concurrent core declarative gui linguisttools location \
+ network opengl printsupport qmake_build sensors \
sql webkit widgets
USE_XORG= x11
USE_LDCONFIG= yes
diff --git a/comms/qt5-connectivity/Makefile b/comms/qt5-connectivity/Makefile
index 42c2a88c5e4a..5ed2aa66c552 100644
--- a/comms/qt5-connectivity/Makefile
+++ b/comms/qt5-connectivity/Makefile
@@ -2,13 +2,14 @@
PORTNAME= connectivity
DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
CATEGORIES= comms
PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt connectivity (Bluetooth/NFC) module
-USE_QT= concurrent core qml quick buildtools_build
+USE_QT= concurrent core declarative buildtools_build
USES= qmake qt-dist:5,connectivity
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/comms/qt5-sensors/Makefile b/comms/qt5-sensors/Makefile
index 511812087551..1a04d0e4824b 100644
--- a/comms/qt5-sensors/Makefile
+++ b/comms/qt5-sensors/Makefile
@@ -2,13 +2,14 @@
PORTNAME= sensors
DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
CATEGORIES= comms
PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt sensors module
-USE_QT= core qml quick buildtools_build
+USE_QT= core declarative buildtools_build
USES= compiler:c++11-lang qmake:norecursive qt-dist:5,sensors
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
index 99b73a08aeda..cc4e06571918 100644
--- a/databases/kbibtex/Makefile
+++ b/databases/kbibtex/Makefile
@@ -23,8 +23,8 @@ USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash ecm i18n iconthemes itemviews jobwidgets \
kio parts service solid sonnet textwidgets wallet \
widgetsaddons xmlgui
-USE_QT= concurrent core dbus gui location network printsupport qml \
- quick webchannel webengine widgets xml xmlpatterns \
+USE_QT= concurrent core dbus declarative gui location network printsupport \
+ webchannel webengine widgets xml xmlpatterns \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/databases/kexi/Makefile b/databases/kexi/Makefile
index bca6466947f6..1376a524d08f 100644
--- a/databases/kexi/Makefile
+++ b/databases/kexi/Makefile
@@ -21,8 +21,8 @@ USE_KDE= auth bookmarks codecs completion config \
iconthemes itemviews jobwidgets kio parts service \
solid sonnet texteditor textwidgets widgetsaddons \
xmlgui breeze-icons_build
-USE_QT= core dbus gui network printsupport webkit widgets xml \
- buildtools_build qmake_build qml
+USE_QT= core dbus declarative gui network printsupport webkit widgets xml \
+ buildtools_build qmake_build
CONFLICTS_INSTALL= calligra-2*
diff --git a/databases/redisdesktopmanager/Makefile b/databases/redisdesktopmanager/Makefile
index 38eba40abd5c..d45f2bfab07b 100644
--- a/databases/redisdesktopmanager/Makefile
+++ b/databases/redisdesktopmanager/Makefile
@@ -2,6 +2,7 @@
PORTNAME= redisdesktopmanager
PORTVERSION= 0.9.6
+PORTREVISION= 1
CATEGORIES= databases
MAINTAINER= swills@FreeBSD.org
@@ -32,7 +33,7 @@ GH_TUPLE= \
uglide:qsshclient:6fa7fb7:qsshclient/3rdparty/qredisclient/3rdparty/qsshclient \
redis:hiredis:53c3243:hiredis/3rdparty/qredisclient/3rdparty/hiredis \
libssh2:libssh2:62b825c:libssh2/3rdparty/qredisclient/3rdparty/qsshclient/3rdparty/libssh2
-USE_QT= buildtools_build charts concurrent core gui network qmake_build qml quick widgets
+USE_QT= buildtools_build charts concurrent core declarative gui network qmake_build widgets
post-patch:
@${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/src/version.h
diff --git a/deskutils/akregator/Makefile b/deskutils/akregator/Makefile
index b3afb4b80e95..c7d6734122ed 100644
--- a/deskutils/akregator/Makefile
+++ b/deskutils/akregator/Makefile
@@ -2,6 +2,7 @@
PORTNAME= akregator
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -23,7 +24,7 @@ USE_KDE= auth codecs completion config configwidgets coreaddons crash \
# pim components
USE_KDE+= akonadi akonadimime contacts grantleetheme kontactinterface \
libkdepim libkleo messagelib mime pimcommon pimtextedit syndication
-USE_QT= core dbus gui location network printsupport qml quick \
+USE_QT= core dbus declarative gui location network printsupport \
webchannel webengine widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/grantlee-editor/Makefile b/deskutils/grantlee-editor/Makefile
index cd4c308c4a21..f19c757c5171 100644
--- a/deskutils/grantlee-editor/Makefile
+++ b/deskutils/grantlee-editor/Makefile
@@ -2,6 +2,7 @@
PORTNAME= grantlee-editor
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -24,7 +25,7 @@ USE_KDE= archive attica auth codecs completion config configwidgets \
# pim components
USE_KDE+= akonadi akonadicontacts akonadimime contacts grantleetheme \
kdepim-apps-libs libkleo messagelib mime pimcommon pimtextedit
-USE_QT= core dbus gui location network qml quick webchannel webengine \
+USE_QT= core dbus declarative gui location network webchannel webengine \
widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/kdeconnect-kde/Makefile b/deskutils/kdeconnect-kde/Makefile
index 84ec0d358ac4..634543660709 100644
--- a/deskutils/kdeconnect-kde/Makefile
+++ b/deskutils/kdeconnect-kde/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kdeconnect-kde
DISTVERSION= 1.3.1
+PORTREVISION= 1
CATEGORIES= deskutils kde
MASTER_SITES= KDE/stable/kdeconnect/${DISTVERSION}/src/
DIST_SUBDIR= KDE
@@ -24,7 +25,7 @@ USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons dbusaddons doctools ecm i18n iconthemes \
itemviews jobwidgets kcmutils kio notifications service \
solid wayland widgetsaddons xmlgui
-USE_QT= concurrent core dbus gui network qml quick testlib widgets x11extras xml \
+USE_QT= concurrent core dbus declarative gui network testlib widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xext xtst
USE_LDCONFIG= ${QT_QMLDIR}/org/kde/kdeconnect
diff --git a/deskutils/kdepim-addons/Makefile b/deskutils/kdepim-addons/Makefile
index 0ca4015d617d..6fde8f85b1a0 100644
--- a/deskutils/kdepim-addons/Makefile
+++ b/deskutils/kdepim-addons/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kdepim-addons
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -29,7 +30,7 @@ USE_KDE+= akonadi akonadicalendar akonadicontacts akonadiimportwizard \
kdepim-apps-libs kitinerary kpkpass libkdepim libkleo libksieve mailcommon \
mailimporter mailtransport messagelib mime pimcommon \
pimtextedit tnef
-USE_QT= core dbus gui location network printsupport qml quick testlib \
+USE_QT= core dbus declarative gui location network printsupport testlib \
webchannel webengine widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/kdepim-runtime/Makefile b/deskutils/kdepim-runtime/Makefile
index e8f5242f2da8..d5ad20ce8b7b 100644
--- a/deskutils/kdepim-runtime/Makefile
+++ b/deskutils/kdepim-runtime/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kdepim-runtime
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -28,7 +29,7 @@ USE_KDE+= akonadi akonadicontacts akonadimime akonadinotes \
calendarutils contacts gapi identitymanagement imap \
kontactinterface kpimdav mailtransport mbox mime pimcommon \
pimtextedit syndication
-USE_QT= core dbus gui location network printsupport qml quick speech \
+USE_QT= core dbus declarative gui location network printsupport speech \
script webchannel webengine widgets xml xmlpatterns \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/kmail/Makefile b/deskutils/kmail/Makefile
index 8b32b5eda9ba..470834487baa 100644
--- a/deskutils/kmail/Makefile
+++ b/deskutils/kmail/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kmail
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -34,7 +35,7 @@ USE_KDE+= akonadi akonadicontacts akonadimime akonadisearch calendarcore \
kontactinterface ldap mailcommon mailtransport messagelib \
mime pimcommon pimtextedit tnef \
kdepim-runtime5_run
-USE_QT= core dbus gui location network printsupport qml quick \
+USE_QT= core dbus declarative gui location network printsupport \
webchannel webengine widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/kontact/Makefile b/deskutils/kontact/Makefile
index b7e9b9e1e981..bc1a72d39b7e 100644
--- a/deskutils/kontact/Makefile
+++ b/deskutils/kontact/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kontact
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -15,7 +16,7 @@ USE_KDE= auth codecs completion config configwidgets coreaddons crash \
service sonnet textwidgets widgetsaddons windowsystem xmlgui
# pim components
USE_KDE+= akonadi grantleetheme kdepim-apps-libs kontactinterface libkdepim
-USE_QT= core dbus gui location network qml quick webchannel webengine \
+USE_QT= core dbus declarative gui location network webchannel webengine \
widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/deskutils/latte-dock/Makefile b/deskutils/latte-dock/Makefile
index 1c84500db8be..a615430a98da 100644
--- a/deskutils/latte-dock/Makefile
+++ b/deskutils/latte-dock/Makefile
@@ -2,6 +2,7 @@
PORTNAME= latte-dock
DISTVERSION= 0.8.2
+PORTREVISION= 1
CATEGORIES= deskutils kde
MASTER_SITES= KDE/stable/latte-dock
@@ -19,7 +20,7 @@ USE_KDE= activities archive attica auth codecs config configwidgets \
kdeclarative newstuff notifications package plasma-framework service \
wayland widgetsaddons windowsystem xmlgui \
ecm_build
-USE_QT= core dbus gui network qml quick widgets x11extras xml \
+USE_QT= core dbus declarative gui network widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xcb xext
diff --git a/deskutils/plasma5-milou/Makefile b/deskutils/plasma5-milou/Makefile
index 4b6bb9ed1093..d26c2e372bb0 100644
--- a/deskutils/plasma5-milou/Makefile
+++ b/deskutils/plasma5-milou/Makefile
@@ -2,6 +2,7 @@
PORTNAME= milou
DISTVERSION= ${KDE_PLASMA_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde kde-plasma
MAINTAINER= kde@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT= Plasma5 Plasmoid for search
USES= cmake:outsource compiler:c++11-lib cpe gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config coreaddons i18n kdeclarative package \
plasma-framework runner service
-USE_QT= core gui network qml quick script testlib widgets \
+USE_QT= core declarative gui network script testlib widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/deskutils/plasma5-sddm-kcm/Makefile b/deskutils/plasma5-sddm-kcm/Makefile
index 8b23c9e80fc4..046140f482fd 100644
--- a/deskutils/plasma5-sddm-kcm/Makefile
+++ b/deskutils/plasma5-sddm-kcm/Makefile
@@ -2,6 +2,7 @@
PORTNAME= sddm-kcm
DISTVERSION= ${KDE_PLASMA_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde kde-plasma
MAINTAINER= kde@FreeBSD.org
@@ -12,7 +13,7 @@ USES= cmake:outsource compiler:c++11-lib gettext kde:5 cpe pkgconfig \
USE_KDE= auth archive attica codecs completion config configwidgets \
coreaddons ecm i18n jobwidgets kio newstuff service \
widgetsaddons xmlgui
-USE_QT= concurrent core dbus designer gui network qml quick uiplugin widgets \
+USE_QT= concurrent core dbus declarative designer gui network uiplugin widgets \
x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xcb xcursor xext xfixes
diff --git a/deskutils/zanshin/Makefile b/deskutils/zanshin/Makefile
index 684621cf5d69..0aaf86010e1a 100644
--- a/deskutils/zanshin/Makefile
+++ b/deskutils/zanshin/Makefile
@@ -22,7 +22,7 @@ USE_KDE+= akonadicalendar akonadicontacts akonadinotes akonadisearch \
calendarcore contacts identitymanagement kontactinterface ldap \
mime pimtextedit \
kdepim-runtime5_run
-USE_QT= concurrent core dbus gui network printsupport qml testlib \
+USE_QT= concurrent core dbus declarative gui network printsupport testlib \
widgets xml \
buildtools_build qmake_build
diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile
index bfc61b914f02..dceed7657fbc 100644
--- a/devel/RStudio/Makefile
+++ b/devel/RStudio/Makefile
@@ -6,7 +6,7 @@
PORTNAME= RStudio
DISTVERSIONPREFIX= v
DISTVERSION= 1.2.679
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel math java
MASTER_SITES= https://s3.amazonaws.com/rstudio-dictionaries/:dictionaries \
https://s3.amazonaws.com/rstudio-buildtools/:buildtools
@@ -30,7 +30,7 @@ LIB_DEPENDS= libR.so:math/R \
libuuid.so:misc/e2fsprogs-libuuid
USES= cmake:outsource desktop-file-utils fortran pkgconfig qt:5 shared-mime-info ssl
-USE_QT= core dbus gui location network opengl printsupport qml quick sensors \
+USE_QT= core dbus declarative gui location network opengl printsupport sensors \
sql svg webchannel webengine webkit widgets xml xmlpatterns buildtools_build qmake_build
USE_JAVA= yes
JAVA_BUILD= yes
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 077d6899309c..818e8c73b722 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kdevelop
DISTVERSION= 5.2.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel kde
MASTER_SITES= KDE/stable/kdevelop/${DISTVERSION}/src
DIST_SUBDIR= KDE/kdevelop
@@ -31,7 +31,7 @@ USE_KDE= archive attica auth bookmarks codecs completion config configwidgets \
notifyconfig package parts plasma-framework \
runner service solid sonnet texteditor textwidgets threadweaver \
widgetsaddons windowsystem xmlgui
-USE_QT= concurrent core dbus gui help network qml quick \
+USE_QT= concurrent core dbus declarative gui help network \
script sql widgets xml buildtools_build qmake_build
CONFLICTS= kdevelop-kde4-4* kdevelop-4* kdevplatform-kde4-4* kdevplatform-4*
SHEBANG_FILES= kdevplatform/util/kdevplatform_shell_environment.sh \
diff --git a/devel/kf5-kcmutils/Makefile b/devel/kf5-kcmutils/Makefile
index c914f8a33498..7a29eba377ba 100644
--- a/devel/kf5-kcmutils/Makefile
+++ b/devel/kf5-kcmutils/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kcmutils
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons ecm i18n \
iconthemes itemviews kdeclarative package service \
widgetsaddons xmlgui
-USE_QT= buildtools_build core dbus gui network qmake_build \
- qml quick widgets xml
+USE_QT= buildtools_build core dbus declarative gui network qmake_build \
+ widgets xml
.include <bsd.port.mk>
diff --git a/devel/kf5-kdeclarative/Makefile b/devel/kf5-kdeclarative/Makefile
index 729192ecc1a2..087476487028 100644
--- a/devel/kf5-kdeclarative/Makefile
+++ b/devel/kf5-kdeclarative/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kdeclarative
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
@@ -14,7 +15,7 @@ USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig \
USE_KDE= completion config coreaddons globalaccel guiaddons i18n \
iconthemes jobwidgets kio package service widgetsaddons \
windowsystem
-USE_QT= buildtools_build core dbus gui network qmake_build qml \
- quick testlib widgets xml
+USE_QT= buildtools_build core dbus declarative gui network qmake_build \
+ testlib widgets xml
.include <bsd.port.mk>
diff --git a/devel/kf5-ki18n/Makefile b/devel/kf5-ki18n/Makefile
index 2daaf318fd53..e26ac9795045 100644
--- a/devel/kf5-ki18n/Makefile
+++ b/devel/kf5-ki18n/Makefile
@@ -10,6 +10,6 @@ COMMENT= KF5 advanced internationalization framework
USES= cmake:outsource compiler:c++11-lib gettext-runtime \
gettext-tools:build,run kde:5 qt:5 tar:xz
USE_KDE= ecm
-USE_QT= buildtools_build concurrent core qmake_build qml script testlib
+USE_QT= buildtools_build concurrent core declarative qmake_build script testlib
.include <bsd.port.mk>
diff --git a/devel/kf5-knewstuff/Makefile b/devel/kf5-knewstuff/Makefile
index dfde8d3a8dea..694ddc34c592 100644
--- a/devel/kf5-knewstuff/Makefile
+++ b/devel/kf5-knewstuff/Makefile
@@ -2,6 +2,7 @@
PORTNAME= knewstuff
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
@@ -12,7 +13,7 @@ USE_KDE= archive attica5 auth codecs completion config \
configwidgets coreaddons ecm i18n iconthemes itemviews \
jobwidgets kio service sonnet textwidgets widgetsaddons \
xmlgui
-USE_QT= buildtools_build core dbus gui network qmake_build \
- quick widgets xml
+USE_QT= buildtools_build core dbus declarative gui network qmake_build \
+ widgets xml
.include <bsd.port.mk>
diff --git a/devel/kf5-kpeople/Makefile b/devel/kf5-kpeople/Makefile
index da09ffe02c61..963c7ed946b6 100644
--- a/devel/kf5-kpeople/Makefile
+++ b/devel/kf5-kpeople/Makefile
@@ -9,7 +9,7 @@ COMMENT= KF5 library providing access to contacts
USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= config coreaddons ecm i18n itemviews service widgetsaddons
-USE_QT= buildtools_build core dbus gui network qmake_build qml \
+USE_QT= buildtools_build core dbus declarative gui network qmake_build \
sql widgets
.include <bsd.port.mk>
diff --git a/devel/kf5-solid/Makefile b/devel/kf5-solid/Makefile
index 31ce8441290b..40dd87ec92dd 100644
--- a/devel/kf5-solid/Makefile
+++ b/devel/kf5-solid/Makefile
@@ -9,8 +9,8 @@ COMMENT= KF5 hardware integration and detection
USES= bison cmake:outsource compiler:c++11-lib kde:5 qt:5 tar:xz
USE_KDE= ecm
-USE_QT= buildtools_build concurrent core dbus gui linguisttools \
- network qmake_build qml testlib widgets xml
+USE_QT= buildtools_build concurrent core dbus declarative gui linguisttools \
+ network qmake_build testlib widgets xml
OPTIONS_DEFINE= BSDISKS
BSDISKS_DESC= Use bsdisks instead of hald to mount drives
diff --git a/devel/kio-extras/Makefile b/devel/kio-extras/Makefile
index 9d9bd6ea8fa7..e1674fab7c94 100644
--- a/devel/kio-extras/Makefile
+++ b/devel/kio-extras/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kio-extras
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde kde-applications # kde kde-applications-plasma
MAINTAINER= kde@FreeBSD.org
@@ -18,7 +19,7 @@ USE_KDE= activities archive auth bookmarks codecs completion config \
jobwidgets js kdelibs4support khtml kio notifications parts \
pty service solid sonnet textwidgets unitconversion \
widgetsaddons windowsystem xmlgui
-USE_QT= core dbus gui location network phonon4 printsupport qml quick \
+USE_QT= core dbus declarative gui location network phonon4 printsupport \
sql svg testlib webchannel widgets xml \
buildtools_build qmake_build
SHEBANG_FILES= info/kde-info2html
diff --git a/devel/okteta/Makefile b/devel/okteta/Makefile
index 4b0273c7c2db..16dabc8d7454 100644
--- a/devel/okteta/Makefile
+++ b/devel/okteta/Makefile
@@ -18,7 +18,7 @@ USE_KDE= attica auth bookmarks codecs completion crash \
ecm i18n iconthemes itemviews jobwidgets kcmutils kio \
newstuff parts service solid sonnet textwidgets \
widgetsaddons xmlgui
-USE_QT= concurrent core dbus designer gui network printsupport qml \
+USE_QT= concurrent core dbus declarative designer gui network printsupport \
script scripttools widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/devel/plasma5-plasma-sdk/Makefile b/devel/plasma5-plasma-sdk/Makefile
index f0baf1db56f9..8d608154efac 100644
--- a/devel/plasma5-plasma-sdk/Makefile
+++ b/devel/plasma5-plasma-sdk/Makefile
@@ -2,6 +2,7 @@
PORTNAME= plasma-sdk
DISTVERSION= ${KDE_PLASMA_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde kde-plasma
MAINTAINER= kde@FreeBSD.org
@@ -13,7 +14,7 @@ USE_KDE= archive attica auth codecs completion config configwidgets \
jobwidgets kdeclarative kio kirigami2 newstuff package parts \
plasma-framework service sonnet texteditor textwidgets \
widgetsaddons windowsystem xmlgui
-USE_QT= concurrent core dbus gui network qml quick webkit widgets x11extras xml \
+USE_QT= concurrent core dbus declarative gui network webkit widgets x11extras xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/devel/qt5-designer/Makefile b/devel/qt5-designer/Makefile
index 9f4986373ae6..24b0055a4d20 100644
--- a/devel/qt5-designer/Makefile
+++ b/devel/qt5-designer/Makefile
@@ -2,13 +2,14 @@
PORTNAME= designer
DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5 graphical user interface designer
-USE_QT= assistant_run core gui network printsupport quick uiplugin \
+USE_QT= assistant_run core declarative gui network printsupport uiplugin \
widgets xml buildtools_build
USES= compiler:c++11-lang qmake qt-dist:5,tools
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/devel/qt5-linguisttools/Makefile b/devel/qt5-linguisttools/Makefile
index 4d926a37c921..90d1ed323f93 100644
--- a/devel/qt5-linguisttools/Makefile
+++ b/devel/qt5-linguisttools/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt localization tools
-USE_QT= core xml buildtools_build qml_build
+USE_QT= core xml buildtools_build declarative_build
USES= compiler:c++11-lang qmake qt-dist:5,tools
BUILD_WRKSRC= ${WRKSRC}/src/linguist
diff --git a/devel/qt5-location/Makefile b/devel/qt5-location/Makefile
index d62f4b5561b5..1a78bef64149 100644
--- a/devel/qt5-location/Makefile
+++ b/devel/qt5-location/Makefile
@@ -2,13 +2,14 @@
PORTNAME= location
DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt location module
-USE_QT= concurrent core dbus gui network qml quick buildtools_build
+USE_QT= concurrent core dbus declarative gui network buildtools_build
USES= compiler:c++11-lang qmake:norecursive qt-dist:5,location
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/devel/qt5-qdoc/Makefile b/devel/qt5-qdoc/Makefile
index fa732839b726..ec92d875a1eb 100644
--- a/devel/qt5-qdoc/Makefile
+++ b/devel/qt5-qdoc/Makefile
@@ -12,7 +12,7 @@ BUILD_DEPENDS= llvm60>=0:devel/llvm60
RUN_DEPENDS= llvm60>=0:devel/llvm60
USES= compiler:c++11-lang qmake qt-dist:5,tools
-USE_QT= core qml buildtools_build qdoc-data_run
+USE_QT= core declarative buildtools_build qdoc-data_run
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC}
diff --git a/devel/qt5-scxml/Makefile b/devel/qt5-scxml/Makefile
index ec797e544aa0..960723115cc2 100644
--- a/devel/qt5-scxml/Makefile
+++ b/devel/qt5-scxml/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt5 SXCML module
-USE_QT= core network qml buildtools_build
+USE_QT= core declarative network buildtools_build
USES= compiler:c++11-lang qmake qt-dist:5,scxml
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile
index 294f431a5009..d293f6126682 100644
--- a/devel/qtcreator/Makefile
+++ b/devel/qtcreator/Makefile
@@ -3,7 +3,7 @@
PORTNAME= qtcreator
DISTVERSION= 4.6.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
DISTNAME= qt-creator-opensource-src-${DISTVERSION}
@@ -18,8 +18,8 @@ LIB_DEPENDS= libqbscore.so:devel/qbs
USES= qmake compiler:c++14-lang qt:5 tar:xz
USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME}
USE_GL= gl
-USE_QT= buildtools concurrent core designer gui help \
- linguist location network printsupport qdoc qmake qml quick \
+USE_QT= buildtools concurrent core declarative designer gui help \
+ linguist location network printsupport qdoc qmake \
quickcontrols script script sql svg webchannel webengine \
widgets xml xmlpatterns
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 65ffc4a62c68..3bcef9ff2434 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -2,7 +2,7 @@
PORTNAME= calligra
DISTVERSION= 3.1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= editors kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}
DIST_SUBDIR= KDE/${PORTNAME}
@@ -47,9 +47,9 @@ USE_KDE= activities archive auth bookmarks codecs completion config \
texteditor textwidgets threadweaver unitconversion wallet \
widgetsaddons windowsystem xmlgui \
calendarcore okular
-USE_QT= buildtools_build core dbus gui network opengl \
- phonon4 printsupport qmake_build qml \
- quick script sql svg testlib webkit widgets x11extras xml
+USE_QT= buildtools_build core dbus declarative gui network opengl \
+ phonon4 printsupport qmake_build \
+ script sql svg testlib webkit widgets x11extras xml
USE_XORG= ice sm x11 xext
USE_LDCONFIG= yes
diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index b2822c8b7313..531169e47f7a 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -3,6 +3,7 @@
PORTNAME= tea
PORTVERSION= 46.3.0
+PORTREVISION= 1
CATEGORIES= editors
MAINTAINER= danilo@FreeBSD.org
@@ -31,7 +32,7 @@ GH_PROJECT= ${PORTNAME}-qt
QT4_USES= qt:4
QT4_USE= qt=corelib,gui,moc_build,network,rcc_build
QT5_USES= qt:5
-QT5_USE= qt=buildtools_build,core,gui,network,widgets,printsupport,qml,quick
+QT5_USE= qt=buildtools_build,core,declarative,gui,network,widgets,printsupport
LDFLAGS+= -lz
PLIST_FILES= bin/tea share/pixmaps/tea_icon_v2.png
diff --git a/emulators/qmc2/Makefile b/emulators/qmc2/Makefile
index 2e7c1c733aff..a298fbe6289e 100644
--- a/emulators/qmc2/Makefile
+++ b/emulators/qmc2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= qmc2
PORTVERSION= 0.195
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= SF
@@ -19,8 +20,8 @@ NO_WRKSUBDIR= yes
USES= gmake qt:5 tar:bzip2
USE_XORG= x11 xmu
USE_GL= gl glu
-USE_QT= buildtools_build core gui multimedia \
- network opengl quick qmake_build qml \
+USE_QT= buildtools_build core declarative gui multimedia \
+ network opengl qmake_build \
testlib script scripttools sql svg \
webkit widgets xml xmlpatterns
USE_SDL= sdl
diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
index e015ed3ffea5..47a1f1963d57 100644
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -39,7 +39,7 @@ GH_TUPLE= RPCS3:hidapi:hidapi-0.8.0-rc1-26-g4c27501:hidapi/3rdparty/hidapi \
USES= cmake:outsource compiler:c++17-lang iconv:wchar_t localbase:ldflags \
openal:soft pkgconfig qt:5
USE_GL= gl glew
-USE_QT= qmake_build buildtools_build core dbus gui network widgets qml
+USE_QT= qmake_build buildtools_build core dbus declarative gui network widgets
USE_XORG= x11
LLD_UNSAFE= yes # XXX ports/219089
CMAKE_ON= CMAKE_SKIP_RPATH USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG
diff --git a/finance/kmymoney/Makefile b/finance/kmymoney/Makefile
index e704248b0a26..c86a0384e189 100644
--- a/finance/kmymoney/Makefile
+++ b/finance/kmymoney/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kmymoney
PORTVERSION= 5.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= finance kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src
@@ -64,7 +64,7 @@ KBANKING_DESC= Online banking via KBanking (AqBanking)
KBANKING_LIB_DEPENDS= libgwenhywfar.so:devel/gwenhywfar \
libgwengui-qt5.so:devel/gwenhywfar-qt5 \
libaqbanking.so:finance/aqbanking
-KBANKING_USE= qt=qml,quick
+KBANKING_USE= qt=declarative
KBANKING_CMAKE_BOOL= ENABLE_KBANKING
KDEWEBKIT_DESC= Web content rendering via KDEWebKit
diff --git a/finance/skrooge/Makefile b/finance/skrooge/Makefile
index 3ef9a76fd8a6..b243bb42197a 100644
--- a/finance/skrooge/Makefile
+++ b/finance/skrooge/Makefile
@@ -2,6 +2,7 @@
PORTNAME= skrooge
DISTVERSION= 2.15.0
+PORTREVISION= 1
CATEGORIES= finance kde
MASTER_SITES= KDE/stable/${PORTNAME}
DIST_SUBDIR= KDE/${PORTNAME}
@@ -28,8 +29,8 @@ USE_KDE= activities archive attica5 auth bookmarks codecs completion \
package parts plasma-framework runner service solid sonnet \
textwidgets unitconversion wallet widgetsaddons windowsystem \
xmlgui
-USE_QT= concurrent core dbus designer gui network printsupport qml \
- quick script sql svg webkit widgets xml \
+USE_QT= concurrent core dbus declarative designer gui network printsupport \
+ script sql svg webkit widgets xml \
qmake_build buildtools_build
SHEBANG_FILES= plugins/import/skrooge_import_backend/skrooge-sabb.py \
skgbankmodeler/skrooge-coinmarketcap.py \
diff --git a/games/2048-qt/Makefile b/games/2048-qt/Makefile
index d2cb57326e50..11d50dfb97c4 100644
--- a/games/2048-qt/Makefile
+++ b/games/2048-qt/Makefile
@@ -3,6 +3,7 @@
PORTNAME= 2048-qt
PORTVERSION= 0.1.6
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= games
MAINTAINER= swills@FreeBSD.org
@@ -16,7 +17,7 @@ GH_ACCOUNT= xiaoyong
GH_PROJECT= 2048-Qt
USES= gmake pkgconfig qmake qt:5
-USE_QT= core gui network widgets qml quick buildtools_build quickcontrols
+USE_QT= core declarative gui network widgets buildtools_build quickcontrols
PLIST_FILES= bin/2048-qt ${DESKTOPDIR}/${PORTNAME}.desktop \
share/pixmaps/${PORTNAME}.png
diff --git a/games/bomber/Makefile b/games/bomber/Makefile
index 42f9335f75cb..2c22cba9dce4 100644
--- a/games/bomber/Makefile
+++ b/games/bomber/Makefile
@@ -2,6 +2,7 @@
PORTNAME= bomber
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT= ${${PORTNAME}_DESC}
USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
ecm i18n kio libkdegames widgetsaddons xmlgui
-USE_QT= core dbus gui network widgets phonon4 qml quick xml \
+USE_QT= core dbus declarative gui network widgets phonon4 xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/bovo/Makefile b/games/bovo/Makefile
index 21a4bdc6a2c9..e18fe53345a3 100644
--- a/games/bovo/Makefile
+++ b/games/bovo/Makefile
@@ -2,6 +2,7 @@
PORTNAME= bovo
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT= ${${PORTNAME}_DESC}
USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
ecm i18n kdeclarative libkdegames newstuff widgetsaddons xmlgui
-USE_QT= concurrent core dbus gui network qml quick svg widgets xml \
+USE_QT= concurrent core dbus declarative gui network svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 368903703303..0659f51e878b 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -3,7 +3,7 @@
PORTNAME= flightgear
PORTVERSION= 2018.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF/flightgear/release-${PORTVERSION:R}
@@ -49,7 +49,7 @@ DBUS_CMAKE_OFF= -DUSE_DBUS:BOOL=OFF
QT5_CMAKE_ON= -DENABLE_QT:BOOL=ON
QT5_CMAKE_OFF= -DENABLE_QT:BOOL=OFF
QT5_USES= qt:5
-QT5_USE= QT=core,buildtools,gui,network,qmake,qml,quick,widgets
+QT5_USE= QT=core,buildtools,gui,declarative,network,qmake,widgets
.include <bsd.port.pre.mk>
diff --git a/games/gcompris-qt/Makefile b/games/gcompris-qt/Makefile
index 81417d7ac05a..aba978286da5 100644
--- a/games/gcompris-qt/Makefile
+++ b/games/gcompris-qt/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gcompris-qt
DISTVERSION= 0.91
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games kde
MASTER_SITES= http://gcompris.net/download/qt/src/
@@ -16,7 +16,7 @@ LIB_DEPENDS= libBox2D.so:x11-toolkits/qml-box2d
USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= doctools
-USE_QT= core graphicaleffects gui multimedia network qml quick quickcontrols \
+USE_QT= core declarative graphicaleffects gui multimedia network quickcontrols \
sensors svg widgets xml xmlpatterns \
buildtools_build linguisttools_build qmake_build
diff --git a/games/granatier/Makefile b/games/granatier/Makefile
index 7786bb68595c..4f81d8d4da6d 100644
--- a/games/granatier/Makefile
+++ b/games/granatier/Makefile
@@ -2,6 +2,7 @@
PORTNAME= granatier
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= attica auth codecs config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n iconthemes itemviews kio \
libkdegames newstuff notifyconfig service widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/kanagram/Makefile b/games/kanagram/Makefile
index 608b291e6836..8e1bca747859 100644
--- a/games/kanagram/Makefile
+++ b/games/kanagram/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kanagram
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= attica auth codecs config configwidgets coreaddons crash \
doctools ecm i18n kdeclarative kio libkeduvocdocument newstuff \
package service sonnet widgetsaddons xmlgui
-USE_QT= core dbus gui network opengl qml quick speech svg widgets xml \
+USE_QT= core dbus declarative gui network opengl speech svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/kapman/Makefile b/games/kapman/Makefile
index 7d3dba5262e1..b4e9790e7cb8 100644
--- a/games/kapman/Makefile
+++ b/games/kapman/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kapman
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons ecm i18n libkdegames notifyconfig widgetsaddons \
windowsystem xmlgui
-USE_QT= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/katomic/Makefile b/games/katomic/Makefile
index f77b292b0d21..9af7b3e2c37c 100644
--- a/games/katomic/Makefile
+++ b/games/katomic/Makefile
@@ -2,6 +2,7 @@
PORTNAME= katomic
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= ${${PORTNAME}_DESC}
@@ -10,7 +11,7 @@ USES= cmake:outsource gettext kde:5 qt:5 shebangfix tar:xz
USE_KDE= attica auth codecs config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n iconthemes itemviews kio \
libkdegames newstuff notifyconfig service widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus declarative gui network widgets xml \
buildtools_build qmake_build
SHEBANG_FILES= katomic-levelset-upd.pl
diff --git a/games/kblackbox/Makefile b/games/kblackbox/Makefile
index d26586723d26..c9694f2ddd15 100644
--- a/games/kblackbox/Makefile
+++ b/games/kblackbox/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kblackbox
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= archive auth codecs config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n iconthemes libkdegames sonnet \
textwidgets widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/kblocks/Makefile b/games/kblocks/Makefile
index ffa54702b1fc..6e2b5b4edce7 100644
--- a/games/kblocks/Makefile
+++ b/games/kblocks/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kblocks
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons i18n itemmodels kio libkdegames newstuff \
notifyconfig textwidgets widgetsaddons windowsystem xmlgui
-USE_QT= core dbus gui network phonon4 qml quick svg testlib widgets xml \
+USE_QT= core dbus declarative gui network phonon4 svg testlib widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/kbounce/Makefile b/games/kbounce/Makefile
index bd83dba08069..23732e2753e7 100644
--- a/games/kbounce/Makefile
+++ b/games/kbounce/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kbounce
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n iconthemes jobwidgets kio \
libkdegames notifyconfig service textwidgets widgetsaddons xmlgui
-USE_QT= core dbus gui network phonon4 qml quick svg testlib widgets xml \
+USE_QT= core dbus declarative gui network phonon4 svg testlib widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/kbreakout/Makefile b/games/kbreakout/Makefile
index 5e7c13b1c121..31a163cf0c85 100644
--- a/games/kbreakout/Makefile
+++ b/games/kbreakout/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kbreakout
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n iconthemes jobwidgets kio libkdegames \
service widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/kdiamond/Makefile b/games/kdiamond/Makefile
index 0d6388828e01..f3147783362c 100644
--- a/games/kdiamond/Makefile
+++ b/games/kdiamond/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kdiamond
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
doctools ecm guiaddons i18n iconthemes libkdegames \
notifications notifyconfig widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus declarative gui network widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/kfourinline/Makefile b/games/kfourinline/Makefile
index 1e21f3f9a232..b7aa16863581 100644
--- a/games/kfourinline/Makefile
+++ b/games/kfourinline/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kfourinline
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -12,7 +13,7 @@ USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons dnssd ecm i18n iconthemes itemmodels itemviews \
kdeclarative kdelibs4support kio libkdegames notifyconfig \
widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/kgoldrunner/Makefile b/games/kgoldrunner/Makefile
index c933ed42798e..d154d49bfa4b 100644
--- a/games/kgoldrunner/Makefile
+++ b/games/kgoldrunner/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kgoldrunner
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons \
crash dbusaddons ecm i18n kio libkdegames service \
widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus declarative gui network widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/khangman/Makefile b/games/khangman/Makefile
index 54c551a68d3d..2825de16bcde 100644
--- a/games/khangman/Makefile
+++ b/games/khangman/Makefile
@@ -2,6 +2,7 @@
PORTNAME= khangman
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource compiler:c++11-lang gettext kde:5 qt:5 tar:xz
USE_KDE= attica auth codecs completion config configwidgets coreaddons \
crash doctools ecm i18n kdeclarative libkeduvocdocument \
newstuff notifications package service widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network svg widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/games/kigo/Makefile b/games/kigo/Makefile
index 289491c5bd74..198e8cc1d732 100644
--- a/games/kigo/Makefile
+++ b/games/kigo/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kigo
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -12,7 +13,7 @@ USE_KDE= attica auth codecs completion config configwidgets \
coreaddons crash dbusaddons ecm i18n jobwidgets kio \
libkdegames newstuff notifyconfig service sonnet textwidgets \
widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/killbots/Makefile b/games/killbots/Makefile
index 2ae2db540ee9..9b11283538cf 100644
--- a/games/killbots/Makefile
+++ b/games/killbots/Makefile
@@ -2,6 +2,7 @@
PORTNAME= killbots
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n iconthemes itemviews kio \
libkdegames notifyconfig widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus declarative gui network widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/kiriki/Makefile b/games/kiriki/Makefile
index a3d89c15223b..c7f6f1602ee1 100644
--- a/games/kiriki/Makefile
+++ b/games/kiriki/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kiriki
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT= ${${PORTNAME}_DESC}
USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
ecm guiaddons i18n iconthemes kio libkdegames widgetsaddons xmlgui
-USE_QT= core dbus gui network printsupport qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network printsupport svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/kjumpingcube/Makefile b/games/kjumpingcube/Makefile
index 266aa4adeee7..af2633b0fc51 100644
--- a/games/kjumpingcube/Makefile
+++ b/games/kjumpingcube/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kjumpingcube
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -12,7 +13,7 @@ USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n iconthemes itemviews jobwidgets \
kio libkdegames newstuff notifyconfig service widgetsaddons \
xmlgui
-USE_QT= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/klickety/Makefile b/games/klickety/Makefile
index 7e767e8dbfe5..685cb9b97dab 100644
--- a/games/klickety/Makefile
+++ b/games/klickety/Makefile
@@ -2,6 +2,7 @@
PORTNAME= klickety
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -13,7 +14,7 @@ USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons doctools ecm i18n itemviews \
jobwidgets kio libkdegames notifications notifyconfig service \
solid widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus declarative gui network widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/klines/Makefile b/games/klines/Makefile
index a3050baa5de9..88cbfa4b06fd 100644
--- a/games/klines/Makefile
+++ b/games/klines/Makefile
@@ -2,6 +2,7 @@
PORTNAME= klines
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
ecm guiaddons i18n iconthemes itemviews kio libkdegames \
newstuff service widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/kmahjongg/Makefile b/games/kmahjongg/Makefile
index 347157179802..bef90a128c43 100644
--- a/games/kmahjongg/Makefile
+++ b/games/kmahjongg/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kmahjongg
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -13,7 +14,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons doctools ecm i18n kdeclarative libkdegames newstuff \
widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/kmines/Makefile b/games/kmines/Makefile
index afae624042b1..767b5ff532e7 100644
--- a/games/kmines/Makefile
+++ b/games/kmines/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kmines
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
ecm i18n kio libkdegames notifyconfig sonnet textwidgets \
widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus declarative gui network widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/knavalbattle/Makefile b/games/knavalbattle/Makefile
index dff16aabfacb..124e21c38032 100644
--- a/games/knavalbattle/Makefile
+++ b/games/knavalbattle/Makefile
@@ -2,6 +2,7 @@
PORTNAME= knavalbattle
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons dnssd doctools ecm i18n libkdegames sonnet \
textwidgets widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus declarative gui network widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/knetwalk/Makefile b/games/knetwalk/Makefile
index 9c6a369ecc3c..be58af74849a 100644
--- a/games/knetwalk/Makefile
+++ b/games/knetwalk/Makefile
@@ -2,6 +2,7 @@
PORTNAME= knetwalk
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
ecm guiaddons i18n iconthemes itemviews kio libkdegames \
notifyconfig sonnet textwidgets widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/kolf/Makefile b/games/kolf/Makefile
index 48ca2c6f382b..21c23df882e2 100644
--- a/games/kolf/Makefile
+++ b/games/kolf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kolf
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -13,7 +14,7 @@ USE_KDE= auth bookmarks codecs completion config configwidgets \
itemviews jobwidgets kdelibs4support kio libkdegames \
notifications parts service solid sonnet textwidgets \
unitconversion widgetsaddons windowsystem xmlgui
-USE_QT= core dbus gui network phonon4 printsupport qml quick \
+USE_QT= core dbus declarative gui network phonon4 printsupport \
widgets xml \
buildtools_build qmake_build
diff --git a/games/kollision/Makefile b/games/kollision/Makefile
index 2dde50a35562..6964c46945da 100644
--- a/games/kollision/Makefile
+++ b/games/kollision/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kollision
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash dbusaddons \
ecm i18n kio libkdegames newstuff notifyconfig textwidgets \
widgetsaddons xmlgui
-USE_QT= core dbus gui network phonon4 qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network phonon4 svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/konquest/Makefile b/games/konquest/Makefile
index f747e5c01594..94c6d7a7952e 100644
--- a/games/konquest/Makefile
+++ b/games/konquest/Makefile
@@ -2,6 +2,7 @@
PORTNAME= konquest
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n libkdegames widgetsaddons \
xmlgui
-USE_QT= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/kpat/Makefile b/games/kpat/Makefile
index a5b06daf727c..d4c8b5af9223 100644
--- a/games/kpat/Makefile
+++ b/games/kpat/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kpat
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -14,7 +15,7 @@ USE_KDE= attica auth codecs completion config configwidgets coreaddons \
crash dbusaddons ecm guiaddons i18n iconthemes itemviews \
kdeclarative kio libkdegames newstuff notifyconfig service \
textwidgets widgetsaddons xmlgui
-USE_QT= core dbus gui network phonon4 qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network phonon4 svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/kreversi/Makefile b/games/kreversi/Makefile
index 0b256695dfd7..3eeb6337bae4 100644
--- a/games/kreversi/Makefile
+++ b/games/kreversi/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kreversi
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -12,7 +13,7 @@ USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm i18n iconthemes itemviews \
jobwidgets kdeclarative kio libkdegames package service \
solid widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/kshisen/Makefile b/games/kshisen/Makefile
index ee1f2e16dbf0..a44aae94748a 100644
--- a/games/kshisen/Makefile
+++ b/games/kshisen/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kshisen
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -13,7 +14,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons dnssd ecm i18n kdeclarative kio libkdegames \
newstuff widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/ksirk/Makefile b/games/ksirk/Makefile
index 3a65b575ca75..64df27a2fa12 100644
--- a/games/ksirk/Makefile
+++ b/games/ksirk/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ksirk
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -13,7 +14,7 @@ USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= attica auth codecs completion config configwidgets \
coreaddons crash i18n iconthemes kio libkdegames newstuff \
service wallet widgetsaddons xmlgui
-USE_QT= core dbus gui network phonon4 qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network phonon4 svg widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/games/ksnakeduel/Makefile b/games/ksnakeduel/Makefile
index 4528484e5a3c..3534aacd7aa1 100644
--- a/games/ksnakeduel/Makefile
+++ b/games/ksnakeduel/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ksnakeduel
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons \
crash dbusaddons ecm guiaddons i18n libkdegames \
widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/kspaceduel/Makefile b/games/kspaceduel/Makefile
index 31daca1b8a49..bf342ac817de 100644
--- a/games/kspaceduel/Makefile
+++ b/games/kspaceduel/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kspaceduel
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT= ${${PORTNAME}_DESC}
USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons \
crash dbusaddons ecm i18n libkdegames widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/ksquares/Makefile b/games/ksquares/Makefile
index 77bd1f3df5ec..50a71da23c68 100644
--- a/games/ksquares/Makefile
+++ b/games/ksquares/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ksquares
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons ecm guiaddons i18n iconthemes itemviews kio \
libkdegames notifyconfig widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus declarative gui network widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/ksudoku/Makefile b/games/ksudoku/Makefile
index 82b073730dde..e492e594c608 100644
--- a/games/ksudoku/Makefile
+++ b/games/ksudoku/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ksudoku
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -12,7 +13,7 @@ USE_GL= gl glu
USE_KDE= archive auth codecs completion config configwidgets \
coreaddons crash ecm guiaddons i18n jobwidgets kio \
libkdegames service widgetsaddons xmlgui
-USE_QT= core dbus gui network opengl printsupport qml quick \
+USE_QT= core dbus declarative gui network opengl printsupport \
svg widgets xml \
buildtools_build qmake_build
diff --git a/games/ktuberling/Makefile b/games/ktuberling/Makefile
index 069dd7393343..6b1108528732 100644
--- a/games/ktuberling/Makefile
+++ b/games/ktuberling/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ktuberling
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -14,8 +15,8 @@ USE_KDE= auth bookmarks codecs completion config configwidgets \
kdelibs4support kio libkdegames newstuff notifications \
notifyconfig parts service solid sonnet textwidgets \
unitconversion widgetsaddons windowsystem xmlgui
-USE_QT= core dbus gui multimedia network phonon4 printsupport qml \
- quick svg testlib widgets xml \
+USE_QT= core dbus declarative gui multimedia network phonon4 printsupport \
+ svg testlib widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/kubrick/Makefile b/games/kubrick/Makefile
index 5a6808547976..cdfda4d70284 100644
--- a/games/kubrick/Makefile
+++ b/games/kubrick/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kubrick
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource kde:5 qt:5 tar:xz
USE_GL= gl glu
USE_KDE= auth codecs config configwidgets coreaddons crash ecm \
i18n kio libkdegames service widgetsaddons xmlgui
-USE_QT= core dbus gui network opengl qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network opengl svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/libkdegames/Makefile b/games/libkdegames/Makefile
index 215e9b48711d..6cc5bdded9db 100644
--- a/games/libkdegames/Makefile
+++ b/games/libkdegames/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libkdegames
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -16,7 +17,7 @@ USE_KDE= archive attica auth bookmarks codecs completion config \
globalaccel guiaddons i18n iconthemes init itemmodels \
itemviews jobwidgets kdeclarative kdelibs4support kio newstuff \
package service textwidgets widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick svg testlib widgets xml \
+USE_QT= core dbus declarative gui network svg testlib widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/games/lskat/Makefile b/games/lskat/Makefile
index 21b55d4da397..73eb8c450e12 100644
--- a/games/lskat/Makefile
+++ b/games/lskat/Makefile
@@ -2,6 +2,7 @@
PORTNAME= lskat
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT= ${${PORTNAME}_DESC}
USES= cmake:outsource kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons crash ecm \
guiaddons i18n libkdegames notifyconfig widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick svg widgets xml \
+USE_QT= core dbus declarative gui network svg widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/games/openage/Makefile b/games/openage/Makefile
index 31546d10e2bc..6e2f3e9d0beb 100644
--- a/games/openage/Makefile
+++ b/games/openage/Makefile
@@ -4,6 +4,7 @@ PORTNAME= openage
DISTVERSIONPREFIX= v
DISTVERSION= 0.3.0-1262
DISTVERSIONSUFFIX= -ga554ab49
+PORTREVISION= 1
CATEGORIES= games
MAINTAINER= martinfilla@post.cz
@@ -36,7 +37,7 @@ USE_GITHUB= yes
GH_ACCOUNT= SFTtech
USE_SDL= image2 sdl2
USE_GL= gl glu
-USE_QT= core gui network qml quick buildtools_build qmake_build
+USE_QT= core declarative gui network buildtools_build qmake_build
USE_PYTHON= cython
USE_LDCONFIG= yes
diff --git a/games/picmi/Makefile b/games/picmi/Makefile
index b7aa5eafad58..2a01c17c274d 100644
--- a/games/picmi/Makefile
+++ b/games/picmi/Makefile
@@ -2,6 +2,7 @@
PORTNAME= picmi
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= auth codecs completion config configwidgets coreaddons crash \
dbusaddons doctools ecm i18n jobwidgets kdeclarative kio \
libkdegames newstuff service widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick svg testlib widgets xml \
+USE_QT= core dbus declarative gui network svg testlib widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile
index c6be11df3727..db3a119a2a87 100644
--- a/graphics/krita/Makefile
+++ b/graphics/krita/Makefile
@@ -2,6 +2,7 @@
PORTNAME= krita
DISTVERSION= 4.1.5
+PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}
DIST_SUBDIR= KDE/${PORTNAME}
@@ -35,8 +36,8 @@ USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
shared-mime-info
USE_KDE= archive completion config coreaddons crash guiaddons i18n \
itemmodels itemviews kio service widgetsaddons windowsystem
-USE_QT= concurrent core dbus gui multimedia network printsupport \
- qml quick svg testlib widgets x11extras xml \
+USE_QT= concurrent core dbus declarative gui multimedia network printsupport \
+ svg testlib widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm xcb xext xi
diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile
index f2e409694d30..d3577d650788 100644
--- a/graphics/okular/Makefile
+++ b/graphics/okular/Makefile
@@ -2,6 +2,7 @@
PORTNAME= okular
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -30,7 +31,7 @@ USE_KDE= activities archive auth bookmarks codecs completion config \
kdelibs4support khtml kio libkexiv2 parts pty \
service solid sonnet textwidgets threadweaver wallet \
widgetsaddons windowsystem xmlgui
-USE_QT= core dbus gui network phonon4 printsupport qml quick speech \
+USE_QT= core dbus declarative gui network phonon4 printsupport speech \
svg widgets xml \
buildtools_build qmake_build
diff --git a/graphics/photoqt/Makefile b/graphics/photoqt/Makefile
index da47a5896338..232813071585 100644
--- a/graphics/photoqt/Makefile
+++ b/graphics/photoqt/Makefile
@@ -3,7 +3,7 @@
PORTNAME= photoqt
DISTVERSIONPREFIX= v
DISTVERSION= 1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MAINTAINER= melanhit@gmail.com
@@ -13,7 +13,7 @@ LICENSE= GPLv2
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
localbase:ldflags qt:5
-USE_QT= core graphicaleffects gui multimedia network qml quick \
+USE_QT= core declarative graphicaleffects gui multimedia network \
quickcontrols sql svg widgets xml \
buildtools_build linguisttools_build qmake_build
diff --git a/graphics/qt5-3d/Makefile b/graphics/qt5-3d/Makefile
index 9e470dd47ba7..68c3c5df150e 100644
--- a/graphics/qt5-3d/Makefile
+++ b/graphics/qt5-3d/Makefile
@@ -2,6 +2,7 @@
PORTNAME= 3d
DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics
PKGNAMEPREFIX= qt5-
@@ -11,7 +12,7 @@ COMMENT= Qt3D module
LIB_DEPENDS= libassimp.so:multimedia/assimp
USES= compiler:c++11-lang pkgconfig qmake:norecursive qt-dist:5,3d
-USE_QT= concurrent core gui network qml quick buildtools_build
+USE_QT= concurrent core declarative gui network buildtools_build
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/graphics/qt5-graphicaleffects/Makefile b/graphics/qt5-graphicaleffects/Makefile
index ba3f358a4308..20fb2f83aa13 100644
--- a/graphics/qt5-graphicaleffects/Makefile
+++ b/graphics/qt5-graphicaleffects/Makefile
@@ -2,6 +2,7 @@
PORTNAME= graphicaleffects
DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics
PKGNAMEPREFIX= qt5-
@@ -11,6 +12,6 @@ COMMENT= Qt Quick graphical effects
BROKEN_armv6= fails to install: pkg-static: Unable to access file DropShadowBase.qmlc: No such file or directory
USES= compiler:c++11-lang qmake qt-dist:5,graphicaleffects
-USE_QT= buildtools_build core gui quick qml
+USE_QT= buildtools_build core declarative gui
.include <bsd.port.mk>
diff --git a/graphics/qt5-wayland/Makefile b/graphics/qt5-wayland/Makefile
index cae43c277b33..1c7627db206d 100644
--- a/graphics/qt5-wayland/Makefile
+++ b/graphics/qt5-wayland/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wayland
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
PKGNAMEPREFIX= qt5-
@@ -17,7 +17,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
USES= pkgconfig qmake:norecursive qt-dist:5,wayland
USE_GL= egl gl
USE_GNOME= glib20
-USE_QT= core dbus gui qml quick \
+USE_QT= core dbus gui declarative \
buildtools_build qmake_build
USE_XORG= x11 xcomposite
diff --git a/graphics/radiance/Makefile b/graphics/radiance/Makefile
index c786a31952e9..49bb2590f8da 100644
--- a/graphics/radiance/Makefile
+++ b/graphics/radiance/Makefile
@@ -22,7 +22,8 @@ USE_GITHUB= yes
GH_ACCOUNT= zbanks
GH_TAGNAME= 2b947cf
GH_TUPLE= zbanks:BTrack:1c5b72e:bt/BTrack
-USE_QT= core graphicaleffects gui network qml quick quickcontrols widgets buildtools_build qmake_build
+USE_QT= core declarative graphicaleffects gui network quickcontrols widgets \
+ buildtools_build qmake_build
USE_GL= gl glu
CMAKE_ARGS= -DRADIANCE_SYSTEM_RESOURCES:STRING=${DATADIR}/
diff --git a/graphics/spectacle/Makefile b/graphics/spectacle/Makefile
index b589b880b1cc..68b6f96cf6a1 100644
--- a/graphics/spectacle/Makefile
+++ b/graphics/spectacle/Makefile
@@ -2,6 +2,7 @@
PORTNAME= spectacle
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -16,7 +17,7 @@ USE_KDE= attica auth codecs completion config configwidgets coreaddons \
dbusaddons doctools ecm i18n jobwidgets kdeclarative kio \
libkipi newstuff notifications package service widgetsaddons \
windowsystem xmlgui
-USE_QT= core concurrent dbus gui network printsupport qml quick \
+USE_QT= core concurrent dbus declarative gui network printsupport \
quickcontrols widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= x11 xcb xext xfixes
diff --git a/lang/Makefile b/lang/Makefile
index 9e6d590c9d42..66797e214b98 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -311,7 +311,6 @@
SUBDIR += python37
SUBDIR += qore
SUBDIR += qscheme
- SUBDIR += qt5-qml
SUBDIR += quack
SUBDIR += racket
SUBDIR += racket-minimal
diff --git a/lang/py-qt5-qml/Makefile b/lang/py-qt5-qml/Makefile
index 517300e4b426..6931664e9d95 100644
--- a/lang/py-qt5-qml/Makefile
+++ b/lang/py-qt5-qml/Makefile
@@ -14,7 +14,7 @@ USES= python pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run network_run
USE_PYTHON= flavors
-USE_QT= core gui network qml buildtools_build qmake_build
+USE_QT= core declarative gui network buildtools_build qmake_build
OPTIONS_DEFINE= API DEBUG
OPTIONS_DEFAULT=API
diff --git a/lang/qt5-qml/files/patch-configure.json b/lang/qt5-qml/files/patch-configure.json
deleted file mode 100644
index 9a4b5cfa4e2a..000000000000
--- a/lang/qt5-qml/files/patch-configure.json
+++ /dev/null
@@ -1,12 +0,0 @@
-Do not enter src/quick for checks; we do not build this directory in this port
-and it expects qt5-gui to be installed.
---- configure.json.orig 2018-06-15 11:30:15 UTC
-+++ configure.json
-@@ -1,6 +1,5 @@
- {
- "subconfigs": [
-- "src/qml",
-- "src/quick"
-+ "src/qml"
- ]
- }
diff --git a/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARM64Assembler.h b/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARM64Assembler.h
deleted file mode 100644
index 78aedc0e0026..000000000000
--- a/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARM64Assembler.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/masm/assembler/ARM64Assembler.h.orig 2018-06-15 11:30:15 UTC
-+++ src/3rdparty/masm/assembler/ARM64Assembler.h
-@@ -3036,6 +3036,8 @@ class ARM64Assembler { (public)
- linuxPageFlush(current, current + page);
-
- linuxPageFlush(current, end);
-+#elif OS(FREEBSD)
-+ __clear_cache(code, reinterpret_cast<char*>(code) + size);
- #elif OS(QNX)
- #if !ENABLE(ASSEMBLER_WX_EXCLUSIVE)
- msync(code, size, MS_INVALIDATE_ICACHE);
diff --git a/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMAssembler.h b/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMAssembler.h
deleted file mode 100644
index 0790f74f2b50..000000000000
--- a/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMAssembler.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/masm/assembler/ARMAssembler.h.orig 2017-02-02 10:26:18 UTC
-+++ src/3rdparty/masm/assembler/ARMAssembler.h
-@@ -1069,6 +1069,8 @@ namespace JSC {
- UNUSED_PARAM(size);
- #elif OS(QNX)
- msync(code, size, MS_INVALIDATE_ICACHE);
-+#elif OS(FREEBSD) && COMPILER(CLANG)
-+ __clear_cache(code, reinterpret_cast<char*>(code) + size);
- #else
- #error "The cacheFlush support is missing on this platform."
- #endif
diff --git a/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h b/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h
deleted file mode 100644
index 29c5396f24f0..000000000000
--- a/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/3rdparty/masm/assembler/ARMv7Assembler.h.orig 2018-06-15 11:30:15 UTC
-+++ src/3rdparty/masm/assembler/ARMv7Assembler.h
-@@ -2372,6 +2372,8 @@ class ARMv7Assembler { (public)
- UNUSED_PARAM(code);
- UNUSED_PARAM(size);
- #endif
-+#elif OS(FREEBSD) && COMPILER(CLANG)
-+ __clear_cache(code, reinterpret_cast<char*>(code) + size);
- #else
- #error "The cacheFlush support is missing on this platform."
- #endif
diff --git a/lang/qt5-qml/files/patch-src_3rdparty_masm_wtf_Platform.h b/lang/qt5-qml/files/patch-src_3rdparty_masm_wtf_Platform.h
deleted file mode 100644
index d27be5097978..000000000000
--- a/lang/qt5-qml/files/patch-src_3rdparty_masm_wtf_Platform.h
+++ /dev/null
@@ -1,17 +0,0 @@
-Due to a misspelling in GCC [1] (probably) the check for the ARMv6KZ platform
-used __ARM_ARCH_6ZK__ instead of __ARM_ARCH_6KZ__.
-
-Append the correct spellings to the checks for __ARM_ARCH_6ZK__.
-
-[1] https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html
-
---- src/3rdparty/masm/wtf/Platform.h.orig 2018-06-15 11:30:15 UTC
-+++ src/3rdparty/masm/wtf/Platform.h
-@@ -221,6 +221,7 @@
- #elif defined(__ARM_ARCH_6__) \
- || defined(__ARM_ARCH_6J__) \
- || defined(__ARM_ARCH_6K__) \
-+ || defined(__ARM_ARCH_6KZ__) \
- || defined(__ARM_ARCH_6Z__) \
- || defined(__ARM_ARCH_6ZK__) \
- || defined(__ARM_ARCH_6T2__) \
diff --git a/lang/qt5-qml/files/patch-src__src.pro b/lang/qt5-qml/files/patch-src__src.pro
deleted file mode 100644
index baeb94ea8e94..000000000000
--- a/lang/qt5-qml/files/patch-src__src.pro
+++ /dev/null
@@ -1,34 +0,0 @@
-Only enter the directories we want to build, otherwise we might fail due to
-missing dependencies.
---- src/src.pro.orig 2018-06-15 11:30:15 UTC
-+++ src/src.pro
-@@ -1,29 +1,11 @@
- TEMPLATE = subdirs
- CONFIG += ordered
- include($$OUT_PWD/qml/qtqml-config.pri)
--include($$OUT_PWD/quick/qtquick-config.pri)
- QT_FOR_CONFIG += qml quick-private
- SUBDIRS += \
- qml
-
--qtHaveModule(gui):qtConfig(animation) {
-- SUBDIRS += \
-- quick
--
-- qtConfig(testlib): SUBDIRS += qmltest
-- qtConfig(quick-particles): \
-- SUBDIRS += particles
-- qtHaveModule(widgets): SUBDIRS += quickwidgets
--}
--
- SUBDIRS += \
-- plugins \
-- imports \
- qmldevtools
-
- qmldevtools.depends = qml
--
--qtConfig(qml-network) {
-- QT_FOR_CONFIG += network
-- qtConfig(localserver):qtConfig(qml-debug): SUBDIRS += qmldebug
--}
diff --git a/lang/qt5-qml/pkg-plist b/lang/qt5-qml/pkg-plist
deleted file mode 100644
index 051a831f0f58..000000000000
--- a/lang/qt5-qml/pkg-plist
+++ /dev/null
@@ -1,274 +0,0 @@
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qabstractanimationjob_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qanimationgroupjob_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qanimationjobutil_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qbitfield_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qcontinuinganimationgroupjob_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qdeferredcleanup_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qfieldlist_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qfinitestack_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qflagpointer_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qhashedstring_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qintrusivelist_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qjsengine_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qjsvalue_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qjsvalueiterator_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qlazilyallocated_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qparallelanimationgroupjob_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qpauseanimationjob_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qpodvector_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlabstractbinding_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlabstractprofileradapter_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmladaptormodel_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlapplicationengine_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbind_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbinding_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlboundsignal_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlboundsignalexpressionpointer_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbuiltinfunctions_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlchangeset_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcleanup_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcomponent_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcomponentattached_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlconfigurabledebugservice_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlconnections_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcontext_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcustomparser_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldata_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugconnector_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugpluginmanager_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugserver_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugserverconnection_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugservice_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugservicefactory_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugserviceinterfaces_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugstatesdelegate_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldelayedcallqueue_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldelegatemodel_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldelegatemodel_p_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldirparser_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlengine_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlexpression_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlextensionplugin_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlfileselector_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlglobal_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlguard_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlimport_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlincubator_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlinstantiator_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlinstantiator_p_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlirbuilder_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljavascriptexpression_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsast_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsastfwd_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsastvisitor_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsengine_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsglobal_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsgrammar_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljskeywords_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljslexer_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsmemorypool_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsparser_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllist_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistaccessor_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistcompositor_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistmodel_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistmodel_p_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistmodelworkeragent_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistwrapper_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllocale_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlloggingcategory_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmemoryprofiler_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmetatype_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmodelindexvaluetype_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmodelsmodule_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlnotifier_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlnullablevalue_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlobjectcreator_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlobjectmodel_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlopenmetaobject_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlplatform_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlprofiler_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlprofilerdefinitions_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlproperty_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertycache_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertycachecreator_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyindex_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyvalidator_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyvalueinterceptor_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlproxymetaobject_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlrefcount_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlscriptstring_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlstringconverters_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlthread_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltimer_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypecompiler_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypeloader_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypenamecache_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypenotavailable_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypewrapper_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlvaluetype_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlvaluetypeproxybinding_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlvaluetypewrapper_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlvme_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlvmemetaobject_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlxmlhttprequest_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qquickpackage_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qquickworkerscript_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qrecursionwatcher_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qrecyclepool_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qsequentialanimationgroupjob_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qtqml-config_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qtqmlglobal_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4alloca_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4argumentsobject_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arraybuffer_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arraydata_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arrayobject_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4assembler_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4booleanobject_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4bytecodegenerator_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4codegen_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compilationunitmapper_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compileddata_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compiler_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compilercontext_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compilercontrolflow_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compilerscanfunctions_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4context_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4dataview_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4dateobject_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4debugging_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4domerrors_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4engine_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4enginebase_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4errorobject_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4executableallocator_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4function_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4functionobject_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4global_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4globalobject_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4heap_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4identifier_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4identifiertable_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4include_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4instr_moth_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4internalclass_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4jit_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4jscall_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4jsonobject_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4jssimplifier_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4lookup_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4managed_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4math_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4mathobject_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4memberdata_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4mm_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4mmdefs_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4numberobject_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4object_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4objectiterator_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4objectproto_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4persistent_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4profiling_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4property_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4qmlcontext_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4qobjectwrapper_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4regexp_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4regexpobject_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4runtime_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4runtimeapi_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4runtimecodegen_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4scopedvalue_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4script_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4sequenceobject_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4serialize_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4sparsearray_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4sqlerrors_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4string_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4stringobject_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4typedarray_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4util_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4value_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4variantobject_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4vme_moth_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4writebarrier_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv8engine_p.h
-%%QT_INCDIR%%/QtQml/QJSEngine
-%%QT_INCDIR%%/QtQml/QJSValue
-%%QT_INCDIR%%/QtQml/QJSValueIterator
-%%QT_INCDIR%%/QtQml/QJSValueList
-%%QT_INCDIR%%/QtQml/QQmlAbstractUrlInterceptor
-%%QT_INCDIR%%/QtQml/QQmlApplicationEngine
-%%QT_INCDIR%%/QtQml/QQmlAttachedPropertiesFunc
-%%QT_INCDIR%%/QtQml/QQmlComponent
-%%QT_INCDIR%%/QtQml/QQmlContext
-%%QT_INCDIR%%/QtQml/QQmlDebuggingEnabler
-%%QT_INCDIR%%/QtQml/QQmlEngine
-%%QT_INCDIR%%/QtQml/QQmlError
-%%QT_INCDIR%%/QtQml/QQmlExpression
-%%QT_INCDIR%%/QtQml/QQmlExtensionInterface
-%%QT_INCDIR%%/QtQml/QQmlExtensionPlugin
-%%QT_INCDIR%%/QtQml/QQmlFile
-%%QT_INCDIR%%/QtQml/QQmlFileSelector
-%%QT_INCDIR%%/QtQml/QQmlImageProviderBase
-%%QT_INCDIR%%/QtQml/QQmlIncubationController
-%%QT_INCDIR%%/QtQml/QQmlIncubator
-%%QT_INCDIR%%/QtQml/QQmlInfo
-%%QT_INCDIR%%/QtQml/QQmlListProperty
-%%QT_INCDIR%%/QtQml/QQmlListReference
-%%QT_INCDIR%%/QtQml/QQmlNetworkAccessManagerFactory
-%%QT_INCDIR%%/QtQml/QQmlParserStatus
-%%QT_INCDIR%%/QtQml/QQmlProperties
-%%QT_INCDIR%%/QtQml/QQmlProperty
-%%QT_INCDIR%%/QtQml/QQmlPropertyMap
-%%QT_INCDIR%%/QtQml/QQmlPropertyValueSource
-%%QT_INCDIR%%/QtQml/QQmlScriptString
-%%QT_INCDIR%%/QtQml/QQmlTypeInfo
-%%QT_INCDIR%%/QtQml/QQmlTypesExtensionInterface
-%%QT_INCDIR%%/QtQml/QtQml
-%%QT_INCDIR%%/QtQml/QtQmlDepends
-%%QT_INCDIR%%/QtQml/QtQmlVersion
-%%QT_INCDIR%%/QtQml/qjsengine.h
-%%QT_INCDIR%%/QtQml/qjsvalue.h
-%%QT_INCDIR%%/QtQml/qjsvalueiterator.h
-%%QT_INCDIR%%/QtQml/qqml.h
-%%QT_INCDIR%%/QtQml/qqmlabstracturlinterceptor.h
-%%QT_INCDIR%%/QtQml/qqmlapplicationengine.h
-%%QT_INCDIR%%/QtQml/qqmlcomponent.h
-%%QT_INCDIR%%/QtQml/qqmlcontext.h
-%%QT_INCDIR%%/QtQml/qqmldebug.h
-%%QT_INCDIR%%/QtQml/qqmlengine.h
-%%QT_INCDIR%%/QtQml/qqmlerror.h
-%%QT_INCDIR%%/QtQml/qqmlexpression.h
-%%QT_INCDIR%%/QtQml/qqmlextensioninterface.h
-%%QT_INCDIR%%/QtQml/qqmlextensionplugin.h
-%%QT_INCDIR%%/QtQml/qqmlfile.h
-%%QT_INCDIR%%/QtQml/qqmlfileselector.h
-%%QT_INCDIR%%/QtQml/qqmlincubator.h
-%%QT_INCDIR%%/QtQml/qqmlinfo.h
-%%QT_INCDIR%%/QtQml/qqmllist.h
-%%QT_INCDIR%%/QtQml/qqmlnetworkaccessmanagerfactory.h
-%%QT_INCDIR%%/QtQml/qqmlparserstatus.h
-%%QT_INCDIR%%/QtQml/qqmlprivate.h
-%%QT_INCDIR%%/QtQml/qqmlproperty.h
-%%QT_INCDIR%%/QtQml/qqmlpropertymap.h
-%%QT_INCDIR%%/QtQml/qqmlpropertyvaluesource.h
-%%QT_INCDIR%%/QtQml/qqmlscriptstring.h
-%%QT_INCDIR%%/QtQml/qtqml-config.h
-%%QT_INCDIR%%/QtQml/qtqmlglobal.h
-%%QT_INCDIR%%/QtQml/qtqmlversion.h
-%%QT_CMAKEDIR%%/Qt5Qml/Qt5QmlConfig.cmake
-%%QT_CMAKEDIR%%/Qt5Qml/Qt5QmlConfigExtras.cmake
-%%QT_CMAKEDIR%%/Qt5Qml/Qt5QmlConfigVersion.cmake
-%%QT_LIBDIR%%/libQt5Qml.prl
-%%QT_LIBDIR%%/libQt5Qml.so
-%%QT_LIBDIR%%/libQt5Qml.so.5
-%%QT_LIBDIR%%/libQt5Qml.so.%%SHORTVER%%
-%%QT_LIBDIR%%/libQt5Qml.so.%%FULLVER%%
-%%DEBUG%%%%QT_LIBDIR%%/libQt5Qml.so.%%FULLVER%%.debug
-%%QT_LIBDIR%%/libQt5QmlDevTools.a
-%%QT_LIBDIR%%/libQt5QmlDevTools.prl
-%%QT_MKSPECDIR%%/modules/qt_lib_qml.pri
-%%QT_MKSPECDIR%%/modules/qt_lib_qml_private.pri
-%%QT_MKSPECDIR%%/modules/qt_lib_qmldevtools_private.pri
-libdata/pkgconfig/Qt5Qml.pc
diff --git a/math/analitza/Makefile b/math/analitza/Makefile
index e969957606fe..07727bfca116 100644
--- a/math/analitza/Makefile
+++ b/math/analitza/Makefile
@@ -2,6 +2,7 @@
PORTNAME= analitza
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= math kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -15,7 +16,7 @@ LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
USES= cmake:outsource compiler:c++11-lang gl kde:5 qt:5 tar:xz
USE_GL= glu
USE_KDE= ecm
-USE_QT= core gui network opengl printsupport qml quick svg widgets xml \
+USE_QT= core declarative gui network opengl printsupport svg widgets xml \
buildtools_build linguisttools_build qmake_build
USE_LDCONFIG= yes
diff --git a/math/kalgebra/Makefile b/math/kalgebra/Makefile
index d0bd43f91037..fb315059f845 100644
--- a/math/kalgebra/Makefile
+++ b/math/kalgebra/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kalgebra
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= math kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -16,7 +17,7 @@ USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_GL= glu
USE_KDE= auth codecs config configwidgets coreaddons doctools ecm i18n \
kio service widgetsaddons xmlgui
-USE_QT= core dbus gui location network opengl printsupport qml quick \
+USE_QT= core dbus declarative gui location network opengl printsupport \
svg testlib webchannel webengine widgets xml \
buildtools_build qmake_build
diff --git a/math/rocs/Makefile b/math/rocs/Makefile
index ac036d3a4a7d..715773402a3a 100644
--- a/math/rocs/Makefile
+++ b/math/rocs/Makefile
@@ -2,6 +2,7 @@
PORTNAME= rocs
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= math kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -15,7 +16,7 @@ USE_KDE= archive auth codecs completion config configwidgets coreaddons \
crash doctools ecm i18n itemviews jobwidgets kdeclarative \
kio package parts service sonnet texteditor textwidgets \
widgetsaddons xmlgui
-USE_QT= core dbus gui network qml script quick scripttools svg webkit \
+USE_QT= core dbus declarative gui network script scripttools svg webkit \
widgets xml xmlpatterns \
buildtools_build qmake_build
diff --git a/misc/artikulate/Makefile b/misc/artikulate/Makefile
index 7d6029b93941..13d99d3841bd 100644
--- a/misc/artikulate/Makefile
+++ b/misc/artikulate/Makefile
@@ -2,6 +2,7 @@
PORTNAME= artikulate
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -14,7 +15,7 @@ USES= cmake:outsource compiler:c++11-lang gettext kde:5 qt:5 tar:xz
USE_KDE= archive attica auth codecs config configwidgets coreaddons \
crash doctools ecm i18n kdeclarative newstuff service \
widgetsaddons xmlgui
-USE_QT= core dbus gui multimedia network qml quick sql testlib widgets \
+USE_QT= core dbus declarative gui multimedia network sql testlib widgets \
xml xmlpatterns \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/misc/kf5-purpose/Makefile b/misc/kf5-purpose/Makefile
index 08c9712d5a37..d088d3a4c96e 100644
--- a/misc/kf5-purpose/Makefile
+++ b/misc/kf5-purpose/Makefile
@@ -2,6 +2,7 @@
PORTNAME= purpose
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
@@ -14,7 +15,7 @@ USES= cmake:outsource compiler:c++11-lang gettext \
kde:5 pkgconfig qt:5 tar:xz
USE_GNOME= intltool
USE_KDE= config coreaddons ecm i18n kdeclarative kio service widgetsaddons
-USE_QT= concurrent core dbus gui network qml widgets xml \
+USE_QT= concurrent core dbus declarative gui network widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/misc/ktouch/Makefile b/misc/ktouch/Makefile
index 99a72b6367b9..43664eb6ee43 100644
--- a/misc/ktouch/Makefile
+++ b/misc/ktouch/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ktouch
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -12,7 +13,7 @@ USE_KDE= auth codecs completion config configwidgets coreaddons doctools \
ecm i18n itemviews kcmutils kdeclarative kio newstuff package \
parts service sonnet texteditor textwidgets widgetsaddons \
windowsystem xmlgui
-USE_QT= core dbus gui network qml quick script sql testlib widgets \
+USE_QT= core dbus declarative gui network script sql testlib widgets \
x11extras xml xmlpatterns \
buildtools_build qmake_build
USE_XORG= ice sm x11 xcb xext xkbfile
diff --git a/misc/parley/Makefile b/misc/parley/Makefile
index f5ee3c8aa3b5..744b82efd969 100644
--- a/misc/parley/Makefile
+++ b/misc/parley/Makefile
@@ -2,6 +2,7 @@
PORTNAME= parley
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= misc kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -17,7 +18,7 @@ USE_KDE= attica auth codecs completion configwidgets coreaddons config \
notifications kross khtml service sonnet textwidgets \
widgetsaddons xmlgui \
libkeduvocdocument
-USE_QT= concurrent core dbus gui location network multimedia qml quick \
+USE_QT= concurrent core dbus declarative gui location network multimedia \
script svg webchannel webengine widgets xml \
buildtools_build qmake_build
USE_XORG= x11 xrender
diff --git a/multimedia/QtAV/Makefile b/multimedia/QtAV/Makefile
index 43aab87c2c0d..4545718a06f8 100644
--- a/multimedia/QtAV/Makefile
+++ b/multimedia/QtAV/Makefile
@@ -3,7 +3,7 @@
PORTNAME= QtAV
PORTVERSION= 1.12.0
DISTVERSIONPREFIX= v
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia
DIST_SUBDIR= KDE
@@ -18,7 +18,7 @@ LIB_DEPENDS= libass.so:multimedia/libass \
USES= qmake:outsource qt:5
USE_GL= gl
-USE_QT= core gui network opengl qml quick sql widgets \
+USE_QT= core declarative gui network opengl sql widgets \
buildtools_build qmake_build
USE_XORG= x11 xext xv
diff --git a/multimedia/gstreamer1-qt/Makefile b/multimedia/gstreamer1-qt/Makefile
index 61e789c4b7cb..030bbf59755c 100644
--- a/multimedia/gstreamer1-qt/Makefile
+++ b/multimedia/gstreamer1-qt/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gstreamer1
PORTVERSION= 1.2.0
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/qt-gstreamer/
PKGNAMESUFFIX= -${FLAVOR}
@@ -36,8 +36,8 @@ USE_QT= corelib gui opengl declarative script \
PLIST_SUB= QT4_ONLY="" QT5_ONLY="@comment "
. else
USES+= compiler:c++11-lang qt:5
-USE_QT= buildtools_build qmake_build core gui network opengl \
- qml quick testlib widgets
+USE_QT= buildtools_build qmake_build core declarative gui network opengl \
+ testlib widgets
QTVER_SUFFIX= 5
PLIST_SUB= QT4_ONLY="@comment " QT5_ONLY=""
. endif
diff --git a/multimedia/kamoso/Makefile b/multimedia/kamoso/Makefile
index f4eca119ba3d..fda3cbe7439f 100644
--- a/multimedia/kamoso/Makefile
+++ b/multimedia/kamoso/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kamoso
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= multimedia kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -15,7 +16,7 @@ USE_GSTREAMER1= yes
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons ecm i18n itemviews jobwidgets kio purpose \
service solid widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus declarative gui network widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/multimedia/kdenlive/Makefile b/multimedia/kdenlive/Makefile
index bca3c2bfbdff..7f67ddd696cb 100644
--- a/multimedia/kdenlive/Makefile
+++ b/multimedia/kdenlive/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kdenlive
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= multimedia kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -23,9 +24,9 @@ USE_KDE= archive attica auth bookmarks codecs completion config \
notifications notifyconfig service solid sonnet textwidgets \
widgetsaddons xmlgui \
init_run
-USE_QT= concurrent core dbus gui network xml \
+USE_QT= concurrent core dbus declarative gui network xml \
buildtools_build qmake_build \
- qml quick quickcontrols_run script svg webkit widgets
+ quickcontrols_run script svg webkit widgets
USE_XORG= x11
CFLAGS+= -I${LOCALBASE}/include # linux/input.h
CMAKE_ARGS= -DFFMPEG_SUFFIX:STRING="${FFMPEG_SUFX}"
diff --git a/multimedia/minitube/Makefile b/multimedia/minitube/Makefile
index a92fb86e377f..abd8aeac4cbb 100644
--- a/multimedia/minitube/Makefile
+++ b/multimedia/minitube/Makefile
@@ -15,7 +15,7 @@ USES= qmake qt:5
USE_GITHUB= yes
GH_ACCOUNT= flaviotordini
USE_GL= gl
-USE_QT= core dbus gui network phonon4 qml script sql widgets \
+USE_QT= core dbus declarative gui network phonon4 script sql widgets \
buildtools_build imageformats_run sql-sqlite3_run
QMAKE_ARGS= QMAKE_LRELEASE=${LRELEASE} \
DEFINES+=APP_GOOGLE_API_KEY="${MINITUBE_GOOGLE_API_KEY}"
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 63f145437d61..52bb9ac44d31 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mkvtoolnix
PORTVERSION= 28.2.0
+PORTREVISION= 1
CATEGORIES= multimedia audio
MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
https://mkvtoolnix.download/sources/
@@ -50,7 +51,7 @@ NLS_CONFIGURE_WITH= gettext
QT5_DESC= Build and install GUI application (Qt 5)
QT5_USES= desktop-file-utils qt:5 shared-mime-info
-QT5_USE= QT=buildtools_build,concurrent,core,gui,multimedia,network,quick,widgets
+QT5_USE= QT=buildtools_build,concurrent,core,declarative,gui,multimedia,network,widgets
QT5_CONFIGURE_ENABLE= qt
QT5_BUILD_DEPENDS= qmake:devel/qt5-qmake
QT5_LIB_DEPENDS= libcmark.so:textproc/cmark
diff --git a/multimedia/qt5-multimedia/Makefile b/multimedia/qt5-multimedia/Makefile
index 3692af97aa52..1a1e65605dea 100644
--- a/multimedia/qt5-multimedia/Makefile
+++ b/multimedia/qt5-multimedia/Makefile
@@ -2,7 +2,7 @@
PORTNAME= multimedia
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
PKGNAMEPREFIX= qt5-
@@ -15,7 +15,7 @@ USES= compiler:c++11-lang gl gnome pkgconfig qmake:norecursive \
qt-dist:5,multimedia
USE_GL= gl
USE_GNOME= glib20
-USE_QT= core gui network opengl qml quick widgets \
+USE_QT= core declarative gui network opengl widgets \
buildtools_build
USE_XORG= x11 xext xv
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/multimedia/shotcut/Makefile b/multimedia/shotcut/Makefile
index 6aba6de192cf..c64c3b92627c 100644
--- a/multimedia/shotcut/Makefile
+++ b/multimedia/shotcut/Makefile
@@ -3,7 +3,7 @@
PORTNAME= shotcut
PORTVERSION= ${FULLVERSION:R}
DISTVERSIONPREFIX= v
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -25,9 +25,9 @@ GH_ACCOUNT= mltframework
FULLVERSION= 17.02.01
USES= pkgconfig qmake qt:5
-USE_QT= buildtools_build concurrent_build core \
+USE_QT= buildtools_build concurrent_build core declarative \
graphicaleffects_run gui multimedia network opengl \
- printsupport qml quick quickcontrols_run sql \
+ printsupport quickcontrols_run sql \
sql-sqlite3_run webkit websockets widgets x11extras xml
USE_XORG= x11
QMAKE_ARGS= ${PORTNAME:tu}_VERSION="${FULLVERSION}"
diff --git a/multimedia/webcamoid/Makefile b/multimedia/webcamoid/Makefile
index c31107d5eb45..f1e8cda20d3f 100644
--- a/multimedia/webcamoid/Makefile
+++ b/multimedia/webcamoid/Makefile
@@ -2,7 +2,7 @@
PORTNAME= webcamoid
DISTVERSION= 8.1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= multimedia
MAINTAINER= yuri@FreeBSD.org
@@ -22,7 +22,7 @@ USE_GITHUB= yes
USE_GNOME= glib20
USE_GSTREAMER1= yes
USE_GL= gl
-USE_QT= concurrent core gui multimedia network opengl qml quick svg widgets buildtools_build quickcontrols_run
+USE_QT= concurrent core declarative gui multimedia network opengl svg widgets buildtools_build quickcontrols_run
MAKE_ENV= NOOSS=1 # NOOSS is because the OSS module attempts to use kevent on OSS devices, which is broken in the base
QMAKE_ARGS= INSTALLQMLDIR=${QT_QMLDIR} \
diff --git a/multimedia/webvfx-qt5/Makefile b/multimedia/webvfx-qt5/Makefile
index aab6e41aaf14..8e9325ff9bf0 100644
--- a/multimedia/webvfx-qt5/Makefile
+++ b/multimedia/webvfx-qt5/Makefile
@@ -2,7 +2,7 @@
PORTNAME= webvfx
DISTVERSION= 0.4.4-20160823
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia
PKGNAMESUFFIX= -qt5
@@ -19,7 +19,7 @@ GH_ACCOUNT= mltframework
GH_TAGNAME= e918ce4
USES= pkgconfig qmake qt:5
-USE_QT= 3d buildtools_build opengl qml quick webkit
+USE_QT= 3d buildtools_build declarative opengl webkit
USE_LDCONFIG= yes
PORTEXAMPLES= *
diff --git a/net-im/cutegram/Makefile b/net-im/cutegram/Makefile
index a451a7f9afe4..e2a4f170bf3f 100644
--- a/net-im/cutegram/Makefile
+++ b/net-im/cutegram/Makefile
@@ -5,6 +5,7 @@ PORTNAME= cutegram
PORTVERSION= 2.7.1
DISTVERSIONPREFIX= v
DISTVERSIONSUFFIX= -stable
+PORTREVISION= 1
CATEGORIES= net-im
MAINTAINER= henry.hu.sh@gmail.com
@@ -23,7 +24,7 @@ GH_TAGNAME= 91bf14b:tools
GH_SUBDIR= Cutegram/asemantools:tools
USES= qmake:outsource desktop-file-utils qt:5 ssl
-USE_QT= qmake_build buildtools_build core qml quick sql xml multimedia \
+USE_QT= qmake_build buildtools_build core declarative sql xml multimedia \
widgets dbus webkit quickcontrols graphicaleffects sql-sqlite3
QMAKE_ARGS= LIBQTELEGRAM_INCLUDE_PATH="${LOCALBASE}/include/libqtelegram-ae" \
TELEGRAMQML_INCLUDE_PATH="${LOCALBASE}/include/telegramqml"
diff --git a/net-im/kaccounts-integration/Makefile b/net-im/kaccounts-integration/Makefile
index 1961b0612e78..dc7f1f31c59a 100644
--- a/net-im/kaccounts-integration/Makefile
+++ b/net-im/kaccounts-integration/Makefile
@@ -18,7 +18,7 @@ USES= cmake:outsource gettext pkgconfig kde:5 qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons dbusaddons ecm \
i18n iconthemes kcmutils kio service wallet widgetsaddons \
akonadi
-USE_QT= dbus core gui network qml widgets xml \
+USE_QT= dbus core declarative gui network widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/net-im/kaccounts-providers/Makefile b/net-im/kaccounts-providers/Makefile
index 96165e0508ea..001b8d4e5cbf 100644
--- a/net-im/kaccounts-providers/Makefile
+++ b/net-im/kaccounts-providers/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kaccounts-providers
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= net-im kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -15,7 +16,7 @@ LIB_DEPENDS= libaccounts-glib.so:net-im/libaccounts-glib \
USES= cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
USE_GNOME= intltool
USE_KDE= config coreaddons i18n kdeclarative kio package service
-USE_QT= core gui network qml xml \
+USE_QT= core declarative gui network xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/net-im/ktp-accounts-kcm/Makefile b/net-im/ktp-accounts-kcm/Makefile
index eab8cd351dd9..e5c3e1d03b61 100644
--- a/net-im/ktp-accounts-kcm/Makefile
+++ b/net-im/ktp-accounts-kcm/Makefile
@@ -23,7 +23,7 @@ USE_GNOME= intltool
USE_KDE= auth codecs config configwidgets coreaddons ecm i18n \
iconthemes itemviews kcmutils kio notifications notifyconfig \
service texteditor wallet widgetsaddons windowsystem
-USE_QT= core dbus gui network qml sql widgets xml \
+USE_QT= core dbus declarative gui network sql widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/net-im/ktp-call-ui/Makefile b/net-im/ktp-call-ui/Makefile
index b24fce9d968a..3850b887d093 100644
--- a/net-im/ktp-call-ui/Makefile
+++ b/net-im/ktp-call-ui/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ktp-call-ui
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= net-im kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -21,7 +22,7 @@ USE_GNOME= glib20
USE_KDE= auth codecs config configwidgets coreaddons ecm iconthemes \
i18n kcmutils kdeclarative notifications package service \
wallet widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus declarative gui network widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/net-im/ktp-common-internals/Makefile b/net-im/ktp-common-internals/Makefile
index f754ef3b4f39..a642f1532dfe 100644
--- a/net-im/ktp-common-internals/Makefile
+++ b/net-im/ktp-common-internals/Makefile
@@ -23,7 +23,7 @@ USE_KDE= auth bookmarks codecs completion config configwidgets \
kio notifications notifyconfig parts people service solid \
sonnet texteditor textwidgets wallet widgetsaddons windowsystem \
xmlgui
-USE_QT= core dbus gui network qml sql widgets xml \
+USE_QT= core dbus declarative gui network sql widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/net-im/ktp-desktop-applets/Makefile b/net-im/ktp-desktop-applets/Makefile
index 1c683762933e..2cba627f4daf 100644
--- a/net-im/ktp-desktop-applets/Makefile
+++ b/net-im/ktp-desktop-applets/Makefile
@@ -11,7 +11,7 @@ LIB_DEPENDS= libKTpCommonInternals.so:net-im/ktp-common-internals
USES= cmake:outsource gettext kde:5 qt:5 tar:xz
USE_KDE= ecm plasma-framework windowsystem
-USE_QT= core dbus gui network qml widgets \
+USE_QT= core dbus declarative gui network widgets \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/net-im/ktp-text-ui/Makefile b/net-im/ktp-text-ui/Makefile
index 571aaabe99f6..679694805ef1 100644
--- a/net-im/ktp-text-ui/Makefile
+++ b/net-im/ktp-text-ui/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ktp-text-ui
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= net-im kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -18,7 +19,7 @@ USE_KDE= archive auth codecs completion config configwidgets coreaddons \
kcmutils kdewebkit kio notifications notifyconfig people \
service sonnet textwidgets wallet widgetsaddons windowsystem \
xmlgui
-USE_QT= core dbus gui location network qml quick speech webchannel \
+USE_QT= core dbus declarative gui location network speech webchannel \
webengine widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/net-im/ricochet/Makefile b/net-im/ricochet/Makefile
index 9004237101de..e95ca40aed4c 100644
--- a/net-im/ricochet/Makefile
+++ b/net-im/ricochet/Makefile
@@ -4,7 +4,7 @@
PORTNAME= ricochet
PORTVERSION= 1.1.4
DISTVERSIONPREFIX= v
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= net-im net-p2p
MAINTAINER= yuri@FreeBSD.org
@@ -20,7 +20,7 @@ LIB_DEPENDS= libprotobuf.so:devel/protobuf
USES= compiler:c++11-lib gmake pkgconfig qmake qt:5 ssl
USE_GITHUB= yes
GH_ACCOUNT= ricochet-im
-USE_QT= core gui multimedia network qml quick quickcontrols widgets \
+USE_QT= core declarative gui multimedia network quickcontrols widgets \
buildtools_build linguisttools_build
USE_GL= gl
QMAKE_ARGS+= DEFINES+=RICOCHET_NO_PORTABLE OPENSSLDIR=${OPENSSLBASE}
diff --git a/net-im/telegramqml/Makefile b/net-im/telegramqml/Makefile
index 19cfe0a592cd..669edd7bdbe1 100644
--- a/net-im/telegramqml/Makefile
+++ b/net-im/telegramqml/Makefile
@@ -3,7 +3,7 @@
PORTNAME= telegramqml
PORTVERSION= 0.9.2
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= net-im
@@ -20,7 +20,7 @@ GH_ACCOUNT= Aseman-Land
GH_PROJECT= TelegramQML
USES= qmake:outsource qt:5 ssl
-USE_QT= qmake_build buildtools_build core qml quick sql xml multimedia
+USE_QT= qmake_build buildtools_build core declarative sql xml multimedia
USE_LDCONFIG= yes
QMAKE_ARGS= BUILD_MODE+=lib \
LIBQTELEGRAM_INCLUDE_PATH="${LOCALBASE}/include/libqtelegram-ae"
diff --git a/net/kf5-kholidays/Makefile b/net/kf5-kholidays/Makefile
index 79c09d5d2149..616afcca622b 100644
--- a/net/kf5-kholidays/Makefile
+++ b/net/kf5-kholidays/Makefile
@@ -11,7 +11,7 @@ LICENSE= LGPL21
USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= ecm emoticons kdelibs4support init itemmodels itemviews
-USE_QT= core gui qml buildtools_build qmake_build
+USE_QT= core declarative gui buildtools_build qmake_build
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/net/kitinerary/Makefile b/net/kitinerary/Makefile
index b8f57c348d5e..ef613e24982b 100644
--- a/net/kitinerary/Makefile
+++ b/net/kitinerary/Makefile
@@ -16,7 +16,7 @@ USES= cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= ecm i18n
# Pim components
USE_KDE+= calendarcore contacts kpkpass mime
-USE_QT= core qml \
+USE_QT= core declarative \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/net/libkgapi/Makefile b/net/libkgapi/Makefile
index 6aabb8c7948f..dbc441ab6155 100644
--- a/net/libkgapi/Makefile
+++ b/net/libkgapi/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libkgapi
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= net kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -23,7 +24,7 @@ USE_KDE= auth bookmarks codecs completion config configwidgets \
widgetsaddons windowsystem xmlgui solid sonnet wallet
# pim components
USE_KDE+= calendarcore contacts
-USE_QT= core dbus gui location qml network printsupport quick webchannel \
+USE_QT= core dbus declarative gui location network printsupport webchannel \
webengine widgets xml \
buildtools_build qmake_build
diff --git a/net/libksieve/Makefile b/net/libksieve/Makefile
index bb6bdbd0b1be..1fb20ffa9d69 100644
--- a/net/libksieve/Makefile
+++ b/net/libksieve/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libksieve
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= net kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -19,7 +20,7 @@ USE_KDE= archive attica auth codecs completion config configwidgets \
# pim components
USE_KDE+= akonadi identitymanagement libkdepim mailtransport mime \
pimcommon pimtextedit
-USE_QT= core dbus gui location network printsupport qml quick testlib \
+USE_QT= core dbus declarative gui location network printsupport testlib \
uitools webchannel webengine widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/net/linphone/Makefile b/net/linphone/Makefile
index cc061cdd2b66..d24d17837d9d 100644
--- a/net/linphone/Makefile
+++ b/net/linphone/Makefile
@@ -2,6 +2,7 @@
PORTNAME= linphone
PORTVERSION= 4.1.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= https://www.linphone.org/releases/sources/linphoneqt/
@@ -15,8 +16,8 @@ LIB_DEPENDS= libbctoolbox.so:net/bctoolbox \
liblinphone++.so:net/liblinphone
USES= cmake:outsource compiler:c++11-lib pkgconfig qt:5
-USE_QT= buildtools_build concurrent core gui linguisttools network \
- qmake_build qml quick quickcontrols2 speech svg testlib widgets
+USE_QT= buildtools_build concurrent core declarative gui linguisttools network \
+ qmake_build quickcontrols2 speech svg testlib widgets
post-patch:
@${REINPLACE_CMD} 's/LINPHONE_QT_GIT_VERSION/"${PORTVERSION}"/' \
diff --git a/net/messagelib/Makefile b/net/messagelib/Makefile
index 02860b2e9e1b..1b2eee62a045 100644
--- a/net/messagelib/Makefile
+++ b/net/messagelib/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
-
+
PORTNAME= messagelib
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= net kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -26,7 +27,7 @@ USE_KDE+= akonadi akonadicontacts akonadimime akonadisearch calendarcore \
contacts grantleetheme gravatar identitymanagement \
kdepim-apps-libs ldap libkdepim libkleo mailtransport mbox \
mime pimcommon pimtextedit
-USE_QT= core dbus gui location network printsupport qml quick testlib \
+USE_QT= core dbus declarative gui location network printsupport testlib \
uitools webchannel webengine widgets xml \
buildtools_build qmake_build
USE_LDCONFIG= yes
diff --git a/polish/kadu/Makefile b/polish/kadu/Makefile
index a42c6c3f5515..72f578b8a3d7 100644
--- a/polish/kadu/Makefile
+++ b/polish/kadu/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kadu
PORTVERSION= 4.3
-PORTREVISION= 7
+PORTREVISION= 8
PORTEPOCH= 1
CATEGORIES= polish net-im
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/:kadu \
@@ -40,8 +40,8 @@ USES= cmake compiler:c++11-lib gettext-runtime \
libarchive pkgconfig qt:5 readline tar:bzip2
USE_XORG= x11 xext xfixes xscrnsaver
USE_GNOME= glib20
-USE_QT= concurrent core dbus gui multimedia network \
- qml quick script scripttools sql webkit widgets x11extras \
+USE_QT= concurrent core dbus declarative gui multimedia network \
+ script scripttools sql webkit widgets x11extras \
xml xmlpatterns buildtools_build linguisttools_build \
qmake_build imageformats_run sql-sqlite3_run
# Setting KADU_VERSION disables git invocation
diff --git a/ports-mgmt/octopkg/Makefile b/ports-mgmt/octopkg/Makefile
index 2d30870be7b2..18c06b4595b7 100644
--- a/ports-mgmt/octopkg/Makefile
+++ b/ports-mgmt/octopkg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= octopkg
PORTVERSION= 0.2.0
-PORTREVISION= 3
+PORTREVISION= 4
DISTVERSIONPREFIX= v
CATEGORIES= ports-mgmt
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes
GH_ACCOUNT= aarnt
-USE_QT= core concurrent gui network xml widgets quick concurrent \
+USE_QT= core concurrent declarative gui network xml widgets concurrent \
buildtools_build
USES= qmake compiler:c++11-lib qt:5
diff --git a/print/print-manager/Makefile b/print/print-manager/Makefile
index 2d900b8c1965..d64afb01cd89 100644
--- a/print/print-manager/Makefile
+++ b/print/print-manager/Makefile
@@ -2,6 +2,7 @@
PORTNAME= print-manager
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= print kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -14,7 +15,7 @@ USE_KDE= auth codecs completion config configwidgets coreaddons \
dbusaddons ecm i18n iconthemes itemviews jobwidgets kcmutils \
kio notifications plasma-framework service widgetsaddons \
windowsystem
-USE_QT= core dbus gui network qml quick widgets xml \
+USE_QT= core dbus declarative gui network widgets xml \
buildtools_build qmake_build
OPTIONS_DEFINE= DOCS
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index ae816195ce30..a1bb41848549 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -37,8 +37,8 @@ LIB_DEPENDS= liblcms2.so:graphics/lcms2 \
libicuuc.so:devel/icu
USES= cmake:outsource desktop-file-utils jpeg pkgconfig python qt:5 shared-mime-info ssl tar:xz
-USE_QT= buildtools_build core gui linguisttools_build network opengl \
- printsupport qmake_build qml quick widgets xml
+USE_QT= buildtools_build core declarative gui linguisttools_build network opengl \
+ printsupport qmake_build widgets xml
USE_GNOME= libxml2
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
diff --git a/science/kalzium/Makefile b/science/kalzium/Makefile
index a12be4b6c2fb..fb7271d41d09 100644
--- a/science/kalzium/Makefile
+++ b/science/kalzium/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kalzium
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= science kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -22,7 +23,7 @@ USE_KDE= auth archive bookmarks codecs completion config configwidgets \
xmlgui
USE_OCAML= yes
NO_OCAML_RUNDEPENDS= yes
-USE_QT= core dbus gui network opengl printsupport qml quick script svg \
+USE_QT= core dbus declarative gui network opengl printsupport script svg \
widgets xml \
buildtools_build qmake_build
diff --git a/science/step/Makefile b/science/step/Makefile
index f79cc9c77c43..ea2e92854579 100644
--- a/science/step/Makefile
+++ b/science/step/Makefile
@@ -2,6 +2,7 @@
PORTNAME= step
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= science kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -19,7 +20,7 @@ USE_KDE= attica auth bookmarks codecs completion config configwidgets \
kdelibs4support khtml kio newstuff notifications parts \
plotting service solid sonnet textwidgets unitconversion \
widgetsaddons windowsystem xmlgui
-USE_QT= core dbus gui network opengl printsupport qml quick svg \
+USE_QT= core dbus declarative gui network opengl printsupport svg \
widgets xml \
buildtools_build qmake_build
CXXFLAGS_powerpc64= -Wno-error=return-type
diff --git a/security/plasma5-kscreenlocker/Makefile b/security/plasma5-kscreenlocker/Makefile
index 817d5751e0da..4aca1b5c9bff 100644
--- a/security/plasma5-kscreenlocker/Makefile
+++ b/security/plasma5-kscreenlocker/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kscreenlocker
DISTVERSION= ${KDE_PLASMA_VERSION}
+PORTREVISION= 1
CATEGORIES= security kde kde-plasma
MAINTAINER= kde@FreeBSD.org
@@ -20,7 +21,7 @@ USE_KDE= auth codecs config configwidgets coreaddons crash ecm \
kdeclarative kdelibs4support notifications package \
plasma-framework sonnet textwidgets wayland widgetsaddons \
windowsystem xmlgui
-USE_QT= core dbus gui network qml quick testlib widgets x11extras xml \
+USE_QT= core dbus declarative gui network testlib widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xcb xcursor xext xi
diff --git a/sysutils/kf5-baloo/Makefile b/sysutils/kf5-baloo/Makefile
index 156a8bcd3a03..e2fbd7275fd4 100644
--- a/sysutils/kf5-baloo/Makefile
+++ b/sysutils/kf5-baloo/Makefile
@@ -2,6 +2,7 @@
PORTNAME= baloo
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= sysutils kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
@@ -14,8 +15,8 @@ USES= cmake:outsource compiler:c++11-lib gettext kde:5 pathfix qt:5 tar:xz
USE_KDE= auth completion config coreaddons crash dbusaddons \
filemetadata i18n idletime jobwidgets kio service \
solid widgetsaddons
-USE_QT= buildtools_build core dbus gui network qmake_build \
- qml quick testlib widgets
+USE_QT= buildtools_build core dbus declarative gui network qmake_build \
+ testlib widgets
# Frameworks ports install localization files that conflict with some
# KDE4 localization ports
diff --git a/sysutils/plasma5-discover/Makefile b/sysutils/plasma5-discover/Makefile
index 8fa97e9e6737..b196204c5b21 100644
--- a/sysutils/plasma5-discover/Makefile
+++ b/sysutils/plasma5-discover/Makefile
@@ -2,6 +2,7 @@
PORTNAME= discover
DISTVERSION= ${KDE_PLASMA_VERSION}
+PORTREVISION= 1
CATEGORIES= sysutils kde kde-plasma
MAINTAINER= kde@FreeBSD.org
@@ -17,7 +18,7 @@ USE_KDE= archive attica auth codecs completion config configwidgets \
itemviews jobwidgets kdeclarative kio kirigami2 newstuff \
notifications package plasma-framework service solid \
textwidgets wallet widgetsaddons xmlgui
-USE_QT= concurrent core dbus gui network qml quick svg testlib widgets xml \
+USE_QT= concurrent core dbus declarative gui network svg testlib widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/sysutils/plasma5-systemsettings/Makefile b/sysutils/plasma5-systemsettings/Makefile
index 231a95568705..d5eb07203367 100644
--- a/sysutils/plasma5-systemsettings/Makefile
+++ b/sysutils/plasma5-systemsettings/Makefile
@@ -2,6 +2,7 @@
PORTNAME= systemsettings
DISTVERSION= ${KDE_PLASMA_VERSION}
+PORTREVISION= 1
CATEGORIES= sysutils kde kde-plasma
MAINTAINER= kde@FreeBSD.org
@@ -13,7 +14,7 @@ USE_KDE= activities activities-stats auth codecs completion config \
iconthemes itemviews jobwidgets js kcmutils kdeclarative khtml \
kio kirigami2 package parts plasma-workspace service sonnet textwidgets \
widgetsaddons windowsystem xmlgui
-USE_QT= concurrent core dbus gui network qml quick widgets xml \
+USE_QT= concurrent core dbus declarative gui network widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/textproc/kreport/Makefile b/textproc/kreport/Makefile
index 72a3361c1750..70e2d2f0b24e 100644
--- a/textproc/kreport/Makefile
+++ b/textproc/kreport/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS= libKPropertyCore3.so:x11-toolkits/kproperty
USES= cmake:outsource gettext kde:5 python:2.7 qt:5 tar:xz
USE_KDE= config coreaddons ecm marble widgetsaddons
-USE_QT= core gui network qml webkit widgets xml \
+USE_QT= core declarative gui network webkit widgets xml \
buildtools_build printsupport qmake_build
CONFLICTS_INSTALL= calligra-2*
diff --git a/www/falkon/Makefile b/www/falkon/Makefile
index 1e4fd1e07dae..b26c498048d0 100644
--- a/www/falkon/Makefile
+++ b/www/falkon/Makefile
@@ -2,7 +2,7 @@
PORTNAME= falkon
DISTVERSION= 3.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= KDE/stable/falkon/${DISTVERSION:R}/src/
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= cmake:outsource desktop-file-utils kde:5 qt:5 ssl tar:xz
USE_KDE= wallet
-USE_QT= core dbus gui location network printsupport qml quick \
+USE_QT= core dbus declarative gui location network printsupport \
sql webchannel webengine widgets x11extras \
buildtools_build qmake_build
USE_XORG= xcb
diff --git a/www/otter-browser/Makefile b/www/otter-browser/Makefile
index d99540d690e5..484f2e702764 100644
--- a/www/otter-browser/Makefile
+++ b/www/otter-browser/Makefile
@@ -3,6 +3,7 @@
PORTNAME= otter-browser
DISTVERSIONPREFIX= v
DISTVERSION= 0.9.99.3
+PORTREVISION= 1
CATEGORIES= www
MAINTAINER= kde@FreeBSD.org
@@ -14,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
USES= cmake:outsource compiler:c++11-lib desktop-file-utils qt:5
-USE_QT= concurrent core dbus gui multimedia network printsupport \
- qml script sql sql-sqlite3 svg widgets xmlpatterns \
+USE_QT= concurrent core dbus declarative gui multimedia network printsupport \
+ script sql sql-sqlite3 svg widgets xmlpatterns \
buildtools_build qmake_build
USE_GITHUB= yes
@@ -28,7 +29,7 @@ OPTIONS_DEFAULT= QTWEBENGINE QTWEBKIT
QTWEBENGINE_DESC= Build QtWebEngine backend
QTWEBKIT_DESC= Build QtWebKit backend
-QTWEBENGINE_USE= qt=location,quick,webchannel,webengine
+QTWEBENGINE_USE= qt=declarative,location,webchannel,webengine
QTWEBENGINE_CMAKE_BOOL= ENABLE_QTWEBENGINE
QTWEBKIT_USE= qt=webkit
diff --git a/www/py-qt5-webchannel/Makefile b/www/py-qt5-webchannel/Makefile
index f8696ae25dec..5b765babbd99 100644
--- a/www/py-qt5-webchannel/Makefile
+++ b/www/py-qt5-webchannel/Makefile
@@ -12,7 +12,7 @@ COMMENT= Python bindings for the Qt5 toolkit, QtWebChannel module
USES= python pyqt:5 qt:5
USE_PYQT= sip_build core_run gui_run network_run qml_run widgets_run
USE_PYTHON= flavors
-USE_QT= core qmake_build gui network qml webchannel widgets
+USE_QT= core declarative qmake_build gui network webchannel widgets
CONFIGURE_ARGS= --enable QtWebChannel \
--no-stubs
diff --git a/www/py-qt5-webengine/Makefile b/www/py-qt5-webengine/Makefile
index 2de59ae595e7..1ff7cef5890c 100644
--- a/www/py-qt5-webengine/Makefile
+++ b/www/py-qt5-webengine/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= webengine
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www devel python
MAINTAINER= kde@FreeBSD.org
@@ -13,7 +13,7 @@ USES= python pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run gui_run network_run webchannel_run
USE_PYTHON= flavors
-USE_QT= core gui location network printsupport qml quick webchannel \
+USE_QT= core declarative gui location network printsupport webchannel \
webengine widgets qmake_build
CONFIGURE_ARGS= --enable QtWebEngine \
diff --git a/www/qt5-webchannel/Makefile b/www/qt5-webchannel/Makefile
index 23120d2ea46a..e7813ca1d593 100644
--- a/www/qt5-webchannel/Makefile
+++ b/www/qt5-webchannel/Makefile
@@ -2,13 +2,14 @@
PORTNAME= webchannel
DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
CATEGORIES= www
PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5 library for integration of C++/QML with HTML/js clients
-USE_QT= buildtools_build core qml quick
+USE_QT= buildtools_build core declarative
USES= compiler:c++11-lang qmake:norecursive qt-dist:5,webchannel
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile
index 3817aff190bc..cdd10a2b4527 100644
--- a/www/qt5-webengine/Makefile
+++ b/www/qt5-webengine/Makefile
@@ -20,7 +20,7 @@
PORTNAME= webengine
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= www
PKGNAMEPREFIX= qt5-
@@ -73,7 +73,7 @@ SNDIO_VARS_OFF= QMAKE_CONFIGURE_ARGS+=-no-sndio
USES= gperf jpeg python:2.7,build pkgconfig \
qmake:norecursive,outsource qt-dist:5,webengine shebangfix
USE_GNOME= glib20 libxml2 libxslt
-USE_QT= core designer gui location network qml quick webchannel \
+USE_QT= core declarative designer gui location network webchannel \
widgets buildtools_build qmake_build printsupport
USE_XORG= x11 xcb xcomposite xcursor xext xi xorgproto \
xrandr xrender xscrnsaver xtst
diff --git a/www/qt5-webkit/Makefile b/www/qt5-webkit/Makefile
index f476206f4b69..fcf0360ddbe9 100644
--- a/www/qt5-webkit/Makefile
+++ b/www/qt5-webkit/Makefile
@@ -24,8 +24,8 @@ USES= bison cmake:outsource compiler:c++11-lang gperf jpeg \
tar:xz
USE_GNOME= glib20 libxml2 libxslt
USE_GSTREAMER1= core
-USE_QT= core gui location network opengl printsupport \
- qml quick sensors testlib webchannel widgets \
+USE_QT= core declarative gui location network opengl printsupport \
+ sensors testlib webchannel widgets \
buildtools_build qmake_build
USE_RUBY= yes
USE_XORG= x11 xcomposite xrender
diff --git a/www/qt5-websockets-qml/Makefile b/www/qt5-websockets-qml/Makefile
index 38e23297e4dc..da8423c96151 100644
--- a/www/qt5-websockets-qml/Makefile
+++ b/www/qt5-websockets-qml/Makefile
@@ -2,13 +2,14 @@
PORTNAME= websockets-qml
DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
CATEGORIES= www
PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt implementation of WebSocket protocol (QML bindings)
-USE_QT= buildtools_build core network qml quick websockets
+USE_QT= buildtools_build core declarative network websockets
USES= qmake qt-dist:5,websockets
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/x11-fm/konqueror/Makefile b/x11-fm/konqueror/Makefile
index 0f0774cec1a2..f19da860a904 100644
--- a/x11-fm/konqueror/Makefile
+++ b/x11-fm/konqueror/Makefile
@@ -2,6 +2,7 @@
PORTNAME= konqueror
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-fm www kde kde-applications
MAINTAINER= kde@FreeBSD.org
@@ -15,7 +16,7 @@ USE_KDE= activities archive auth bookmarks codecs completion config configwidge
itemviews jobwidgets js kcmutils kdelibs4support \
kdesu khtml kio notifications parts pty service solid sonnet \
textwidgets unitconversion widgetsaddons windowsystem xmlgui
-USE_QT= core dbus gui location network printsupport qml quick script \
+USE_QT= core dbus declarative gui location network printsupport script \
speech webchannel webengine widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xext
diff --git a/x11-themes/kf5-qqc2-desktop-style/Makefile b/x11-themes/kf5-qqc2-desktop-style/Makefile
index 72eb0fbedd4a..2bbf7ca0a436 100644
--- a/x11-themes/kf5-qqc2-desktop-style/Makefile
+++ b/x11-themes/kf5-qqc2-desktop-style/Makefile
@@ -2,6 +2,7 @@
PORTNAME= qqc2-desktop-style
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-themes kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT= Qt QuickControl2 style for KDE
USES= cmake:outsource compiler:c++11-lang kde:5 pkgconfig qt:5 tar:xz
USE_KDE= auth codecs config configwidgets coreaddons ecm iconthemes \
kirigami2 widgetsaddons
-USE_QT= gui network qml quick widgets xml \
+USE_QT= gui declarative network widgets xml \
buildtools_build core qmake_build
.include <bsd.port.mk>
diff --git a/x11-themes/plasma5-breeze/Makefile b/x11-themes/plasma5-breeze/Makefile
index a676eee99b16..7555c8c6cae0 100644
--- a/x11-themes/plasma5-breeze/Makefile
+++ b/x11-themes/plasma5-breeze/Makefile
@@ -2,6 +2,7 @@
PORTNAME= breeze
DISTVERSION= ${KDE_PLASMA_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-themes kde kde-plasma
MAINTAINER= kde@FreeBSD.org
@@ -15,7 +16,7 @@ USES= cmake:outsource compiler:c++11-lib cpe \
USE_KDE= auth breeze-icons codecs config configwidgets coreaddons \
decoration ecm frameworkintegration guiaddons i18n kcmutils \
plasma-framework service wayland widgetsaddons windowsystem
-USE_QT= core dbus gui network qml quick widgets x11extras xml \
+USE_QT= core dbus declarative gui network widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= xcb
diff --git a/x11-themes/plasma5-oxygen/Makefile b/x11-themes/plasma5-oxygen/Makefile
index df3e7de311d9..f71435184028 100644
--- a/x11-themes/plasma5-oxygen/Makefile
+++ b/x11-themes/plasma5-oxygen/Makefile
@@ -2,6 +2,7 @@
PORTNAME= oxygen
DISTVERSION= ${KDE_PLASMA_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-themes kde kde-plasma
MAINTAINER= kde@FreeBSD.org
@@ -18,7 +19,7 @@ USE_LDCONFIG= yes
USE_KDE= auth codecs completion config configwidgets coreaddons decoration ecm \
frameworkintegration guiaddons i18n kcmutils service \
wayland widgetsaddons windowsystem
-USE_QT= core dbus gui network qml quick widgets x11extras xml \
+USE_QT= core dbus declarative gui network widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= xcb
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 9e71095a97bb..b73acc7d0844 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -230,10 +230,10 @@
SUBDIR += qt5-canvas3d
SUBDIR += qt5-charts
SUBDIR += qt5-datavis3d
+ SUBDIR += qt5-declarative
SUBDIR += qt5-gamepad
SUBDIR += qt5-gtkplatform
SUBDIR += qt5-gui
- SUBDIR += qt5-quick
SUBDIR += qt5-quickcontrols
SUBDIR += qt5-quickcontrols2
SUBDIR += qt5-uiplugin
diff --git a/x11-toolkits/kf5-kirigami2/Makefile b/x11-toolkits/kf5-kirigami2/Makefile
index 3411fb102f8a..07f749d85b6a 100644
--- a/x11-toolkits/kf5-kirigami2/Makefile
+++ b/x11-toolkits/kf5-kirigami2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= kirigami2
PORTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-toolkits kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
@@ -10,8 +11,8 @@ COMMENT= QtQuick based components set
USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= ecm kdeclarative
-USE_QT= core dbus gui linguisttools network \
- qml quick quickcontrols2 svg testlib widgets \
+USE_QT= core dbus declarative gui linguisttools network \
+ quickcontrols2 svg testlib widgets \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/x11-toolkits/kproperty/Makefile b/x11-toolkits/kproperty/Makefile
index ccb8b960eb9e..6a72c58e712e 100644
--- a/x11-toolkits/kproperty/Makefile
+++ b/x11-toolkits/kproperty/Makefile
@@ -12,8 +12,8 @@ COMMENT= Property editing framwork
USES= cmake:outsource compiler:c++11-lang gettext kde:5 qt:5 \
tar:xz
USE_KDE= ecm config coreaddons guiaddons i18n widgetsaddons
-USE_QT= core gui widgets xml \
- buildtools_build qmake_build qml
+USE_QT= core declarative gui widgets xml \
+ buildtools_build qmake_build
CONFLICTS_INSTALL= calligra-2*
diff --git a/x11-toolkits/plasma5-kdeplasma-addons/Makefile b/x11-toolkits/plasma5-kdeplasma-addons/Makefile
index 3fbb77c4e7e7..721f04cd0e68 100644
--- a/x11-toolkits/plasma5-kdeplasma-addons/Makefile
+++ b/x11-toolkits/plasma5-kdeplasma-addons/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kdeplasma-addons
DISTVERSION= ${KDE_PLASMA_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-toolkits kde kde-plasma
MAINTAINER= kde@FreeBSD.org
@@ -15,8 +16,8 @@ USE_KDE= activities archive attica auth bookmarks codecs completion \
kdelibs4support kio kross newstuff notifications package parts\
plasma-framework plasma-workspace runner service solid sonnet \
textwidgets unitconversion widgetsaddons windowsystem xmlgui
-USE_QT= core dbus graphicaleffects gui location network printsupport \
- qml quick script webchannel webengine widgets x11extras xml \
+USE_QT= core dbus declarative graphicaleffects gui location network \
+ printsupport script webchannel webengine widgets x11extras xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/x11-toolkits/py-qt5-quick/Makefile b/x11-toolkits/py-qt5-quick/Makefile
index 3d92ead5a086..caf225aa878a 100644
--- a/x11-toolkits/py-qt5-quick/Makefile
+++ b/x11-toolkits/py-qt5-quick/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= quick
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits devel python
MAINTAINER= kde@FreeBSD.org
@@ -13,7 +13,7 @@ PYQT_DIST= yes
USES= python pyqt:5 qt:5
USE_PYQT= sip_build core_run gui_run
USE_PYTHON= flavors
-USE_QT= core quick qmake_build
+USE_QT= core declarative qmake_build
OPTIONS_DEFINE= API DEBUG
OPTIONS_DEFAULT=API
diff --git a/x11-toolkits/py-qt5-quickwidgets/Makefile b/x11-toolkits/py-qt5-quickwidgets/Makefile
index 64f23b3982c1..2a500f1ea887 100644
--- a/x11-toolkits/py-qt5-quickwidgets/Makefile
+++ b/x11-toolkits/py-qt5-quickwidgets/Makefile
@@ -1,6 +1,7 @@
# $FreeBSD$
PORTNAME= quickwidgets
+PORTREVISION= 1
CATEGORIES= x11-toolkits devel python
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USE_GL= gl
USE_PYQT= sip_build core_run gui_run
PYQT_DIST= yes
USE_PYTHON= flavors
-USE_QT= core gui network qml quick widgets \
+USE_QT= core declarative gui network widgets \
qmake_build
CONFIGURE_ARGS= --enable QtQuickWidgets
diff --git a/x11-toolkits/qml-box2d/Makefile b/x11-toolkits/qml-box2d/Makefile
index 2b7f151400e5..a0d6baf46e3c 100644
--- a/x11-toolkits/qml-box2d/Makefile
+++ b/x11-toolkits/qml-box2d/Makefile
@@ -2,6 +2,7 @@
PORTNAME= qml-box2d
DISTVERSION= 2.0.20180109
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MAINTAINER= kde@FreeBSD.org
@@ -11,7 +12,7 @@ USES= compiler:c++11-lang qmake:outsource qt:5
USE_GITHUB= yes
GH_TAGNAME= 21e57f
USE_GL= gl
-USE_QT= core gui network qml quick \
+USE_QT= core declarative gui network \
buildtools_build qmake_build
USE_LDCONFIG= ${QT_QMLDIR}/Box2D.2.0/
diff --git a/x11-toolkits/qt5-canvas3d/Makefile b/x11-toolkits/qt5-canvas3d/Makefile
index ecc077b4df8f..9148eade1a71 100644
--- a/x11-toolkits/qt5-canvas3d/Makefile
+++ b/x11-toolkits/qt5-canvas3d/Makefile
@@ -2,13 +2,14 @@
PORTNAME= canvas3d
DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt canvas3d module
-USE_QT= core gui network qml quick buildtools_build
+USE_QT= core declarative gui network buildtools_build
USES= compiler:c++11-lang qmake qt-dist:5,canvas3d
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/x11-toolkits/qt5-charts/Makefile b/x11-toolkits/qt5-charts/Makefile
index 6f77c7150d6a..575019a39262 100644
--- a/x11-toolkits/qt5-charts/Makefile
+++ b/x11-toolkits/qt5-charts/Makefile
@@ -2,6 +2,7 @@
PORTNAME= charts
DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-
@@ -9,7 +10,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5 charts module
USES= qmake qt-dist:5,charts tar:xz
-USE_QT= core network gui widgets qml quick designer \
+USE_QT= core declarative network gui widgets designer \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/x11-toolkits/qt5-datavis3d/Makefile b/x11-toolkits/qt5-datavis3d/Makefile
index 39378acd4c04..87613b526f0a 100644
--- a/x11-toolkits/qt5-datavis3d/Makefile
+++ b/x11-toolkits/qt5-datavis3d/Makefile
@@ -2,13 +2,14 @@
PORTNAME= datavis3d
DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5 3D data visualization module
-USE_QT= core network gui widgets qml quick designer buildtools_build
+USE_QT= core declarative network gui widgets designer buildtools_build
USES= compiler:c++11-lang qmake qt-dist:5,datavis3d
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/lang/qt5-qml/Makefile b/x11-toolkits/qt5-declarative/Makefile
index 5b0fe3f7ed44..9071c536a390 100644
--- a/lang/qt5-qml/Makefile
+++ b/x11-toolkits/qt5-declarative/Makefile
@@ -1,29 +1,30 @@
# $FreeBSD$
-PORTNAME= qml
+PORTNAME= declarative
DISTVERSION= ${QT5_VERSION}
-CATEGORIES= lang
+CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
-COMMENT= Qt QML and JavaScript language module
+COMMENT= Qt declarative framework for dynamic user interfaces
-USE_QT= core network buildtools_build
-USES= compiler:c++11-lang python:build qmake qt-dist:5,declarative
+USES= compiler:c++11-lang gl python:build qmake:norecursive \
+ qt-dist:5
+USE_GL= gl
+USE_QT= core gui network sql testlib \
+ widgets xmlpatterns buildtools_build
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
-BUILD_WRKSRC= ${WRKSRC}/src
-INSTALL_WRKSRC= ${WRKSRC}/src
+CONFLICTS= qt5-declarative-render2d-*
-post-patch:
-# tools/tools.pro will be processed automatically unless it does not exist.
- ${RM} -r ${WRKSRC}/tools
-
- ${REINPLACE_CMD} 's,python,${PYTHON_CMD},g' \
- ${WRKSRC}/src/3rdparty/masm/masm.pri
+QT_DEFINES= ACCESSIBILITY
+QT_CONFIG= accessibility accessibility-atspi-bridge
+post-patch:
# qtdeclarative.pro wants to run python, replace that with PYTHON_CMD
${REINPLACE_CMD} '/py_out/s#python#${PYTHON_CMD}#g' \
${WRKSRC}/qtdeclarative.pro
+ ${REINPLACE_CMD} 's,python,${PYTHON_CMD},g' \
+ ${WRKSRC}/src/3rdparty/masm/masm.pri
.include <bsd.port.mk>
diff --git a/x11-toolkits/qt5-quick/files/patch-tools_qmlcachegen_qmlcachegen.pro b/x11-toolkits/qt5-declarative/files/patch-tools_qmlcachegen_qmlcachegen.pro
index 837a80927b5d..837a80927b5d 100644
--- a/x11-toolkits/qt5-quick/files/patch-tools_qmlcachegen_qmlcachegen.pro
+++ b/x11-toolkits/qt5-declarative/files/patch-tools_qmlcachegen_qmlcachegen.pro
diff --git a/x11-toolkits/qt5-quick/pkg-descr b/x11-toolkits/qt5-declarative/pkg-descr
index 06bb1d9109d5..06bb1d9109d5 100644
--- a/x11-toolkits/qt5-quick/pkg-descr
+++ b/x11-toolkits/qt5-declarative/pkg-descr
diff --git a/x11-toolkits/qt5-quick/pkg-plist b/x11-toolkits/qt5-declarative/pkg-plist
index 143fe120ec49..761df463a59c 100644
--- a/x11-toolkits/qt5-quick/pkg-plist
+++ b/x11-toolkits/qt5-declarative/pkg-plist
@@ -1,4 +1,3 @@
-%%QT_BINDIR%%/qmlcachegen
%%QT_INCDIR%%/QtPacketProtocol/%%FULLVER%%/QtPacketProtocol/private/qpacket_p.h
%%QT_INCDIR%%/QtPacketProtocol/%%FULLVER%%/QtPacketProtocol/private/qpacketprotocol_p.h
%%QT_INCDIR%%/QtPacketProtocol/%%FULLVER%%/QtPacketProtocol/private/qversionedpacket_p.h
@@ -6,6 +5,265 @@
%%QT_INCDIR%%/QtPacketProtocol/QtPacketProtocolDepends
%%QT_INCDIR%%/QtPacketProtocol/QtPacketProtocolVersion
%%QT_INCDIR%%/QtPacketProtocol/qtpacketprotocolversion.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qabstractanimationjob_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qanimationgroupjob_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qanimationjobutil_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qbitfield_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qcontinuinganimationgroupjob_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qdeferredcleanup_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qfieldlist_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qfinitestack_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qflagpointer_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qhashedstring_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qintrusivelist_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qjsengine_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qjsvalue_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qjsvalueiterator_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qlazilyallocated_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qparallelanimationgroupjob_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qpauseanimationjob_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qpodvector_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlabstractbinding_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlabstractprofileradapter_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmladaptormodel_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlapplicationengine_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbind_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbinding_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlboundsignal_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlboundsignalexpressionpointer_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbuiltinfunctions_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlchangeset_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcleanup_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcomponent_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcomponentattached_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlconfigurabledebugservice_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlconnections_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcontext_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcustomparser_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldata_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugconnector_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugpluginmanager_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugserver_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugserverconnection_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugservice_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugservicefactory_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugserviceinterfaces_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugstatesdelegate_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldelayedcallqueue_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldelegatemodel_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldelegatemodel_p_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldirparser_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlengine_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlexpression_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlextensionplugin_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlfileselector_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlglobal_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlguard_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlimport_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlincubator_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlinstantiator_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlinstantiator_p_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlirbuilder_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljavascriptexpression_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsast_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsastfwd_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsastvisitor_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsengine_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsglobal_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsgrammar_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljskeywords_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljslexer_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsmemorypool_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsparser_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllist_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistaccessor_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistcompositor_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistmodel_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistmodel_p_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistmodelworkeragent_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistwrapper_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllocale_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlloggingcategory_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmemoryprofiler_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmetatype_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmodelindexvaluetype_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmodelsmodule_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlnotifier_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlnullablevalue_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlobjectcreator_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlobjectmodel_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlopenmetaobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlplatform_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlprofiler_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlprofilerdefinitions_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlproperty_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertycache_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertycachecreator_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyindex_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyvalidator_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyvalueinterceptor_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlproxymetaobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlrefcount_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlscriptstring_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlstringconverters_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlthread_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltimer_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypecompiler_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypeloader_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypenamecache_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypenotavailable_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypewrapper_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlvaluetype_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlvaluetypeproxybinding_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlvaluetypewrapper_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlvme_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlvmemetaobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlxmlhttprequest_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qquickpackage_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qquickworkerscript_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qrecursionwatcher_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qrecyclepool_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qsequentialanimationgroupjob_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qtqml-config_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qtqmlglobal_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4alloca_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4argumentsobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arraybuffer_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arraydata_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arrayobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4assembler_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4booleanobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4bytecodegenerator_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4codegen_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compilationunitmapper_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compileddata_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compiler_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compilercontext_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compilercontrolflow_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compilerscanfunctions_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4context_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4dataview_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4dateobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4debugging_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4domerrors_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4engine_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4enginebase_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4errorobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4executableallocator_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4function_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4functionobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4global_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4globalobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4heap_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4identifier_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4identifiertable_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4include_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4instr_moth_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4internalclass_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4jit_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4jscall_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4jsonobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4jssimplifier_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4lookup_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4managed_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4math_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4mathobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4memberdata_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4mm_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4mmdefs_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4numberobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4object_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4objectiterator_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4objectproto_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4persistent_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4profiling_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4property_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4qmlcontext_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4qobjectwrapper_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4regexp_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4regexpobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4runtime_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4runtimeapi_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4runtimecodegen_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4scopedvalue_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4script_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4sequenceobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4serialize_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4sparsearray_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4sqlerrors_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4string_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4stringobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4typedarray_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4util_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4value_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4variantobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4vme_moth_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4writebarrier_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv8engine_p.h
+%%QT_INCDIR%%/QtQml/QJSEngine
+%%QT_INCDIR%%/QtQml/QJSValue
+%%QT_INCDIR%%/QtQml/QJSValueIterator
+%%QT_INCDIR%%/QtQml/QJSValueList
+%%QT_INCDIR%%/QtQml/QQmlAbstractUrlInterceptor
+%%QT_INCDIR%%/QtQml/QQmlApplicationEngine
+%%QT_INCDIR%%/QtQml/QQmlAttachedPropertiesFunc
+%%QT_INCDIR%%/QtQml/QQmlComponent
+%%QT_INCDIR%%/QtQml/QQmlContext
+%%QT_INCDIR%%/QtQml/QQmlDebuggingEnabler
+%%QT_INCDIR%%/QtQml/QQmlEngine
+%%QT_INCDIR%%/QtQml/QQmlError
+%%QT_INCDIR%%/QtQml/QQmlExpression
+%%QT_INCDIR%%/QtQml/QQmlExtensionInterface
+%%QT_INCDIR%%/QtQml/QQmlExtensionPlugin
+%%QT_INCDIR%%/QtQml/QQmlFile
+%%QT_INCDIR%%/QtQml/QQmlFileSelector
+%%QT_INCDIR%%/QtQml/QQmlImageProviderBase
+%%QT_INCDIR%%/QtQml/QQmlIncubationController
+%%QT_INCDIR%%/QtQml/QQmlIncubator
+%%QT_INCDIR%%/QtQml/QQmlInfo
+%%QT_INCDIR%%/QtQml/QQmlListProperty
+%%QT_INCDIR%%/QtQml/QQmlListReference
+%%QT_INCDIR%%/QtQml/QQmlNetworkAccessManagerFactory
+%%QT_INCDIR%%/QtQml/QQmlParserStatus
+%%QT_INCDIR%%/QtQml/QQmlProperties
+%%QT_INCDIR%%/QtQml/QQmlProperty
+%%QT_INCDIR%%/QtQml/QQmlPropertyMap
+%%QT_INCDIR%%/QtQml/QQmlPropertyValueSource
+%%QT_INCDIR%%/QtQml/QQmlScriptString
+%%QT_INCDIR%%/QtQml/QQmlTypeInfo
+%%QT_INCDIR%%/QtQml/QQmlTypesExtensionInterface
+%%QT_INCDIR%%/QtQml/QtQml
+%%QT_INCDIR%%/QtQml/QtQmlDepends
+%%QT_INCDIR%%/QtQml/QtQmlVersion
+%%QT_INCDIR%%/QtQml/qjsengine.h
+%%QT_INCDIR%%/QtQml/qjsvalue.h
+%%QT_INCDIR%%/QtQml/qjsvalueiterator.h
+%%QT_INCDIR%%/QtQml/qqml.h
+%%QT_INCDIR%%/QtQml/qqmlabstracturlinterceptor.h
+%%QT_INCDIR%%/QtQml/qqmlapplicationengine.h
+%%QT_INCDIR%%/QtQml/qqmlcomponent.h
+%%QT_INCDIR%%/QtQml/qqmlcontext.h
+%%QT_INCDIR%%/QtQml/qqmldebug.h
+%%QT_INCDIR%%/QtQml/qqmlengine.h
+%%QT_INCDIR%%/QtQml/qqmlerror.h
+%%QT_INCDIR%%/QtQml/qqmlexpression.h
+%%QT_INCDIR%%/QtQml/qqmlextensioninterface.h
+%%QT_INCDIR%%/QtQml/qqmlextensionplugin.h
+%%QT_INCDIR%%/QtQml/qqmlfile.h
+%%QT_INCDIR%%/QtQml/qqmlfileselector.h
+%%QT_INCDIR%%/QtQml/qqmlincubator.h
+%%QT_INCDIR%%/QtQml/qqmlinfo.h
+%%QT_INCDIR%%/QtQml/qqmllist.h
+%%QT_INCDIR%%/QtQml/qqmlnetworkaccessmanagerfactory.h
+%%QT_INCDIR%%/QtQml/qqmlparserstatus.h
+%%QT_INCDIR%%/QtQml/qqmlprivate.h
+%%QT_INCDIR%%/QtQml/qqmlproperty.h
+%%QT_INCDIR%%/QtQml/qqmlpropertymap.h
+%%QT_INCDIR%%/QtQml/qqmlpropertyvaluesource.h
+%%QT_INCDIR%%/QtQml/qqmlscriptstring.h
+%%QT_INCDIR%%/QtQml/qtqml-config.h
+%%QT_INCDIR%%/QtQml/qtqmlglobal.h
+%%QT_INCDIR%%/QtQml/qtqmlversion.h
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmldebugclient_p.h
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmldebugclient_p_p.h
%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmldebugconnection_p.h
@@ -202,7 +460,6 @@
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgengine_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsggeometry_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgktxhandler_p.h
-%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgtexturefilehandler_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgmaterialshader_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgnode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgnodeupdater_p.h
@@ -229,6 +486,7 @@
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgsoftwarespritenode_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgsoftwarethreadedrenderloop_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgtexture_p.h
+%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgtexturefilehandler_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgtexturematerial_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgtexturereader_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qsgthreadedrenderloop_p.h
@@ -365,6 +623,9 @@
%%QT_INCDIR%%/QtQuickWidgets/qquickwidget.h
%%QT_INCDIR%%/QtQuickWidgets/qtquickwidgetsglobal.h
%%QT_INCDIR%%/QtQuickWidgets/qtquickwidgetsversion.h
+%%QT_CMAKEDIR%%/Qt5Qml/Qt5QmlConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Qml/Qt5QmlConfigExtras.cmake
+%%QT_CMAKEDIR%%/Qt5Qml/Qt5QmlConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5Qml/Qt5Qml_QDebugMessageServiceFactory.cmake
%%QT_CMAKEDIR%%/Qt5Qml/Qt5Qml_QLocalClientConnectionFactory.cmake
%%QT_CMAKEDIR%%/Qt5Qml/Qt5Qml_QQmlDebugServerFactory.cmake
@@ -382,10 +643,28 @@
%%QT_CMAKEDIR%%/Qt5QuickTest/Qt5QuickTestConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5QuickWidgets/Qt5QuickWidgetsConfig.cmake
%%QT_CMAKEDIR%%/Qt5QuickWidgets/Qt5QuickWidgetsConfigVersion.cmake
+%%QT_BINDIR%%/qml
+%%QT_BINDIR%%/qmlcachegen
+%%QT_BINDIR%%/qmleasing
+%%QT_BINDIR%%/qmlimportscanner
+%%QT_BINDIR%%/qmllint
+%%QT_BINDIR%%/qmlmin
+%%QT_BINDIR%%/qmlplugindump
+%%QT_BINDIR%%/qmlprofiler
+%%QT_BINDIR%%/qmlscene
+%%QT_BINDIR%%/qmltestrunner
%%QT_LIBDIR%%/libQt5PacketProtocol.a
%%QT_LIBDIR%%/libQt5PacketProtocol.prl
+%%QT_LIBDIR%%/libQt5Qml.prl
+%%QT_LIBDIR%%/libQt5Qml.so
+%%QT_LIBDIR%%/libQt5Qml.so.5
+%%QT_LIBDIR%%/libQt5Qml.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQt5Qml.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQt5Qml.so.%%FULLVER%%.debug
%%QT_LIBDIR%%/libQt5QmlDebug.a
%%QT_LIBDIR%%/libQt5QmlDebug.prl
+%%QT_LIBDIR%%/libQt5QmlDevTools.a
+%%QT_LIBDIR%%/libQt5QmlDevTools.prl
%%QT_LIBDIR%%/libQt5Quick.prl
%%QT_LIBDIR%%/libQt5Quick.so
%%QT_LIBDIR%%/libQt5Quick.so.5
@@ -410,19 +689,13 @@
%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%SHORTVER%%
%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%FULLVER%%
%%DEBUG%%%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%FULLVER%%.debug
-%%QT_BINDIR%%/qml
-%%QT_BINDIR%%/qmleasing
-%%QT_BINDIR%%/qmlimportscanner
-%%QT_BINDIR%%/qmllint
-%%QT_BINDIR%%/qmlmin
-%%QT_BINDIR%%/qmlplugindump
-%%QT_BINDIR%%/qmlprofiler
-%%QT_BINDIR%%/qmlscene
-%%QT_BINDIR%%/qmltestrunner
%%QT_MKSPECDIR%%/features/qmlcache.prf
%%QT_MKSPECDIR%%/features/qtquickcompiler.prf
%%QT_MKSPECDIR%%/modules/qt_lib_packetprotocol_private.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_qml.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_qml_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qmldebug_private.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_qmldevtools_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qmltest.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qmltest_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_quick.pri
@@ -512,6 +785,7 @@
%%QT_QMLDIR%%/QtTest/qmldir
%%QT_QMLDIR%%/QtTest/testlogger.js
%%QT_QMLDIR%%/builtins.qmltypes
+libdata/pkgconfig/Qt5Qml.pc
libdata/pkgconfig/Qt5Quick.pc
libdata/pkgconfig/Qt5QuickTest.pc
libdata/pkgconfig/Qt5QuickWidgets.pc
diff --git a/x11-toolkits/qt5-gamepad/Makefile b/x11-toolkits/qt5-gamepad/Makefile
index be5b5a039c00..83bac1ca5912 100644
--- a/x11-toolkits/qt5-gamepad/Makefile
+++ b/x11-toolkits/qt5-gamepad/Makefile
@@ -2,13 +2,14 @@
PORTNAME= gamepad
DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5 Gamepad Module
-USE_QT= core gui qml quick buildtools_build
+USE_QT= core declarative gui buildtools_build
USES= compiler:c++11-lang qmake:norecursive qt-dist:5,gamepad
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/x11-toolkits/qt5-quick/Makefile b/x11-toolkits/qt5-quick/Makefile
deleted file mode 100644
index 69b9bf4e8ab9..000000000000
--- a/x11-toolkits/qt5-quick/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= quick
-DISTVERSION= ${QT5_VERSION}
-CATEGORIES= x11-toolkits
-PKGNAMEPREFIX= qt5-
-
-MAINTAINER= kde@FreeBSD.org
-COMMENT= Qt declarative framework for dynamic user interfaces
-
-USE_GL= gl
-USE_QT= core gui network qml sql testlib \
- widgets xmlpatterns buildtools_build
-USES= compiler:c++11-lang gl python:build qmake:norecursive \
- qt-dist:5,declarative
-USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
-
-CONFLICTS= qt5-declarative-render2d-*
-
-QT_DEFINES= ACCESSIBILITY
-QT_CONFIG= accessibility accessibility-atspi-bridge
-
-# libQt5Qml.so and libQt5QmlDevTools.a come from lang/qt5-qml, so we do not
-# want to build them again here. On the other hand, if we just remove qml/ and
-# qmldevtools/ from src/src.pro the versions installed in ${LOCALBASE} will be
-# picked up and their .pri files will make -Wl,-rpath-link,${LOCALBASE}/lib be
-# used when building targets such as tools/qmltestrunner. This causes problems
-# when building the port with an older version installed (bug 194870).
-# Instead, we let the .pri modules be created in ${WRKSRC}/mkspecs but symlink
-# the existing libraries and trick the existing Makefiles into doing nothing
-# (it is more future-proof than whitelisting the other directories).
-post-configure:
- ${MKDIR} ${CONFIGURE_WRKSRC}/lib
- ${LN} -s ${QT_LIBDIR}/libQt5Qml.so \
- ${CONFIGURE_WRKSRC}/lib/libQt5Qml.so
- ${LN} -s ${QT_LIBDIR}/libQt5QmlDevTools.a \
- ${CONFIGURE_WRKSRC}/lib/libQt5QmlDevTools.a
- ${PRINTF} ".DEFAULT:\n\t@${DO_NADA}" \
- > ${CONFIGURE_WRKSRC}/src/qml/Makefile
- ${PRINTF} ".DEFAULT:\n\t@${DO_NADA}" \
- > ${CONFIGURE_WRKSRC}/src/qmldevtools/Makefile
-
-post-patch:
-# qtdeclarative.pro wants to run python, replace that with PYTHON_CMD
- ${REINPLACE_CMD} '/py_out/s#python#${PYTHON_CMD}#g' \
- ${WRKSRC}/qtdeclarative.pro
-
-.include <bsd.port.mk>
diff --git a/x11-toolkits/qt5-quickcontrols/Makefile b/x11-toolkits/qt5-quickcontrols/Makefile
index ecfa3a69fd4f..8d2beabd0a03 100644
--- a/x11-toolkits/qt5-quickcontrols/Makefile
+++ b/x11-toolkits/qt5-quickcontrols/Makefile
@@ -2,6 +2,7 @@
PORTNAME= quickcontrols
DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-
@@ -11,7 +12,7 @@ COMMENT= Set of controls for building complete interfaces in Qt Quick
BROKEN_armv6= fails to install: pkg-static: Unable to access file ApplicationWindow.qmlc: No such file or directory
USES= compiler:c++11-lang qmake qt-dist:5,quickcontrols
-USE_QT= core gui qml quick widgets \
+USE_QT= core declarative gui widgets \
buildtools_build
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/x11-toolkits/qt5-quickcontrols2/Makefile b/x11-toolkits/qt5-quickcontrols2/Makefile
index 5a108b43eefe..63027dc41262 100644
--- a/x11-toolkits/qt5-quickcontrols2/Makefile
+++ b/x11-toolkits/qt5-quickcontrols2/Makefile
@@ -2,6 +2,7 @@
PORTNAME= quickcontrols2
DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-
@@ -11,7 +12,7 @@ COMMENT= Set of controls for building complete interfaces in Qt Quick
BROKEN_armv6= fails to install: pkg-static: Unable to access file DayOfWeekRow.qmlc: No such file or directory
USES= compiler:c++11-lang qmake:norecursive qt-dist:5
-USE_QT= core gui qml quick widgets \
+USE_QT= core declarative gui widgets \
buildtools_build
QT_DIST= ${PORTNAME}
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/x11-toolkits/qt5-virtualkeyboard/Makefile b/x11-toolkits/qt5-virtualkeyboard/Makefile
index 65364f564b20..5716ddb7e0c5 100644
--- a/x11-toolkits/qt5-virtualkeyboard/Makefile
+++ b/x11-toolkits/qt5-virtualkeyboard/Makefile
@@ -2,6 +2,7 @@
PORTNAME= virtualkeyboard
DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-
@@ -11,7 +12,7 @@ COMMENT= Qt 5 Virtual Keyboard Module
LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
USES= compiler:c++11-lang qmake qt-dist:5,virtualkeyboard
-USE_QT= core network gui widgets svg qml quick buildtools_build
+USE_QT= core declarative network gui widgets svg buildtools_build
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
diff --git a/x11-wm/plasma5-kwin/Makefile b/x11-wm/plasma5-kwin/Makefile
index 20e39ed40133..c123196026ad 100644
--- a/x11-wm/plasma5-kwin/Makefile
+++ b/x11-wm/plasma5-kwin/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kwin
DISTVERSION= ${KDE_PLASMA_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-wm kde kde-plasma
MAINTAINER= kde@FreeBSD.org
@@ -37,7 +38,7 @@ USE_KDE= activities activities attica auth breeze codecs \
newstuff notifications plasma-framework service sonnet \
textwidgets wayland widgetsaddons windowsystem xmlgui
USE_LDCONFIG= yes
-USE_QT= concurrent core dbus gui multimedia network qml quick script \
+USE_QT= concurrent core dbus declarative gui multimedia network script \
sensors testlib uiplugin uitools widgets x11extras xml \
buildtools_build qmake_build \
quickcontrols2_run virtualkeyboard_run
diff --git a/x11/cool-retro-term/Makefile b/x11/cool-retro-term/Makefile
index 3a9e34118073..2aacd24047c3 100644
--- a/x11/cool-retro-term/Makefile
+++ b/x11/cool-retro-term/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cool-retro-term
PORTVERSION= 1.0.0
-PORTREVISION= 4
+PORTREVISION= 5
DISTVERSIONPREFIX= v
CATEGORIES= x11
@@ -18,7 +18,7 @@ GH_PROJECT= qmltermwidget:qtw
GH_TAGNAME= v0.1.0:qtw
USES= desktop-file-utils qmake qt:5
-USE_QT= qmake_build buildtools_build core gui qml quick widgets \
+USE_QT= qmake_build buildtools_build core declarative gui widgets \
graphicaleffects_run quickcontrols_run
.include <bsd.port.pre.mk>
diff --git a/x11/kf5-kactivities/Makefile b/x11/kf5-kactivities/Makefile
index 7b984c9f7889..d5d1c24d8be9 100644
--- a/x11/kf5-kactivities/Makefile
+++ b/x11/kf5-kactivities/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kactivities
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
@@ -13,7 +14,7 @@ USES= cmake:outsource compiler:c++11-lib gettext kde:5 pathfix qt:5 tar:xz
USE_KDE= bookmarks config configwidgets coreaddons dbusaddons ecm \
globalaccel i18n kcmutils kdeclarative kio package \
service widgetsaddons windowsystem xmlgui
-USE_QT= buildtools_build core dbus gui network qmake_build qml \
- quick sql widgets
+USE_QT= buildtools_build core dbus declarative gui network qmake_build \
+ sql widgets
.include <bsd.port.mk>
diff --git a/x11/kf5-krunner/Makefile b/x11/kf5-krunner/Makefile
index 22112e5dff27..1c68292f6d8f 100644
--- a/x11/kf5-krunner/Makefile
+++ b/x11/kf5-krunner/Makefile
@@ -2,6 +2,7 @@
PORTNAME= krunner
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
@@ -10,7 +11,7 @@ COMMENT= KF5 parallelized query system
USES= cmake:outsource compiler:c++11-lib gettext kde:5 qt:5 tar:xz
USE_KDE= config coreaddons ecm i18n kio package plasma-framework \
service solid threadweaver
-USE_QT= buildtools_build core gui network qmake_build qml \
- quick widgets
+USE_QT= buildtools_build core declarative gui network qmake_build \
+ widgets
.include <bsd.port.mk>
diff --git a/x11/kf5-plasma-framework/Makefile b/x11/kf5-plasma-framework/Makefile
index 81fd012dc088..aafc47d5490c 100644
--- a/x11/kf5-plasma-framework/Makefile
+++ b/x11/kf5-plasma-framework/Makefile
@@ -2,6 +2,7 @@
PORTNAME= plasma-framework
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
@@ -14,8 +15,8 @@ USE_KDE= activities archive auth codecs completion config \
guiaddons i18n iconthemes jobwidgets kirigami2 kio package \
notifications service wayland windowsystem xmlgui kdeclarative \
widgetsaddons
-USE_QT= buildtools_build core dbus gui network qmake_build qml \
- quick script sql svg widgets x11extras xml
+USE_QT= buildtools_build core dbus declarative gui network qmake_build \
+ script sql svg widgets x11extras xml
USE_XORG= ice sm x11 xcb xext xrandr
.include <bsd.port.mk>
diff --git a/x11/plasma5-kscreen/Makefile b/x11/plasma5-kscreen/Makefile
index 242fdf56ab2a..6dade04c6886 100644
--- a/x11/plasma5-kscreen/Makefile
+++ b/x11/plasma5-kscreen/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kscreen
DISTVERSION= ${KDE_PLASMA_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde kde-plasma
MAINTAINER= kde@FreeBSD.org
@@ -12,7 +13,7 @@ USES= cmake:outsource compiler:c++11-lang cpe gettext kde:5 qt:5 \
USE_KDE= auth codecs config configwidgets coreaddons dbusaddons ecm \
globalaccel i18n kdeclarative libkscreen plasma-framework \
widgetsaddons xmlgui
-USE_QT= core dbus gui network qml quick testlib widgets xml \
+USE_QT= core dbus declarative gui network testlib widgets xml \
buildtools_build qmake_build
.include <bsd.port.mk>
diff --git a/x11/plasma5-plasma-desktop/Makefile b/x11/plasma5-plasma-desktop/Makefile
index 04b08bacd5ad..2affb4dddeea 100644
--- a/x11/plasma5-plasma-desktop/Makefile
+++ b/x11/plasma5-plasma-desktop/Makefile
@@ -2,6 +2,7 @@
PORTNAME= plasma-desktop
DISTVERSION= ${KDE_PLASMA_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde kde-plasma
MAINTAINER= kde@FreeBSD.org
@@ -36,8 +37,8 @@ USE_KDE= activities activities-stats archive attica auth baloo \
widgetsaddons windowsystem xmlgui
USE_KDE+= drkonqi_run infocenter_run kde-cli-tools_run kmenuedit_run ksysguard_run \
polkit-kde-agent-1_run systemsettings_run
-USE_QT= concurrent core dbus gui network phonon4 printsupport qml \
- quick sql svg widgets x11extras xml \
+USE_QT= concurrent core dbus declarative gui network phonon4 printsupport \
+ sql svg widgets x11extras xml \
buildtools_build qmake_build
USE_XORG= ice sm x11 xcb xcursor xext xfixes xft xi xrender
diff --git a/x11/plasma5-plasma-integration/Makefile b/x11/plasma5-plasma-integration/Makefile
index 0c3b0451cc79..1fb3289daaea 100644
--- a/x11/plasma5-plasma-integration/Makefile
+++ b/x11/plasma5-plasma-integration/Makefile
@@ -2,6 +2,7 @@
PORTNAME= plasma-integration
DISTVERSION= ${KDE_PLASMA_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde kde-plasma
MAINTAINER= kde@FreeBSD.org
@@ -15,7 +16,7 @@ USE_KDE= auth bookmarks breeze codecs completion config configwidgets \
coreaddons ecm i18n iconthemes itemviews jobwidgets kio \
notifications service solid wayland \
widgetsaddons windowsystem xmlgui
-USE_QT= concurrent core dbus gui network qml quick quickcontrols2 widgets \
+USE_QT= concurrent core declarative dbus gui network quickcontrols2 widgets \
x11extras xml \
buildtools_build qmake_build
USE_XORG= xcb xcursor
@@ -32,7 +33,7 @@ NOTO_DESC= KDE default font
LIGHT_DESC= Use noto-light
BIG_DESC= Use complete noto
-LIGHT_RUN_DEPENDS= noto-lite>=0:x11-fonts/noto-lite
+LIGHT_RUN_DEPENDS= noto-lite>=0:x11-fonts/noto-lite
BIG_RUN_DEPENDS= noto>=0:x11-fonts/noto
.include <bsd.port.mk>
diff --git a/x11/plasma5-plasma-workspace/Makefile b/x11/plasma5-plasma-workspace/Makefile
index 9158dd60199c..ce3246db8e59 100644
--- a/x11/plasma5-plasma-workspace/Makefile
+++ b/x11/plasma5-plasma-workspace/Makefile
@@ -2,6 +2,7 @@
PORTNAME= plasma-workspace
DISTVERSION= ${KDE_PLASMA_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde kde-plasma
MAINTAINER= kde@FreeBSD.org
@@ -35,8 +36,8 @@ USE_KDE= activities activitymanagerd attica auth baloo bookmarks \
widgetsaddons windowsystem xmlgui xmlrpcclient \
breeze_run breeze-icons_run oxygen-icons5_run \
kded_run milou_run
-USE_QT= concurrent core dbus graphicaleffects gui network phonon4 \
- printsupport qdbus qml quick quickcontrols_run script sql \
+USE_QT= concurrent core declarative dbus graphicaleffects gui network phonon4 \
+ printsupport qdbus quickcontrols_run script sql \
testlib webkit widgets x11extras xml \
paths_run \
buildtools_build qmake_build
diff --git a/x11/radare-cutter/Makefile b/x11/radare-cutter/Makefile
index 4ec9da5c2c4d..43d2d49d16cd 100644
--- a/x11/radare-cutter/Makefile
+++ b/x11/radare-cutter/Makefile
@@ -3,6 +3,7 @@
PORTNAME= radare-cutter
PORTVERSION= 1.7.1
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= swills@FreeBSD.org
@@ -19,8 +20,8 @@ USE_GITHUB= yes
GH_ACCOUNT= radareorg
GH_PROJECT= cutter
-USE_QT= buildtools_build core gui location network printsupport qml \
- quick svg webchannel webengine widgets
+USE_QT= buildtools_build core declarative gui location network printsupport \
+ svg webchannel webengine widgets
USE_GL= gl
WRKSRC_SUBDIR= src
diff --git a/x11/sddm/Makefile b/x11/sddm/Makefile
index 07545b74b55a..9debe42699e9 100644
--- a/x11/sddm/Makefile
+++ b/x11/sddm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sddm
PORTVERSION= 0.17.0
DISTVERSIONPREFIX= v
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= kde@FreeBSD.org
@@ -23,7 +23,7 @@ RUN_DEPENDS= dbus-run-session:devel/dbus
USES= cmake:outsource compiler:c++11-lang kde:5 qt:5
USE_GITHUB= yes
USE_KDE= ecm
-USE_QT= core dbus gui network qml quick \
+USE_QT= core declarative dbus gui network \
buildtools_build linguisttools_build qmake_build
USE_XORG= xcb