aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2017-02-18 19:48:05 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2017-02-18 19:48:05 +0000
commitf3c180c3431372077934f7658922b8a244419bdf (patch)
tree4d04227f02c7fda007ad74be01e1393168277b0b /x11-toolkits
parent748a0f2465dd8511da6092b69cbe578ce5749586 (diff)
downloadports-f3c180c3431372077934f7658922b8a244419bdf.tar.gz
ports-f3c180c3431372077934f7658922b8a244419bdf.zip
Notes
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/Makefile4
-rw-r--r--x11-toolkits/qt4-declarative/Makefile1
-rw-r--r--x11-toolkits/qt4-gui/Makefile2
-rw-r--r--x11-toolkits/qt5-charts/Makefile20
-rw-r--r--x11-toolkits/qt5-charts/distinfo3
-rw-r--r--x11-toolkits/qt5-charts/files/patch-src_charts_charts.pro14
-rw-r--r--x11-toolkits/qt5-charts/pkg-plist276
-rw-r--r--x11-toolkits/qt5-datavis3d/Makefile17
-rw-r--r--x11-toolkits/qt5-datavis3d/pkg-plist176
-rw-r--r--x11-toolkits/qt5-declarative-render2d/Makefile16
-rw-r--r--x11-toolkits/qt5-declarative-render2d/pkg-plist3
-rw-r--r--x11-toolkits/qt5-declarative/files/patch-git_26229cf38
-rw-r--r--x11-toolkits/qt5-declarative/pkg-plist10
-rw-r--r--x11-toolkits/qt5-gamepad/Makefile17
-rw-r--r--x11-toolkits/qt5-gamepad/pkg-plist29
-rw-r--r--x11-toolkits/qt5-gui/Makefile18
-rw-r--r--x11-toolkits/qt5-gui/pkg-plist41
-rw-r--r--x11-toolkits/qt5-quick/pkg-plist57
-rw-r--r--x11-toolkits/qt5-quickcontrols/pkg-plist12
-rw-r--r--x11-toolkits/qt5-quickcontrols2/pkg-plist676
-rw-r--r--x11-toolkits/qt5-uiplugin/pkg-plist4
-rw-r--r--x11-toolkits/qt5-virtualkeyboard/Makefile17
-rw-r--r--x11-toolkits/qt5-virtualkeyboard/pkg-plist9
-rw-r--r--x11-toolkits/qt5-widgets/Makefile22
-rw-r--r--x11-toolkits/qt5-widgets/pkg-plist21
25 files changed, 945 insertions, 558 deletions
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index a439cc2ba239..0c56b2a42b20 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -230,12 +230,16 @@
SUBDIR += qt4pas
SUBDIR += qt5-canvas3d
SUBDIR += qt5-charts
+ SUBDIR += qt5-datavis3d
SUBDIR += qt5-declarative
+ SUBDIR += qt5-declarative-render2d
+ SUBDIR += qt5-gamepad
SUBDIR += qt5-gui
SUBDIR += qt5-quick
SUBDIR += qt5-quickcontrols
SUBDIR += qt5-quickcontrols2
SUBDIR += qt5-uiplugin
+ SUBDIR += qt5-virtualkeyboard
SUBDIR += qt5-widgets
SUBDIR += qtermwidget
SUBDIR += qwt5
diff --git a/x11-toolkits/qt4-declarative/Makefile b/x11-toolkits/qt4-declarative/Makefile
index cabc2068d73c..c30d0270ff4e 100644
--- a/x11-toolkits/qt4-declarative/Makefile
+++ b/x11-toolkits/qt4-declarative/Makefile
@@ -2,6 +2,7 @@
PORTNAME= declarative
DISTVERSION= ${QT4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt4-
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index 338cf12066dd..16d9c8d36e68 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gui
DISTVERSION= ${QT4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt4-
diff --git a/x11-toolkits/qt5-charts/Makefile b/x11-toolkits/qt5-charts/Makefile
index 1082ed5f945f..be6437521842 100644
--- a/x11-toolkits/qt5-charts/Makefile
+++ b/x11-toolkits/qt5-charts/Makefile
@@ -1,30 +1,16 @@
# $FreeBSD$
PORTNAME= charts
-DISTVERSIONPREFIX= release-
-DISTVERSION= 2.1.0
-PORTREVISION= 1
+DISTVERSION= ${QT5_VERSION}
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5 charts module
-USES= qmake
-USE_GL= gl
+USES= qmake tar:xz
USE_QT5= core network gui widgets qml quick designer \
buildtools_build qmake_build
-
-DESCR= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/pkg-descr
-
-USE_GITHUB= yes
-GH_ACCOUNT= qt
-GH_PROJECT= qtcharts
-
-pre-configure:
-# Manually run syncqt. This can be dropped with the update to 5.7.0 as syncqt
-# is run upstream when creating the tarball.
- ${MKDIR} ${CONFIGURE_WRKSRC}
- cd ${CONFIGURE_WRKSRC} && ${QT_BINDIR}/syncqt.pl -version ${PORTVERSION}
+QT_DIST= ${PORTNAME}
.include <bsd.port.mk>
diff --git a/x11-toolkits/qt5-charts/distinfo b/x11-toolkits/qt5-charts/distinfo
deleted file mode 100644
index 01d6b29c5c49..000000000000
--- a/x11-toolkits/qt5-charts/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1479839713
-SHA256 (qt-qtcharts-release-2.1.0_GH0.tar.gz) = 9be63f66f7a70cc09f884604eccbb6e72babd2282682eaae2c0a8a84c875dac6
-SIZE (qt-qtcharts-release-2.1.0_GH0.tar.gz) = 4504716
diff --git a/x11-toolkits/qt5-charts/files/patch-src_charts_charts.pro b/x11-toolkits/qt5-charts/files/patch-src_charts_charts.pro
deleted file mode 100644
index fc5ccf1be5aa..000000000000
--- a/x11-toolkits/qt5-charts/files/patch-src_charts_charts.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix the pkgconfig install path.
-
---- src/charts/charts.pro.orig 2016-12-01 12:57:55 UTC
-+++ src/charts/charts.pro
-@@ -17,6 +17,9 @@ load(qt_module)
- QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)"
- QMAKE_TARGET_DESCRIPTION = "Charts component for Qt."
-
-+# Properly set up the pkgconfig install path -- relative to lib/
-+QMAKE_PKGCONFIG_DESTDIR = ../libdata/pkgconfig
-+
- ############################# SOURCES ##########################################
-
- SOURCES += \
diff --git a/x11-toolkits/qt5-charts/pkg-plist b/x11-toolkits/qt5-charts/pkg-plist
index a7ff93592491..f79d2fc55972 100644
--- a/x11-toolkits/qt5-charts/pkg-plist
+++ b/x11-toolkits/qt5-charts/pkg-plist
@@ -1,133 +1,133 @@
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/abstractbarchartitem_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/abstractchartlayout_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/abstractdomain_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/areachartitem_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/axisanimation_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/bar_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/baranimation_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/barchartitem_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/boxplotanimation_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/boxplotchartitem_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/boxwhiskers_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/boxwhiskersanimation_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/boxwhiskersdata_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/cartesianchartaxis_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/cartesianchartlayout_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartanimation_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartaxiselement_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartbackground_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartbarcategoryaxisx_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartbarcategoryaxisy_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartcategoryaxisx_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartcategoryaxisy_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartconfig_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartdataset_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartdatetimeaxisx_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartdatetimeaxisy_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartelement_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/charthelpers_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartitem_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartlogvalueaxisx_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartlogvalueaxisy_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartpresenter_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/charttheme_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartthemebluecerulean_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartthemeblueicy_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartthemebluencs_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartthemebrownsand_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartthemedark_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartthemehighcontrast_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartthemelight_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartthememanager_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartthemeqt_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartthemesystem_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/charttitle_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartvalueaxisx_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/chartvalueaxisy_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/glwidget_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/glxyseriesdata_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/horizontalaxis_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/horizontalbarchartitem_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/horizontalpercentbarchartitem_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/horizontalstackedbarchartitem_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/legendlayout_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/legendmarkeritem_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/legendscroller_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/linearrowitem_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/linechartitem_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/logxlogydomain_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/logxlogypolardomain_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/logxydomain_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/logxypolardomain_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/percentbarchartitem_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/pieanimation_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/piechartitem_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/piesliceanimation_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/pieslicedata_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/piesliceitem_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/polarchartaxis_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/polarchartaxisangular_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/polarchartaxisradial_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/polarchartcategoryaxisangular_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/polarchartcategoryaxisradial_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/polarchartdatetimeaxisangular_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/polarchartdatetimeaxisradial_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/polarchartlayout_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/polarchartlogvalueaxisangular_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/polarchartlogvalueaxisradial_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/polarchartvalueaxisangular_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/polarchartvalueaxisradial_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/polardomain_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qabstractaxis_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qabstractbarseries_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qabstractseries_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qarealegendmarker_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qareaseries_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qbarcategoryaxis_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qbarlegendmarker_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qbarmodelmapper_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qbarseries_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qbarset_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qboxplotlegendmarker_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qboxplotmodelmapper_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qboxplotseries_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qboxset_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qcategoryaxis_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qchart_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qchartview_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qdatetimeaxis_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qhorizontalbarseries_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qhorizontalpercentbarseries_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qhorizontalstackedbarseries_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qlegend_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qlegendmarker_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qlineseries_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qlogvalueaxis_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qpercentbarseries_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qpielegendmarker_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qpiemodelmapper_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qpieseries_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qpieslice_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qscatterseries_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qsplineseries_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qstackedbarseries_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qvalueaxis_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qxylegendmarker_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qxymodelmapper_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/qxyseries_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/scatteranimation_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/scatterchartitem_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/scroller_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/splineanimation_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/splinechartitem_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/stackedbarchartitem_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/verticalaxis_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/xlogydomain_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/xlogypolardomain_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/xyanimation_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/xychart_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/xydomain_p.h
-%%QT_INCDIR%%/QtCharts/2.1.0/QtCharts/private/xypolardomain_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/abstractbarchartitem_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/abstractchartlayout_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/abstractdomain_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/areachartitem_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/axisanimation_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/bar_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/baranimation_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/barchartitem_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/boxplotanimation_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/boxplotchartitem_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/boxwhiskers_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/boxwhiskersanimation_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/boxwhiskersdata_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/cartesianchartaxis_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/cartesianchartlayout_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartanimation_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartaxiselement_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartbackground_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartbarcategoryaxisx_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartbarcategoryaxisy_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartcategoryaxisx_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartcategoryaxisy_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartconfig_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartdataset_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartdatetimeaxisx_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartdatetimeaxisy_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartelement_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/charthelpers_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartitem_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartlogvalueaxisx_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartlogvalueaxisy_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartpresenter_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/charttheme_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartthemebluecerulean_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartthemeblueicy_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartthemebluencs_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartthemebrownsand_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartthemedark_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartthemehighcontrast_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartthemelight_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartthememanager_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartthemeqt_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartthemesystem_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/charttitle_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartvalueaxisx_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/chartvalueaxisy_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/glwidget_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/glxyseriesdata_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/horizontalaxis_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/horizontalbarchartitem_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/horizontalpercentbarchartitem_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/horizontalstackedbarchartitem_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/legendlayout_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/legendmarkeritem_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/legendscroller_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/linearrowitem_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/linechartitem_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/logxlogydomain_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/logxlogypolardomain_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/logxydomain_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/logxypolardomain_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/percentbarchartitem_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/pieanimation_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/piechartitem_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/piesliceanimation_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/pieslicedata_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/piesliceitem_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/polarchartaxis_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/polarchartaxisangular_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/polarchartaxisradial_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/polarchartcategoryaxisangular_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/polarchartcategoryaxisradial_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/polarchartdatetimeaxisangular_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/polarchartdatetimeaxisradial_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/polarchartlayout_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/polarchartlogvalueaxisangular_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/polarchartlogvalueaxisradial_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/polarchartvalueaxisangular_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/polarchartvalueaxisradial_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/polardomain_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qabstractaxis_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qabstractbarseries_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qabstractseries_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qarealegendmarker_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qareaseries_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qbarcategoryaxis_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qbarlegendmarker_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qbarmodelmapper_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qbarseries_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qbarset_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qboxplotlegendmarker_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qboxplotmodelmapper_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qboxplotseries_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qboxset_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qcategoryaxis_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qchart_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qchartview_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qdatetimeaxis_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qhorizontalbarseries_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qhorizontalpercentbarseries_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qhorizontalstackedbarseries_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qlegend_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qlegendmarker_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qlineseries_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qlogvalueaxis_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qpercentbarseries_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qpielegendmarker_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qpiemodelmapper_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qpieseries_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qpieslice_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qscatterseries_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qsplineseries_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qstackedbarseries_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qvalueaxis_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qxylegendmarker_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qxymodelmapper_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/qxyseries_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/scatteranimation_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/scatterchartitem_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/scroller_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/splineanimation_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/splinechartitem_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/stackedbarchartitem_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/verticalaxis_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/xlogydomain_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/xlogypolardomain_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/xyanimation_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/xychart_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/xydomain_p.h
+%%QT_INCDIR%%/QtCharts/%%FULLVER%%/QtCharts/private/xypolardomain_p.h
%%QT_INCDIR%%/QtCharts/QAbstractAxis
%%QT_INCDIR%%/QtCharts/QAbstractBarSeries
%%QT_INCDIR%%/QtCharts/QAbstractSeries
@@ -225,13 +225,14 @@
%%QT_INCDIR%%/QtCharts/qxylegendmarker.h
%%QT_INCDIR%%/QtCharts/qxymodelmapper.h
%%QT_INCDIR%%/QtCharts/qxyseries.h
-lib/cmake/Qt5Charts/Qt5ChartsConfig.cmake
-lib/cmake/Qt5Charts/Qt5ChartsConfigVersion.cmake
-lib/libQt5Charts.prl
-lib/libQt5Charts.so
-lib/libQt5Charts.so.2
-lib/libQt5Charts.so.2.1
-lib/libQt5Charts.so.2.1.0
+%%QT_CMAKEDIR%%/Qt5Charts/Qt5ChartsConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Charts/Qt5ChartsConfigVersion.cmake
+%%QT_LIBDIR%%/libQt5Charts.prl
+%%QT_LIBDIR%%/libQt5Charts.so
+%%QT_LIBDIR%%/libQt5Charts.so.5
+%%QT_LIBDIR%%/libQt5Charts.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQt5Charts.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQt5Charts.so.%%FULLVER%%.debug
%%QT_MKSPECDIR%%/modules/qt_lib_charts.pri
%%QT_MKSPECDIR%%/modules/qt_lib_charts_private.pri
%%QT_QMLDIR%%/QtCharts/designer/ChartViewSpecifics.qml
@@ -285,6 +286,7 @@ lib/libQt5Charts.so.2.1.0
%%QT_QMLDIR%%/QtCharts/designer/images/stackedbarseries-icon16.png
%%QT_QMLDIR%%/QtCharts/designer/qtcharts.metainfo
%%QT_QMLDIR%%/QtCharts/libqtchartsqml2.so
+%%DEBUG%%%%QT_QMLDIR%%/QtCharts/libqtchartsqml2.so.debug
%%QT_QMLDIR%%/QtCharts/plugins.qmltypes
%%QT_QMLDIR%%/QtCharts/qmldir
libdata/pkgconfig/Qt5Charts.pc
diff --git a/x11-toolkits/qt5-datavis3d/Makefile b/x11-toolkits/qt5-datavis3d/Makefile
new file mode 100644
index 000000000000..02532c246b85
--- /dev/null
+++ b/x11-toolkits/qt5-datavis3d/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= datavis3d
+DISTVERSION= ${QT5_VERSION}
+CATEGORIES= x11-toolkits
+PKGNAMEPREFIX= qt5-
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Qt 5 3D data visualization module
+
+USE_QT5= core network gui widgets qml quick designer buildtools_build
+QT_DIST= ${PORTNAME}
+
+USES= qmake
+USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/qt5-datavis3d/pkg-plist b/x11-toolkits/qt5-datavis3d/pkg-plist
new file mode 100644
index 000000000000..52109d683a9a
--- /dev/null
+++ b/x11-toolkits/qt5-datavis3d/pkg-plist
@@ -0,0 +1,176 @@
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/abstract3dcontroller_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/abstract3drenderer_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/abstractitemmodelhandler_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/abstractobjecthelper_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/abstractrenderitem_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/axisrendercache_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/baritemmodelhandler_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/barrenderitem_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/bars3dcontroller_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/bars3drenderer_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/barseriesrendercache_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/camerahelper_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/customrenderitem_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/datavisualizationglobal_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/drawer_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/labelitem_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/meshloader_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/objecthelper_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/q3dbars_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/q3dcamera_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/q3dinputhandler_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/q3dlight_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/q3dobject_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/q3dscatter_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/q3dscene_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/q3dsurface_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/q3dtheme_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qabstract3daxis_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qabstract3dgraph_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qabstract3dinputhandler_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qabstract3dseries_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qabstractdataproxy_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qbar3dseries_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qbardataitem_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qbardataproxy_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qcategory3daxis_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qcustom3ditem_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qcustom3dlabel_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qcustom3dvolume_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qheightmapsurfacedataproxy_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qitemmodelbardataproxy_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qitemmodelscatterdataproxy_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qitemmodelsurfacedataproxy_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qlogvalue3daxisformatter_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qscatter3dseries_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qscatterdataitem_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qscatterdataproxy_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qsurface3dseries_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qsurfacedataitem_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qsurfacedataproxy_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qtouch3dinputhandler_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qvalue3daxis_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/qvalue3daxisformatter_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/scatter3dcontroller_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/scatter3drenderer_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/scatteritemmodelhandler_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/scatterobjectbufferhelper_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/scatterpointbufferhelper_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/scatterrenderitem_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/scatterseriesrendercache_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/selectionpointer_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/seriesrendercache_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/shaderhelper_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/surface3dcontroller_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/surface3drenderer_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/surfaceitemmodelhandler_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/surfaceobject_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/surfaceseriesrendercache_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/texturehelper_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/thememanager_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/utils_p.h
+%%QT_INCDIR%%/QtDataVisualization/%%FULLVER%%/QtDataVisualization/private/vertexindexer_p.h
+%%QT_INCDIR%%/QtDataVisualization/Q3DBars
+%%QT_INCDIR%%/QtDataVisualization/Q3DCamera
+%%QT_INCDIR%%/QtDataVisualization/Q3DInputHandler
+%%QT_INCDIR%%/QtDataVisualization/Q3DLight
+%%QT_INCDIR%%/QtDataVisualization/Q3DObject
+%%QT_INCDIR%%/QtDataVisualization/Q3DScatter
+%%QT_INCDIR%%/QtDataVisualization/Q3DScene
+%%QT_INCDIR%%/QtDataVisualization/Q3DSurface
+%%QT_INCDIR%%/QtDataVisualization/Q3DTheme
+%%QT_INCDIR%%/QtDataVisualization/QAbstract3DAxis
+%%QT_INCDIR%%/QtDataVisualization/QAbstract3DGraph
+%%QT_INCDIR%%/QtDataVisualization/QAbstract3DInputHandler
+%%QT_INCDIR%%/QtDataVisualization/QAbstract3DSeries
+%%QT_INCDIR%%/QtDataVisualization/QAbstractDataProxy
+%%QT_INCDIR%%/QtDataVisualization/QBar3DSeries
+%%QT_INCDIR%%/QtDataVisualization/QBarDataItem
+%%QT_INCDIR%%/QtDataVisualization/QBarDataProxy
+%%QT_INCDIR%%/QtDataVisualization/QCategory3DAxis
+%%QT_INCDIR%%/QtDataVisualization/QCustom3DItem
+%%QT_INCDIR%%/QtDataVisualization/QCustom3DLabel
+%%QT_INCDIR%%/QtDataVisualization/QCustom3DVolume
+%%QT_INCDIR%%/QtDataVisualization/QHeightMapSurfaceDataProxy
+%%QT_INCDIR%%/QtDataVisualization/QItemModelBarDataProxy
+%%QT_INCDIR%%/QtDataVisualization/QItemModelScatterDataProxy
+%%QT_INCDIR%%/QtDataVisualization/QItemModelSurfaceDataProxy
+%%QT_INCDIR%%/QtDataVisualization/QLogValue3DAxisFormatter
+%%QT_INCDIR%%/QtDataVisualization/QScatter3DSeries
+%%QT_INCDIR%%/QtDataVisualization/QScatterDataItem
+%%QT_INCDIR%%/QtDataVisualization/QScatterDataProxy
+%%QT_INCDIR%%/QtDataVisualization/QSurface3DSeries
+%%QT_INCDIR%%/QtDataVisualization/QSurfaceDataItem
+%%QT_INCDIR%%/QtDataVisualization/QSurfaceDataProxy
+%%QT_INCDIR%%/QtDataVisualization/QTouch3DInputHandler
+%%QT_INCDIR%%/QtDataVisualization/QValue3DAxis
+%%QT_INCDIR%%/QtDataVisualization/QValue3DAxisFormatter
+%%QT_INCDIR%%/QtDataVisualization/QtDataVisualization
+%%QT_INCDIR%%/QtDataVisualization/QtDataVisualizationDepends
+%%QT_INCDIR%%/QtDataVisualization/QtDataVisualizationVersion
+%%QT_INCDIR%%/QtDataVisualization/q3dbars.h
+%%QT_INCDIR%%/QtDataVisualization/q3dcamera.h
+%%QT_INCDIR%%/QtDataVisualization/q3dinputhandler.h
+%%QT_INCDIR%%/QtDataVisualization/q3dlight.h
+%%QT_INCDIR%%/QtDataVisualization/q3dobject.h
+%%QT_INCDIR%%/QtDataVisualization/q3dscatter.h
+%%QT_INCDIR%%/QtDataVisualization/q3dscene.h
+%%QT_INCDIR%%/QtDataVisualization/q3dsurface.h
+%%QT_INCDIR%%/QtDataVisualization/q3dtheme.h
+%%QT_INCDIR%%/QtDataVisualization/qabstract3daxis.h
+%%QT_INCDIR%%/QtDataVisualization/qabstract3dgraph.h
+%%QT_INCDIR%%/QtDataVisualization/qabstract3dinputhandler.h
+%%QT_INCDIR%%/QtDataVisualization/qabstract3dseries.h
+%%QT_INCDIR%%/QtDataVisualization/qabstractdataproxy.h
+%%QT_INCDIR%%/QtDataVisualization/qbar3dseries.h
+%%QT_INCDIR%%/QtDataVisualization/qbardataitem.h
+%%QT_INCDIR%%/QtDataVisualization/qbardataproxy.h
+%%QT_INCDIR%%/QtDataVisualization/qcategory3daxis.h
+%%QT_INCDIR%%/QtDataVisualization/qcustom3ditem.h
+%%QT_INCDIR%%/QtDataVisualization/qcustom3dlabel.h
+%%QT_INCDIR%%/QtDataVisualization/qcustom3dvolume.h
+%%QT_INCDIR%%/QtDataVisualization/qdatavisualizationglobal.h
+%%QT_INCDIR%%/QtDataVisualization/qheightmapsurfacedataproxy.h
+%%QT_INCDIR%%/QtDataVisualization/qitemmodelbardataproxy.h
+%%QT_INCDIR%%/QtDataVisualization/qitemmodelscatterdataproxy.h
+%%QT_INCDIR%%/QtDataVisualization/qitemmodelsurfacedataproxy.h
+%%QT_INCDIR%%/QtDataVisualization/qlogvalue3daxisformatter.h
+%%QT_INCDIR%%/QtDataVisualization/qscatter3dseries.h
+%%QT_INCDIR%%/QtDataVisualization/qscatterdataitem.h
+%%QT_INCDIR%%/QtDataVisualization/qscatterdataproxy.h
+%%QT_INCDIR%%/QtDataVisualization/qsurface3dseries.h
+%%QT_INCDIR%%/QtDataVisualization/qsurfacedataitem.h
+%%QT_INCDIR%%/QtDataVisualization/qsurfacedataproxy.h
+%%QT_INCDIR%%/QtDataVisualization/qtdatavisualizationversion.h
+%%QT_INCDIR%%/QtDataVisualization/qtouch3dinputhandler.h
+%%QT_INCDIR%%/QtDataVisualization/qutils.h
+%%QT_INCDIR%%/QtDataVisualization/qvalue3daxis.h
+%%QT_INCDIR%%/QtDataVisualization/qvalue3daxisformatter.h
+%%QT_CMAKEDIR%%/Qt5DataVisualization/Qt5DataVisualizationConfig.cmake
+%%QT_CMAKEDIR%%/Qt5DataVisualization/Qt5DataVisualizationConfigVersion.cmake
+%%QT_LIBDIR%%/libQt5DataVisualization.prl
+%%QT_LIBDIR%%/libQt5DataVisualization.so
+%%QT_LIBDIR%%/libQt5DataVisualization.so.5
+%%QT_LIBDIR%%/libQt5DataVisualization.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQt5DataVisualization.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQt5DataVisualization.so.%%FULLVER%%.debug
+%%QT_MKSPECDIR%%/modules/qt_lib_datavisualization.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_datavisualization_private.pri
+%%QT_QMLDIR%%/QtDataVisualization/designer/Bars3DSpecifics.qml
+%%QT_QMLDIR%%/QtDataVisualization/designer/Scatter3DSpecifics.qml
+%%QT_QMLDIR%%/QtDataVisualization/designer/Surface3DSpecifics.qml
+%%QT_QMLDIR%%/QtDataVisualization/designer/default/Bars3D.qml
+%%QT_QMLDIR%%/QtDataVisualization/designer/default/Scatter3D.qml
+%%QT_QMLDIR%%/QtDataVisualization/designer/default/Surface3D.qml
+%%QT_QMLDIR%%/QtDataVisualization/designer/images/bars3d-icon.png
+%%QT_QMLDIR%%/QtDataVisualization/designer/images/bars3d-icon16.png
+%%QT_QMLDIR%%/QtDataVisualization/designer/images/scatter3d-icon.png
+%%QT_QMLDIR%%/QtDataVisualization/designer/images/scatter3d-icon16.png
+%%QT_QMLDIR%%/QtDataVisualization/designer/images/surface3d-icon.png
+%%QT_QMLDIR%%/QtDataVisualization/designer/images/surface3d-icon16.png
+%%QT_QMLDIR%%/QtDataVisualization/designer/qtdatavisualization.metainfo
+%%QT_QMLDIR%%/QtDataVisualization/libdatavisualizationqml2.so
+%%DEBUG%%%%QT_QMLDIR%%/QtDataVisualization/libdatavisualizationqml2.so.debug
+%%QT_QMLDIR%%/QtDataVisualization/plugins.qmltypes
+%%QT_QMLDIR%%/QtDataVisualization/qmldir
+libdata/pkgconfig/Qt5DataVisualization.pc
diff --git a/x11-toolkits/qt5-declarative-render2d/Makefile b/x11-toolkits/qt5-declarative-render2d/Makefile
new file mode 100644
index 000000000000..7829dfe73f6a
--- /dev/null
+++ b/x11-toolkits/qt5-declarative-render2d/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= declarative-render2d
+DISTVERSION= ${QT5_VERSION}
+CATEGORIES= x11-toolkits
+PKGNAMEPREFIX= qt5-
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Qt 5 Quick 2D Rendering Plugin Module
+
+USE_QT5= core gui qml quick buildtools_build
+QT_DIST= ${PORTNAME}
+
+USES= qmake
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/qt5-declarative-render2d/pkg-plist b/x11-toolkits/qt5-declarative-render2d/pkg-plist
new file mode 100644
index 000000000000..e8a7b219490c
--- /dev/null
+++ b/x11-toolkits/qt5-declarative-render2d/pkg-plist
@@ -0,0 +1,3 @@
+%%QT_CMAKEDIR%%/Qt5Quick/Qt5Quick_ContextPlugin.cmake
+%%QT_PLUGINDIR%%/scenegraph/libsoftwarecontext.so
+%%DEBUG%%%%QT_PLUGINDIR%%/scenegraph/libsoftwarecontext.so.debug
diff --git a/x11-toolkits/qt5-declarative/files/patch-git_26229cf b/x11-toolkits/qt5-declarative/files/patch-git_26229cf
new file mode 100644
index 000000000000..90e273de972f
--- /dev/null
+++ b/x11-toolkits/qt5-declarative/files/patch-git_26229cf
@@ -0,0 +1,38 @@
+QtQuick1 does no longer get released since 5.5.1.
+
+Pull in a patch from git to make it build against the changed api in newer
+Qt versions.
+
+From 26229cfa0b729313893af5674d604e8692dbb946 Mon Sep 17 00:00:00 2001
+From: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
+Date: Tue, 26 Apr 2016 15:08:34 +0200
+Subject: [PATCH] QDeclarativeTextInput: update API to use
+ setBlinkingCursorEnabled
+
+QWidgetLineControl::setCursorBlinkPeriod was renamed to
+QWidgetLineControl::setBlinkingCursorEnabled in qtbase:1b5bc97.
+This patch will update QDeclarativeTextInput to use the new API.
+
+Change-Id: If88c0d44f2ab29c9bc00f5a0226a28d45976ed43
+Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
+URL: https://codereview.qt-project.org/#/c/157118
+---
+ src/declarative/graphicsitems/qdeclarativetextinput.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+index 3ff75fd..e39d1af 100644
+--- src/declarative/graphicsitems/qdeclarativetextinput.cpp
++++ src/declarative/graphicsitems/qdeclarativetextinput.cpp
+@@ -514,7 +514,7 @@ void QDeclarativeTextInput::setCursorVisible(bool on)
+ if (d->cursorVisible == on)
+ return;
+ d->cursorVisible = on;
+- d->control->setCursorBlinkPeriod(on?QApplication::cursorFlashTime():0);
++ d->control->setBlinkingCursorEnabled(on);
+ QRect r = d->control->cursorRect();
+ if (d->control->inputMask().isEmpty())
+ updateRect(r);
+--
+2.8.1
+
diff --git a/x11-toolkits/qt5-declarative/pkg-plist b/x11-toolkits/qt5-declarative/pkg-plist
index df93164aae89..1ddee150dc2c 100644
--- a/x11-toolkits/qt5-declarative/pkg-plist
+++ b/x11-toolkits/qt5-declarative/pkg-plist
@@ -213,11 +213,11 @@
%%QT_INCDIR%%/QtDeclarative/qdeclarativeview.h
%%QT_INCDIR%%/QtDeclarative/qtdeclarativeglobal.h
%%QT_INCDIR%%/QtDeclarative/qtdeclarativeversion.h
-%%QT_LIBDIR%%/cmake/Qt5Declarative/Qt5DeclarativeConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Declarative/Qt5DeclarativeConfigVersion.cmake
-%%QT_LIBDIR%%/cmake/Qt5Declarative/Qt5Declarative_QTcpServerConnection.cmake
-%%QT_LIBDIR%%/cmake/Qt5Declarative/Qt5Declarative_QtQuick1Plugin.cmake
-%%QT_LIBDIR%%/cmake/Qt5Designer/Qt5Designer_QDeclarativeViewPlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Declarative/Qt5DeclarativeConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Declarative/Qt5DeclarativeConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Declarative/Qt5Declarative_QTcpServerConnection.cmake
+%%QT_CMAKEDIR%%/Qt5Declarative/Qt5Declarative_QtQuick1Plugin.cmake
+%%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QDeclarativeViewPlugin.cmake
%%QT_LIBDIR%%/libQt5Declarative.prl
%%QT_LIBDIR%%/libQt5Declarative.so
%%QT_LIBDIR%%/libQt5Declarative.so.5
diff --git a/x11-toolkits/qt5-gamepad/Makefile b/x11-toolkits/qt5-gamepad/Makefile
new file mode 100644
index 000000000000..48f78a6a3933
--- /dev/null
+++ b/x11-toolkits/qt5-gamepad/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= gamepad
+DISTVERSION= ${QT5_VERSION}
+CATEGORIES= x11-toolkits
+PKGNAMEPREFIX= qt5-
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Qt 5 Gamepad Module
+
+USE_QT5= core gui qml quick buildtools_build
+QT_DIST= ${PORTNAME}
+
+USES= qmake
+USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/qt5-gamepad/pkg-plist b/x11-toolkits/qt5-gamepad/pkg-plist
new file mode 100644
index 000000000000..c34c96cb132b
--- /dev/null
+++ b/x11-toolkits/qt5-gamepad/pkg-plist
@@ -0,0 +1,29 @@
+%%QT_INCDIR%%/QtGamepad/%%FULLVER%%/QtGamepad/private/qgamepadbackend_p.h
+%%QT_INCDIR%%/QtGamepad/%%FULLVER%%/QtGamepad/private/qgamepadbackendfactory_p.h
+%%QT_INCDIR%%/QtGamepad/%%FULLVER%%/QtGamepad/private/qgamepadbackendplugin_p.h
+%%QT_INCDIR%%/QtGamepad/QGamepad
+%%QT_INCDIR%%/QtGamepad/QGamepadKeyNavigation
+%%QT_INCDIR%%/QtGamepad/QGamepadManager
+%%QT_INCDIR%%/QtGamepad/QtGamepad
+%%QT_INCDIR%%/QtGamepad/QtGamepadDepends
+%%QT_INCDIR%%/QtGamepad/QtGamepadVersion
+%%QT_INCDIR%%/QtGamepad/qgamepad.h
+%%QT_INCDIR%%/QtGamepad/qgamepadkeynavigation.h
+%%QT_INCDIR%%/QtGamepad/qgamepadmanager.h
+%%QT_INCDIR%%/QtGamepad/qtgamepadglobal.h
+%%QT_INCDIR%%/QtGamepad/qtgamepadversion.h
+%%QT_CMAKEDIR%%/Qt5Gamepad/Qt5GamepadConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Gamepad/Qt5GamepadConfigVersion.cmake
+%%QT_LIBDIR%%/libQt5Gamepad.prl
+%%QT_LIBDIR%%/libQt5Gamepad.so
+%%QT_LIBDIR%%/libQt5Gamepad.so.5
+%%QT_LIBDIR%%/libQt5Gamepad.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQt5Gamepad.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQt5Gamepad.so.%%FULLVER%%.debug
+%%QT_MKSPECDIR%%/modules/qt_lib_gamepad.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_gamepad_private.pri
+%%QT_QMLDIR%%/QtGamepad/libdeclarative_gamepad.so
+%%DEBUG%%%%QT_QMLDIR%%/QtGamepad/libdeclarative_gamepad.so.debug
+%%QT_QMLDIR%%/QtGamepad/plugins.qmltypes
+%%QT_QMLDIR%%/QtGamepad/qmldir
+libdata/pkgconfig/Qt5Gamepad.pc
diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile
index e5c4b828186f..7ed14c1fc77a 100644
--- a/x11-toolkits/qt5-gui/Makefile
+++ b/x11-toolkits/qt5-gui/Makefile
@@ -2,7 +2,6 @@
PORTNAME= gui
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 1
CATEGORIES= x11-toolkits graphics
PKGNAMEPREFIX= qt5-
@@ -22,7 +21,7 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \
libxkbcommon.so:x11/libxkbcommon
RUN_DEPENDS= xdg-open:devel/xdg-utils
-USES= compiler:features jpeg
+USES= jpeg
USE_GL= gl egl
USE_GNOME= glib20
USE_QT5= core dbus network qmake_build buildtools_build
@@ -70,19 +69,6 @@ RUN_DEPENDS+= ${LOCALBASE}/share/fonts/encodings/encodings.dir:x11-fonts/encodin
CFLAGS_powerpc64= -mminimal-toc
-.include <bsd.port.pre.mk>
-
-# Base GCC fails to build qdrawhelper.cpp:
-# painting/qdrawhelper.cpp: In function 'void qConvertARGB64PMToA2RGB30PM_sse2(uint*, const QRgba64*, int)':
-# painting/qdrawhelper.cpp:1276: note: use -flax-vector-conversions to permit conversions between vectors with differing element types or numbers of subparts
-# painting/qdrawhelper.cpp:1276: error: cannot convert 'int __vector__' to 'long long int __vector__' for argument '1' to 'long long int __vector__ __builtin_ia32_psrlqi128(long long int __vector__, int)'
-# painting/qdrawhelper.cpp:1277: error: cannot convert 'int __vector__' to 'long long int __vector__' for argument '1' to 'long long int __vector__ __builtin_ia32_psrlqi128(long long int __vector__, int)'
-# painting/qdrawhelper.cpp:1278: error: cannot convert 'int __vector__' to 'long long int __vector__' for argument '1' to 'long long int __vector__ __builtin_ia32_psrlqi128(long long int __vector__, int)'
-# painting/qdrawhelper.cpp:1282: error: cannot convert 'int __vector__' to 'long long int __vector__' for argument '1' to 'long long int __vector__ __builtin_ia32_psrlqi128(long long int __vector__, int)'
-.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
-CXXFLAGS+= -flax-vector-conversions
-.endif
-
post-build:
.for d in ${MORE_WRKSRCS}
@cd ${WRKSRC}/${d} && \
@@ -97,4 +83,4 @@ post-install:
${MAKE_ARGS} ${INSTALL_TARGET}
.endfor
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/qt5-gui/pkg-plist b/x11-toolkits/qt5-gui/pkg-plist
index 4f20f2a8425b..d2e3003bc4bc 100644
--- a/x11-toolkits/qt5-gui/pkg-plist
+++ b/x11-toolkits/qt5-gui/pkg-plist
@@ -555,6 +555,7 @@
%%QT_INCDIR%%/QtPlatformHeaders/QGLXNativeContext
%%QT_INCDIR%%/QtPlatformHeaders/QPlatformHeaderHelper
%%QT_INCDIR%%/QtPlatformHeaders/QWGLNativeContext
+%%QT_INCDIR%%/QtPlatformHeaders/QWaylandWindowFunctions
%%QT_INCDIR%%/QtPlatformHeaders/QWindowsWindowFunctions
%%QT_INCDIR%%/QtPlatformHeaders/QXcbIntegrationFunctions
%%QT_INCDIR%%/QtPlatformHeaders/QXcbScreenFunctions
@@ -569,6 +570,7 @@
%%QT_INCDIR%%/QtPlatformHeaders/qglxnativecontext.h
%%QT_INCDIR%%/QtPlatformHeaders/qplatformheaderhelper.h
%%QT_INCDIR%%/QtPlatformHeaders/qtplatformheadersversion.h
+%%QT_INCDIR%%/QtPlatformHeaders/qwaylandwindowfunctions.h
%%QT_INCDIR%%/QtPlatformHeaders/qwglnativecontext.h
%%QT_INCDIR%%/QtPlatformHeaders/qwindowswindowfunctions.h
%%QT_INCDIR%%/QtPlatformHeaders/qxcbintegrationfunctions.h
@@ -585,7 +587,9 @@
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qbasicfontdatabase_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qcoretextfontdatabase_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbusmenuadaptor_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbusmenubar_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbusmenuconnection_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbusmenuregistrarproxy_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbusmenutypes_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbusplatformmenu_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbustrayicon_p.h
@@ -603,7 +607,8 @@
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevkeyboardmanager_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevmousehandler_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevmousemanager_p.h
-%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevtablet_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevtablethandler_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevtabletmanager_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevtouchhandler_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qevdevtouchmanager_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeventdispatcher_glib_p.h
@@ -627,7 +632,9 @@
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qmacmime_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qopenglcompositor_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qopenglcompositorbackingstore_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qrasterbackingstore_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qstatusnotifieritemadaptor_p.h
+%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qt_egl_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qtslib_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qunixeventdispatcher_qpa_p.h
%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qwindowsguieventdispatcher_p.h
@@ -638,22 +645,22 @@
%%QT_INCDIR%%/QtPlatformSupport/QtPlatformSupportDepends
%%QT_INCDIR%%/QtPlatformSupport/QtPlatformSupportVersion
%%QT_INCDIR%%/QtPlatformSupport/qtplatformsupportversion.h
-%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5GuiConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake
-%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5GuiConfigVersion.cmake
-%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake
-%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake
-%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake
-%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake
-%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake
-%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake
-%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake
-%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QTuioTouchPlugin.cmake
-%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake
-%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake
-%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
-%%QT_LIBDIR%%/cmake/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Gui/Qt5GuiConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Gui/Qt5GuiConfigExtras.cmake
+%%QT_CMAKEDIR%%/Qt5Gui/Qt5GuiConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QGifPlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QICOPlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QIbusPlatformInputContextPlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QJpegPlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QTuioTouchPlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QXcbEglIntegrationPlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QXcbGlxIntegrationPlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
+%%QT_CMAKEDIR%%/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfig.cmake
+%%QT_CMAKEDIR%%/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfigVersion.cmake
%%QT_LIBDIR%%/libQt5Gui.prl
%%QT_LIBDIR%%/libQt5Gui.so
%%QT_LIBDIR%%/libQt5Gui.so.5
diff --git a/x11-toolkits/qt5-quick/pkg-plist b/x11-toolkits/qt5-quick/pkg-plist
index f990abab6288..8d59bf86f238 100644
--- a/x11-toolkits/qt5-quick/pkg-plist
+++ b/x11-toolkits/qt5-quick/pkg-plist
@@ -1,3 +1,21 @@
+%%QT_INCDIR%%/QtPacketProtocol/%%FULLVER%%/QtPacketProtocol/private/qpacket_p.h
+%%QT_INCDIR%%/QtPacketProtocol/%%FULLVER%%/QtPacketProtocol/private/qpacketprotocol_p.h
+%%QT_INCDIR%%/QtPacketProtocol/QtPacketProtocol
+%%QT_INCDIR%%/QtPacketProtocol/QtPacketProtocolDepends
+%%QT_INCDIR%%/QtPacketProtocol/QtPacketProtocolVersion
+%%QT_INCDIR%%/QtPacketProtocol/qtpacketprotocolversion.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
+%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlenginecontrolclient_p.h
+%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlenginecontrolclient_p_p.h
+%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmleventlocation_p.h
+%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlprofilerclient_p.h
+%%QT_INCDIR%%/QtQmlDebug/%%FULLVER%%/QtQmlDebug/private/qqmlprofilerclient_p_p.h
+%%QT_INCDIR%%/QtQmlDebug/QtQmlDebug
+%%QT_INCDIR%%/QtQmlDebug/QtQmlDebugDepends
+%%QT_INCDIR%%/QtQmlDebug/QtQmlDebugVersion
+%%QT_INCDIR%%/QtQmlDebug/qtqmldebugversion.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qaccessiblequickitem_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qaccessiblequickview_p.h
%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qqmldesignermetaobject_p.h
@@ -280,19 +298,24 @@
%%QT_INCDIR%%/QtQuickWidgets/qquickwidget.h
%%QT_INCDIR%%/QtQuickWidgets/qtquickwidgetsglobal.h
%%QT_INCDIR%%/QtQuickWidgets/qtquickwidgetsversion.h
-%%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QLocalClientConnectionFactory.cmake
-%%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QQmlDebugServerFactory.cmake
-%%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QQmlDebuggerServiceFactory.cmake
-%%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QQmlInspectorServiceFactory.cmake
-%%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QQmlNativeDebugConnectorFactory.cmake
-%%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QQmlProfilerServiceFactory.cmake
-%%QT_LIBDIR%%/cmake/Qt5Qml/Qt5Qml_QTcpServerConnectionFactory.cmake
-%%QT_LIBDIR%%/cmake/Qt5Quick/Qt5QuickConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Quick/Qt5QuickConfigVersion.cmake
-%%QT_LIBDIR%%/cmake/Qt5QuickTest/Qt5QuickTestConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5QuickTest/Qt5QuickTestConfigVersion.cmake
-%%QT_LIBDIR%%/cmake/Qt5QuickWidgets/Qt5QuickWidgetsConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5QuickWidgets/Qt5QuickWidgetsConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Qml/Qt5Qml_QLocalClientConnectionFactory.cmake
+%%QT_CMAKEDIR%%/Qt5Qml/Qt5Qml_QQmlDebugServerFactory.cmake
+%%QT_CMAKEDIR%%/Qt5Qml/Qt5Qml_QQmlDebuggerServiceFactory.cmake
+%%QT_CMAKEDIR%%/Qt5Qml/Qt5Qml_QQmlInspectorServiceFactory.cmake
+%%QT_CMAKEDIR%%/Qt5Qml/Qt5Qml_QQmlNativeDebugConnectorFactory.cmake
+%%QT_CMAKEDIR%%/Qt5Qml/Qt5Qml_QQmlProfilerServiceFactory.cmake
+%%QT_CMAKEDIR%%/Qt5Qml/Qt5Qml_QQuickProfilerAdapterFactory.cmake
+%%QT_CMAKEDIR%%/Qt5Qml/Qt5Qml_QTcpServerConnectionFactory.cmake
+%%QT_CMAKEDIR%%/Qt5Quick/Qt5QuickConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Quick/Qt5QuickConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5QuickTest/Qt5QuickTestConfig.cmake
+%%QT_CMAKEDIR%%/Qt5QuickTest/Qt5QuickTestConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5QuickWidgets/Qt5QuickWidgetsConfig.cmake
+%%QT_CMAKEDIR%%/Qt5QuickWidgets/Qt5QuickWidgetsConfigVersion.cmake
+%%QT_LIBDIR%%/libQt5PacketProtocol.a
+%%QT_LIBDIR%%/libQt5PacketProtocol.prl
+%%QT_LIBDIR%%/libQt5QmlDebug.a
+%%QT_LIBDIR%%/libQt5QmlDebug.prl
%%QT_LIBDIR%%/libQt5Quick.prl
%%QT_LIBDIR%%/libQt5Quick.so
%%QT_LIBDIR%%/libQt5Quick.so.5
@@ -326,6 +349,8 @@
%%QT_BINDIR%%/qmlprofiler
%%QT_BINDIR%%/qmlscene
%%QT_BINDIR%%/qmltestrunner
+%%QT_MKSPECDIR%%/modules/qt_lib_packetprotocol_private.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_qmldebug_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qmltest.pri
%%QT_MKSPECDIR%%/modules/qt_lib_qmltest_private.pri
%%QT_MKSPECDIR%%/modules/qt_lib_quick.pri
@@ -343,6 +368,8 @@
%%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_native.so.debug
%%QT_PLUGINDIR%%/qmltooling/libqmldbg_profiler.so
%%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_profiler.so.debug
+%%QT_PLUGINDIR%%/qmltooling/libqmldbg_quickprofiler.so
+%%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_quickprofiler.so.debug
%%QT_PLUGINDIR%%/qmltooling/libqmldbg_server.so
%%DEBUG%%%%QT_PLUGINDIR%%/qmltooling/libqmldbg_server.so.debug
%%QT_PLUGINDIR%%/qmltooling/libqmldbg_tcp.so
@@ -369,6 +396,10 @@
%%DEBUG%%%%QT_QMLDIR%%/QtQuick.2/libqtquick2plugin.so.debug
%%QT_QMLDIR%%/QtQuick.2/plugins.qmltypes
%%QT_QMLDIR%%/QtQuick.2/qmldir
+%%QT_QMLDIR%%/QtQuick/Layouts/libqquicklayoutsplugin.so
+%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Layouts/libqquicklayoutsplugin.so.debug
+%%QT_QMLDIR%%/QtQuick/Layouts/plugins.qmltypes
+%%QT_QMLDIR%%/QtQuick/Layouts/qmldir
%%QT_QMLDIR%%/QtQuick/LocalStorage/libqmllocalstorageplugin.so
%%DEBUG%%%%QT_QMLDIR%%/QtQuick/LocalStorage/libqmllocalstorageplugin.so.debug
%%QT_QMLDIR%%/QtQuick/LocalStorage/plugins.qmltypes
diff --git a/x11-toolkits/qt5-quickcontrols/pkg-plist b/x11-toolkits/qt5-quickcontrols/pkg-plist
index 404a2d9ea6e7..7832a70a55b7 100644
--- a/x11-toolkits/qt5-quickcontrols/pkg-plist
+++ b/x11-toolkits/qt5-quickcontrols/pkg-plist
@@ -18,7 +18,6 @@
%%QT_QMLDIR%%/QtQuick/Controls/Private/Control.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/EditMenu.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/EditMenu_base.qml
-%%QT_QMLDIR%%/QtQuick/Controls/Private/EditMenu_ios.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/FastGlow.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/FocusFrame.qml
%%QT_QMLDIR%%/QtQuick/Controls/Private/HoverButton.qml
@@ -200,6 +199,13 @@
%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/icons.ttf
%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/qmldir
%%QT_QMLDIR%%/QtQuick/Dialogs/qmldir
+%%QT_QMLDIR%%/QtQuick/Extras/Private/CircularButton.qml
+%%QT_QMLDIR%%/QtQuick/Extras/Private/CircularButtonStyleHelper.qml
+%%QT_QMLDIR%%/QtQuick/Extras/Private/CircularTickmarkLabel.qml
+%%QT_QMLDIR%%/QtQuick/Extras/Private/Handle.qml
+%%QT_QMLDIR%%/QtQuick/Extras/Private/PieMenuIcon.qml
+%%QT_QMLDIR%%/QtQuick/Extras/Private/TextSingleton.qml
+%%QT_QMLDIR%%/QtQuick/Extras/Private/qmldir
%%QT_QMLDIR%%/QtQuick/Extras/designer/CircularGaugeSpecifics.qml
%%QT_QMLDIR%%/QtQuick/Extras/designer/DelayButtonSpecifics.qml
%%QT_QMLDIR%%/QtQuick/Extras/designer/DialSpecifics.qml
@@ -231,10 +237,6 @@
%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Extras/libqtquickextrasplugin.so.debug
%%QT_QMLDIR%%/QtQuick/Extras/plugins.qmltypes
%%QT_QMLDIR%%/QtQuick/Extras/qmldir
-%%QT_QMLDIR%%/QtQuick/Layouts/libqquicklayoutsplugin.so
-%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Layouts/libqquicklayoutsplugin.so.debug
-%%QT_QMLDIR%%/QtQuick/Layouts/plugins.qmltypes
-%%QT_QMLDIR%%/QtQuick/Layouts/qmldir
%%QT_QMLDIR%%/QtQuick/PrivateWidgets/libwidgetsplugin.so
%%DEBUG%%%%QT_QMLDIR%%/QtQuick/PrivateWidgets/libwidgetsplugin.so.debug
%%QT_QMLDIR%%/QtQuick/PrivateWidgets/plugins.qmltypes
diff --git a/x11-toolkits/qt5-quickcontrols2/pkg-plist b/x11-toolkits/qt5-quickcontrols2/pkg-plist
index 6b561ac2d234..0c5beba6ff46 100644
--- a/x11-toolkits/qt5-quickcontrols2/pkg-plist
+++ b/x11-toolkits/qt5-quickcontrols2/pkg-plist
@@ -1,78 +1,100 @@
-%%QT_INCDIR%%/QtLabsControls/%%FULLVER%%/QtLabsControls/private/qquickpaddedrectangle_p.h
-%%QT_INCDIR%%/QtLabsControls/%%FULLVER%%/QtLabsControls/private/qquickproxytheme_p.h
-%%QT_INCDIR%%/QtLabsControls/%%FULLVER%%/QtLabsControls/private/qquickstyle_p.h
-%%QT_INCDIR%%/QtLabsControls/%%FULLVER%%/QtLabsControls/private/qquickstyleselector_p.h
-%%QT_INCDIR%%/QtLabsControls/%%FULLVER%%/QtLabsControls/private/qquickstyleselector_p_p.h
-%%QT_INCDIR%%/QtLabsControls/QtLabsControls
-%%QT_INCDIR%%/QtLabsControls/QtLabsControlsDepends
-%%QT_INCDIR%%/QtLabsControls/QtLabsControlsVersion
-%%QT_INCDIR%%/QtLabsControls/qtlabscontrolsversion.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickabstractbutton_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickabstractbutton_p_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickapplicationwindow_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickbusyindicator_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickbutton_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickbuttongroup_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickcheckbox_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickcombobox_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickcontainer_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickcontainer_p_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickcontrol_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickcontrol_p_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickdial_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickdrawer_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickframe_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickframe_p_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickgroupbox_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickitemdelegate_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicklabel_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicklabel_p_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickmenu_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickmenu_p_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickmenuitem_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickoverlay_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickpage_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickpageindicator_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickpane_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickpane_p_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickpopup_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickpopup_p_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickpressandholdhelper_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickprogressbar_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickradiobutton_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickrangeslider_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickscrollbar_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickscrollindicator_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickslider_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickspinbox_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickstackview_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickstackview_p_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickswipeview_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquickswitch_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicktabbar_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicktabbutton_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicktextarea_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicktextarea_p_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicktextfield_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicktextfield_p_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicktoolbar_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicktoolbutton_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qquicktumbler_p.h
-%%QT_INCDIR%%/QtLabsTemplates/%%FULLVER%%/QtLabsTemplates/private/qtlabstemplatesglobal_p.h
-%%QT_INCDIR%%/QtLabsTemplates/QtLabsTemplates
-%%QT_INCDIR%%/QtLabsTemplates/QtLabsTemplatesDepends
-%%QT_INCDIR%%/QtLabsTemplates/QtLabsTemplatesVersion
-%%QT_INCDIR%%/QtLabsTemplates/qtlabstemplatesversion.h
-%%QT_LIBDIR%%/libQt5LabsControls.a
-%%QT_LIBDIR%%/libQt5LabsControls.prl
-%%QT_LIBDIR%%/libQt5LabsTemplates.prl
-%%QT_LIBDIR%%/libQt5LabsTemplates.so
-%%QT_LIBDIR%%/libQt5LabsTemplates.so.5
-%%QT_LIBDIR%%/libQt5LabsTemplates.so.%%SHORTVER%%
-%%QT_LIBDIR%%/libQt5LabsTemplates.so.%%FULLVER%%
-%%DEBUG%%%%QT_LIBDIR%%/libQt5LabsTemplates.so.%%FULLVER%%.debug
-%%QT_MKSPECDIR%%/modules/qt_lib_labscontrols_private.pri
-%%QT_MKSPECDIR%%/modules/qt_lib_labstemplates_private.pri
+%%QT_INCDIR%%/QtQuickControls2/%%FULLVER%%/QtQuickControls2/private/qquickcolorimageprovider_p.h
+%%QT_INCDIR%%/QtQuickControls2/%%FULLVER%%/QtQuickControls2/private/qquickpaddedrectangle_p.h
+%%QT_INCDIR%%/QtQuickControls2/%%FULLVER%%/QtQuickControls2/private/qquickproxytheme_p.h
+%%QT_INCDIR%%/QtQuickControls2/%%FULLVER%%/QtQuickControls2/private/qquickstyleattached_p.h
+%%QT_INCDIR%%/QtQuickControls2/%%FULLVER%%/QtQuickControls2/private/qquickstyleplugin_p.h
+%%QT_INCDIR%%/QtQuickControls2/%%FULLVER%%/QtQuickControls2/private/qquickstyleselector_p.h
+%%QT_INCDIR%%/QtQuickControls2/%%FULLVER%%/QtQuickControls2/private/qquickstyleselector_p_p.h
+%%QT_INCDIR%%/QtQuickControls2/%%FULLVER%%/QtQuickControls2/private/qtquickcontrols2global_p.h
+%%QT_INCDIR%%/QtQuickControls2/QQuickStyle
+%%QT_INCDIR%%/QtQuickControls2/QtQuickControls2
+%%QT_INCDIR%%/QtQuickControls2/QtQuickControls2Depends
+%%QT_INCDIR%%/QtQuickControls2/QtQuickControls2Version
+%%QT_INCDIR%%/QtQuickControls2/qquickstyle.h
+%%QT_INCDIR%%/QtQuickControls2/qtquickcontrols2global.h
+%%QT_INCDIR%%/QtQuickControls2/qtquickcontrols2version.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickabstractbutton_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickabstractbutton_p_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickapplicationwindow_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickbusyindicator_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickbutton_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickbuttongroup_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickcheckbox_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickcheckdelegate_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickcombobox_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickcontainer_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickcontainer_p_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickcontrol_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickcontrol_p_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickdial_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickdrawer_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickdrawer_p_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickframe_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickframe_p_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickgroupbox_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickitemdelegate_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickitemdelegate_p_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicklabel_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicklabel_p_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickmenu_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickmenu_p_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickmenuitem_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickoverlay_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickoverlay_p_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickpage_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickpageindicator_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickpane_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickpane_p_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickpopup_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickpopup_p_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickpresshandler_p_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickprogressbar_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickradiobutton_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickradiodelegate_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickrangeslider_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickscrollbar_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickscrollindicator_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickslider_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickspinbox_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickstackview_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickstackview_p_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickswipedelegate_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickswipeview_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickswitch_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickswitchdelegate_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicktabbar_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicktabbutton_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicktextarea_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicktextarea_p_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicktextfield_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicktextfield_p_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicktoolbar_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicktoolbutton_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicktooltip_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquicktumbler_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qquickvelocitycalculator_p_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/%%FULLVER%%/QtQuickTemplates2/private/qtquicktemplates2global_p.h
+%%QT_INCDIR%%/QtQuickTemplates2/QtQuickTemplates2
+%%QT_INCDIR%%/QtQuickTemplates2/QtQuickTemplates2Depends
+%%QT_INCDIR%%/QtQuickTemplates2/QtQuickTemplates2Version
+%%QT_INCDIR%%/QtQuickTemplates2/qtquicktemplates2version.h
+%%QT_CMAKEDIR%%/Qt5QuickControls2/Qt5QuickControls2Config.cmake
+%%QT_CMAKEDIR%%/Qt5QuickControls2/Qt5QuickControls2ConfigVersion.cmake
+%%QT_LIBDIR%%/libQt5QuickControls2.prl
+%%QT_LIBDIR%%/libQt5QuickControls2.so
+%%QT_LIBDIR%%/libQt5QuickControls2.so.5
+%%QT_LIBDIR%%/libQt5QuickControls2.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQt5QuickControls2.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQt5QuickControls2.so.%%FULLVER%%.debug
+%%QT_LIBDIR%%/libQt5QuickTemplates2.prl
+%%QT_LIBDIR%%/libQt5QuickTemplates2.so
+%%QT_LIBDIR%%/libQt5QuickTemplates2.so.5
+%%QT_LIBDIR%%/libQt5QuickTemplates2.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQt5QuickTemplates2.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQt5QuickTemplates2.so.%%FULLVER%%.debug
+%%QT_MKSPECDIR%%/modules/qt_lib_quickcontrols2.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_quickcontrols2_private.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_quicktemplates2_private.pri
%%QT_QMLDIR%%/Qt/labs/calendar/DayOfWeekRow.qml
%%QT_QMLDIR%%/Qt/labs/calendar/MonthGrid.qml
%%QT_QMLDIR%%/Qt/labs/calendar/WeekNumberColumn.qml
@@ -80,233 +102,277 @@
%%DEBUG%%%%QT_QMLDIR%%/Qt/labs/calendar/libqtlabscalendarplugin.so.debug
%%QT_QMLDIR%%/Qt/labs/calendar/plugins.qmltypes
%%QT_QMLDIR%%/Qt/labs/calendar/qmldir
-%%QT_QMLDIR%%/Qt/labs/controls/ApplicationWindow.qml
-%%QT_QMLDIR%%/Qt/labs/controls/BusyIndicator.qml
-%%QT_QMLDIR%%/Qt/labs/controls/Button.qml
-%%QT_QMLDIR%%/Qt/labs/controls/CheckBox.qml
-%%QT_QMLDIR%%/Qt/labs/controls/ComboBox.qml
-%%QT_QMLDIR%%/Qt/labs/controls/Dial.qml
-%%QT_QMLDIR%%/Qt/labs/controls/Drawer.qml
-%%QT_QMLDIR%%/Qt/labs/controls/Frame.qml
-%%QT_QMLDIR%%/Qt/labs/controls/GroupBox.qml
-%%QT_QMLDIR%%/Qt/labs/controls/ItemDelegate.qml
-%%QT_QMLDIR%%/Qt/labs/controls/Label.qml
-%%QT_QMLDIR%%/Qt/labs/controls/Menu.qml
-%%QT_QMLDIR%%/Qt/labs/controls/MenuItem.qml
-%%QT_QMLDIR%%/Qt/labs/controls/Page.qml
-%%QT_QMLDIR%%/Qt/labs/controls/PageIndicator.qml
-%%QT_QMLDIR%%/Qt/labs/controls/Pane.qml
-%%QT_QMLDIR%%/Qt/labs/controls/Popup.qml
-%%QT_QMLDIR%%/Qt/labs/controls/ProgressBar.qml
-%%QT_QMLDIR%%/Qt/labs/controls/RadioButton.qml
-%%QT_QMLDIR%%/Qt/labs/controls/RangeSlider.qml
-%%QT_QMLDIR%%/Qt/labs/controls/ScrollBar.qml
-%%QT_QMLDIR%%/Qt/labs/controls/ScrollIndicator.qml
-%%QT_QMLDIR%%/Qt/labs/controls/Slider.qml
-%%QT_QMLDIR%%/Qt/labs/controls/SpinBox.qml
-%%QT_QMLDIR%%/Qt/labs/controls/StackView.qml
-%%QT_QMLDIR%%/Qt/labs/controls/SwipeView.qml
-%%QT_QMLDIR%%/Qt/labs/controls/Switch.qml
-%%QT_QMLDIR%%/Qt/labs/controls/TabBar.qml
-%%QT_QMLDIR%%/Qt/labs/controls/TabButton.qml
-%%QT_QMLDIR%%/Qt/labs/controls/TextArea.qml
-%%QT_QMLDIR%%/Qt/labs/controls/TextField.qml
-%%QT_QMLDIR%%/Qt/labs/controls/ToolBar.qml
-%%QT_QMLDIR%%/Qt/labs/controls/ToolButton.qml
-%%QT_QMLDIR%%/Qt/labs/controls/Tumbler.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/BusyIndicatorSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/ButtonSection.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/ButtonSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/CheckBoxSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/ComboBoxSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/ControlSection.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/ControlSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/DialSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/FrameSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/GroupBoxSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/ItemDelegateSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/LabelSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/PaddingSection.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/PageIndicatorSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/PaneSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/ProgressBarSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/RadioButtonSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/SliderSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/SpinBoxSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/SwitchSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/TextAreaSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/TextFieldSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/ToolBarSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/ToolButtonSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/TumblerSpecifics.qml
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/busyindicator-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/busyindicator-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/busyindicator-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/busyindicator-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/button-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/button-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/button-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/button-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/checkbox-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/checkbox-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/checkbox-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/checkbox-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/combobox-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/combobox-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/combobox-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/combobox-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/dial-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/dial-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/dial-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/dial-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/frame-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/frame-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/frame-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/frame-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/groupbox-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/groupbox-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/groupbox-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/groupbox-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/itemdelegate-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/itemdelegate-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/itemdelegate-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/itemdelegate-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/label-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/label-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/label-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/label-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/pageindicator-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/pageindicator-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/pageindicator-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/pageindicator-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/pane-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/pane-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/pane-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/pane-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/placeholder-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/placeholder-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/placeholder-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/placeholder-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/progressbar-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/progressbar-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/progressbar-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/progressbar-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/radiobutton-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/radiobutton-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/radiobutton-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/radiobutton-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/slider-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/slider-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/slider-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/slider-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/spinbox-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/spinbox-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/spinbox-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/spinbox-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/switch-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/switch-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/switch-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/switch-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/textarea-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/textarea-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/textarea-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/textarea-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/textfield-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/textfield-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/textfield-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/textfield-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/toolbar-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/toolbar-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/toolbar-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/toolbar-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/toolbutton-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/toolbutton-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/toolbutton-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/toolbutton-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/tumbler-icon.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/tumbler-icon16.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/tumbler-icon16@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/images/tumbler-icon@2x.png
-%%QT_QMLDIR%%/Qt/labs/controls/designer/qtlabscontrols.metainfo
-%%QT_QMLDIR%%/Qt/labs/controls/libqtlabscontrolsplugin.so
-%%DEBUG%%%%QT_QMLDIR%%/Qt/labs/controls/libqtlabscontrolsplugin.so.debug
-%%QT_QMLDIR%%/Qt/labs/controls/material/ApplicationWindow.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/BusyIndicator.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/Button.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/CheckBox.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/ComboBox.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/Dial.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/Drawer.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/Frame.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/GroupBox.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/ItemDelegate.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/Label.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/Menu.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/MenuItem.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/Page.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/PageIndicator.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/Pane.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/Popup.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/ProgressBar.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/RadioButton.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/RangeSlider.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/Ripple.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/ScrollBar.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/ScrollIndicator.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/Slider.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/SliderHandle.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/SpinBox.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/StackView.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/SwipeView.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/Switch.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/TabBar.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/TabButton.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/TextArea.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/TextField.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/ToolBar.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/ToolButton.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/Tumbler.qml
-%%QT_QMLDIR%%/Qt/labs/controls/material/libqtlabsmaterialstyleplugin.so
-%%DEBUG%%%%QT_QMLDIR%%/Qt/labs/controls/material/libqtlabsmaterialstyleplugin.so.debug
-%%QT_QMLDIR%%/Qt/labs/controls/material/qmldir
-%%QT_QMLDIR%%/Qt/labs/controls/plugins.qmltypes
-%%QT_QMLDIR%%/Qt/labs/controls/qmldir
-%%QT_QMLDIR%%/Qt/labs/controls/universal/ApplicationWindow.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/BusyIndicator.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/Button.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/CheckBox.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/ComboBox.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/Dial.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/Frame.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/GroupBox.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/ItemDelegate.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/Label.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/Menu.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/MenuItem.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/Page.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/PageIndicator.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/Pane.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/Popup.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/ProgressBar.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/RadioButton.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/RangeSlider.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/ScrollBar.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/ScrollIndicator.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/Slider.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/SpinBox.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/StackView.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/Switch.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/TabBar.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/TabButton.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/TextArea.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/TextField.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/ToolBar.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/ToolButton.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/Tumbler.qml
-%%QT_QMLDIR%%/Qt/labs/controls/universal/libqtlabsuniversalstyleplugin.so
-%%DEBUG%%%%QT_QMLDIR%%/Qt/labs/controls/universal/libqtlabsuniversalstyleplugin.so.debug
-%%QT_QMLDIR%%/Qt/labs/controls/universal/qmldir
-%%QT_QMLDIR%%/Qt/labs/templates/libqtlabstemplatesplugin.so
-%%DEBUG%%%%QT_QMLDIR%%/Qt/labs/templates/libqtlabstemplatesplugin.so.debug
-%%QT_QMLDIR%%/Qt/labs/templates/plugins.qmltypes
-%%QT_QMLDIR%%/Qt/labs/templates/qmldir
+%%QT_QMLDIR%%/QtQuick/Controls.2/ApplicationWindow.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/BusyIndicator.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Button.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/CheckBox.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/CheckDelegate.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/CheckIndicator.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/ComboBox.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Dial.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Drawer.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Frame.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/GroupBox.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/ItemDelegate.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Label.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/AbstractButton.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Container.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Control.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/ApplicationWindow.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/BoxShadow.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/BusyIndicator.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/Button.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/CheckBox.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/CheckDelegate.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/CheckIndicator.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/ComboBox.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/Dial.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/Drawer.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/ElevationEffect.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/Frame.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/GroupBox.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/ItemDelegate.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/Label.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/Menu.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/MenuItem.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/Page.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/PageIndicator.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/Pane.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/Popup.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/ProgressBar.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/RadioButton.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/RadioDelegate.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/RadioIndicator.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/RangeSlider.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/Ripple.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/ScrollBar.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/ScrollIndicator.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/Slider.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/SliderHandle.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/SpinBox.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/StackView.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/SwipeDelegate.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/SwipeView.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/Switch.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/SwitchDelegate.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/SwitchIndicator.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/TabBar.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/TabButton.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/TextArea.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/TextField.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/ToolBar.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/ToolButton.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/ToolTip.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/Tumbler.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so
+%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Controls.2/Material/libqtquickcontrols2materialstyleplugin.so.debug
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/plugins.qmltypes
+%%QT_QMLDIR%%/QtQuick/Controls.2/Material/qmldir
+%%QT_QMLDIR%%/QtQuick/Controls.2/Menu.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/MenuItem.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Page.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/PageIndicator.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Pane.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Popup.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/ProgressBar.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/RadioButton.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/RadioDelegate.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/RadioIndicator.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/RangeSlider.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/ScrollBar.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/ScrollIndicator.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Slider.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/SpinBox.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/StackView.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/SwipeDelegate.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/SwipeView.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Switch.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/SwitchDelegate.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/SwitchIndicator.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/TabBar.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/TabButton.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/TextArea.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/TextField.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/ToolBar.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/ToolButton.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/ToolTip.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Tumbler.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/ApplicationWindow.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/BusyIndicator.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/Button.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/CheckBox.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/CheckDelegate.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/CheckIndicator.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/ComboBox.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/Dial.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/Drawer.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/Frame.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/GroupBox.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/ItemDelegate.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/Label.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/Menu.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/MenuItem.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/Page.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/PageIndicator.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/Pane.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/Popup.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/ProgressBar.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/RadioButton.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/RadioDelegate.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/RadioIndicator.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/RangeSlider.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/ScrollBar.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/ScrollIndicator.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/Slider.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/SpinBox.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/StackView.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/SwipeDelegate.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/Switch.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/SwitchDelegate.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/SwitchIndicator.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/TabBar.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/TabButton.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/TextArea.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/TextField.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/ToolBar.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/ToolButton.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/ToolTip.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/Tumbler.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/libqtquickcontrols2universalstyleplugin.so
+%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/libqtquickcontrols2universalstyleplugin.so.debug
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/plugins.qmltypes
+%%QT_QMLDIR%%/QtQuick/Controls.2/Universal/qmldir
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/BusyIndicatorSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/ButtonSection.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/ButtonSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/CheckBoxSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/CheckDelegateSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/ComboBoxSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/ControlSection.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/ControlSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/DialSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/FrameSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/GroupBoxSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/ItemDelegateSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/LabelSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/PaddingSection.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/PageIndicatorSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/PaneSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/ProgressBarSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/RadioButtonSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/RadioDelegateSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/SliderSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/SpinBoxSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/SwipeDelegateSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/SwitchSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/TextAreaSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/TextFieldSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/ToolBarSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/ToolButtonSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/TumblerSpecifics.qml
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/busyindicator-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/busyindicator-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/busyindicator-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/busyindicator-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/button-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/button-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/button-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/button-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/checkbox-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/checkbox-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/checkbox-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/checkbox-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/combobox-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/combobox-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/combobox-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/combobox-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/dial-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/dial-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/dial-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/dial-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/frame-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/frame-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/frame-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/frame-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/groupbox-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/groupbox-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/groupbox-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/groupbox-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/itemdelegate-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/itemdelegate-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/itemdelegate-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/itemdelegate-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/label-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/label-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/label-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/label-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/page-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/page-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/page-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/page-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/rangeslider-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/rangeslider-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/rangeslider-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/rangeslider-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/pageindicator-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/pageindicator-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/pageindicator-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/pageindicator-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/pane-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/pane-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/pane-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/pane-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/placeholder-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/placeholder-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/placeholder-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/placeholder-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/progressbar-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/progressbar-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/progressbar-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/progressbar-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/radiobutton-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/radiobutton-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/radiobutton-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/radiobutton-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/slider-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/slider-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/slider-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/slider-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/spinbox-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/spinbox-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/spinbox-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/spinbox-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/switch-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/switch-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/switch-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/switch-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/textarea-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/textarea-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/textarea-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/textarea-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/textfield-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/textfield-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/textfield-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/textfield-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/toolbar-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/toolbar-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/toolbar-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/toolbar-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/toolbutton-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/toolbutton-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/toolbutton-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/toolbutton-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/tumbler-icon.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/tumbler-icon16.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/tumbler-icon16@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/images/tumbler-icon@2x.png
+%%QT_QMLDIR%%/QtQuick/Controls.2/designer/qtquickcontrols2.metainfo
+%%QT_QMLDIR%%/QtQuick/Controls.2/libqtquickcontrols2plugin.so
+%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Controls.2/libqtquickcontrols2plugin.so.debug
+%%QT_QMLDIR%%/QtQuick/Controls.2/plugins.qmltypes
+%%QT_QMLDIR%%/QtQuick/Controls.2/qmldir
+%%QT_QMLDIR%%/QtQuick/Templates.2/libqtquicktemplates2plugin.so
+%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Templates.2/libqtquicktemplates2plugin.so.debug
+%%QT_QMLDIR%%/QtQuick/Templates.2/plugins.qmltypes
+%%QT_QMLDIR%%/QtQuick/Templates.2/qmldir
+libdata/pkgconfig/Qt5QuickControls2.pc
diff --git a/x11-toolkits/qt5-uiplugin/pkg-plist b/x11-toolkits/qt5-uiplugin/pkg-plist
index dbea79597cc0..ae78e7c39ee7 100644
--- a/x11-toolkits/qt5-uiplugin/pkg-plist
+++ b/x11-toolkits/qt5-uiplugin/pkg-plist
@@ -7,6 +7,6 @@
%%QT_INCDIR%%/QtUiPlugin/customwidget.h
%%QT_INCDIR%%/QtUiPlugin/qdesignerexportwidget.h
%%QT_INCDIR%%/QtUiPlugin/qtuipluginversion.h
-%%QT_LIBDIR%%/cmake/Qt5UiPlugin/Qt5UiPluginConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5UiPlugin/Qt5UiPluginConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5UiPlugin/Qt5UiPluginConfig.cmake
+%%QT_CMAKEDIR%%/Qt5UiPlugin/Qt5UiPluginConfigVersion.cmake
%%QT_MKSPECDIR%%/modules/qt_lib_uiplugin.pri
diff --git a/x11-toolkits/qt5-virtualkeyboard/Makefile b/x11-toolkits/qt5-virtualkeyboard/Makefile
new file mode 100644
index 000000000000..8dc4d55a1a8b
--- /dev/null
+++ b/x11-toolkits/qt5-virtualkeyboard/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= virtualkeyboard
+DISTVERSION= ${QT5_VERSION}
+CATEGORIES= x11-toolkits
+PKGNAMEPREFIX= qt5-
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Qt 5 Virtual Keyboard Module
+
+USE_QT5= core network gui widgets svg qml quick buildtools_build
+QT_DIST= ${PORTNAME}
+
+USES= qmake
+USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/qt5-virtualkeyboard/pkg-plist b/x11-toolkits/qt5-virtualkeyboard/pkg-plist
new file mode 100644
index 000000000000..374ddcb8a611
--- /dev/null
+++ b/x11-toolkits/qt5-virtualkeyboard/pkg-plist
@@ -0,0 +1,9 @@
+%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QVirtualKeyboardPlugin.cmake
+%%QT_PLUGINDIR%%/platforminputcontexts/libqtvirtualkeyboardplugin.so
+%%DEBUG%%%%QT_PLUGINDIR%%/platforminputcontexts/libqtvirtualkeyboardplugin.so.debug
+%%QT_QMLDIR%%/QtQuick/VirtualKeyboard/Styles/libqtvirtualkeyboardstylesplugin.so
+%%DEBUG%%%%QT_QMLDIR%%/QtQuick/VirtualKeyboard/Styles/libqtvirtualkeyboardstylesplugin.so.debug
+%%QT_QMLDIR%%/QtQuick/VirtualKeyboard/plugins.qmltypes
+%%QT_QMLDIR%%/QtQuick/VirtualKeyboard/qmldir
+%%QT_QMLDIR%%/QtQuick/VirtualKeyboard/Styles/plugins.qmltypes
+%%QT_QMLDIR%%/QtQuick/VirtualKeyboard/Styles/qmldir
diff --git a/x11-toolkits/qt5-widgets/Makefile b/x11-toolkits/qt5-widgets/Makefile
index 834497ebc346..25acf4f64a5b 100644
--- a/x11-toolkits/qt5-widgets/Makefile
+++ b/x11-toolkits/qt5-widgets/Makefile
@@ -17,28 +17,28 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-MORE_WRKSRCS= src/tools/uic \
- src/plugins/platformthemes
+MORE_WRKSRCS= src/tools/uic
QT_DEFINES= ACCESSIBILITY WIDGETS XSYNC
QT_CONFIG= accessibility accessibility-atspi-bridge xlib
-OPTIONS_DEFINE= GTK2
-OPTIONS_SUB= yes
+OPTIONS_DEFINE= GTK3
+OPTIONS_SUB= YES
-GTK2_DESC= GTK+-based Qt theme
-GTK2_USE= GNOME=gtk20
-GTK2_CONFIGURE_ON= -gtkstyle
-GTK2_CONFIGURE_OFF= -no-gtkstyle
+GTK3_DESC= GTK+-based Qt theme
+GTK3_USE= GNOME=gtk30 QT5=dbus
+GTK3_CONFIGURE_ON= -gtk
+GTK3_CONFIGURE_OFF= -no-gtk
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MGTK2}
+.if ${PORT_OPTIONS:MGTK3}
QT_DEFINES+= STYLE_GTK
-QT_CONFIG+= gtkstyle
+QT_CONFIG+= gtk
+MORE_WRKSRCS+= src/plugins/platformthemes
.else
QT_DEFINES+= -STYLE_GTK
-QT_CONFIG+= -gtkstyle
+QT_CONFIG+= -gtk
.endif
# libQt5PlatformSupport.a is installed by qt5-core but needed for the gtk style plugin
diff --git a/x11-toolkits/qt5-widgets/pkg-plist b/x11-toolkits/qt5-widgets/pkg-plist
index 48010f559c4e..9b7f376439ee 100644
--- a/x11-toolkits/qt5-widgets/pkg-plist
+++ b/x11-toolkits/qt5-widgets/pkg-plist
@@ -57,11 +57,6 @@
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgraphicstransform_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgraphicsview_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgraphicswidget_p.h
-%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgtk2painter_p.h
-%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgtkglobal_p.h
-%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgtkpainter_p.h
-%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgtkstyle_p.h
-%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qgtkstyle_p_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qheaderview_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qitemeditorfactory_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qkeysequenceedit_p.h
@@ -81,6 +76,8 @@
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qmenu_wince_resource_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qmenubar_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qpixmapfilter_p.h
+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qpixmapstyle_p.h
+%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qpixmapstyle_p_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qplaintextedit_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qproxystyle_p.h
%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qpushbutton_p.h
@@ -486,11 +483,11 @@
%%QT_INCDIR%%/QtWidgets/qwidgetaction.h
%%QT_INCDIR%%/QtWidgets/qwidgetsfunctions_wince.h
%%QT_INCDIR%%/QtWidgets/qwizard.h
-%%GTK2%%%%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake
-%%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake
-%%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfigExtras.cmake
-%%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfigVersion.cmake
-%%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsMacros.cmake
+%%GTK3%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QGtk3ThemePlugin.cmake
+%%QT_CMAKEDIR%%/Qt5Widgets/Qt5WidgetsConfig.cmake
+%%QT_CMAKEDIR%%/Qt5Widgets/Qt5WidgetsConfigExtras.cmake
+%%QT_CMAKEDIR%%/Qt5Widgets/Qt5WidgetsConfigVersion.cmake
+%%QT_CMAKEDIR%%/Qt5Widgets/Qt5WidgetsMacros.cmake
%%QT_LIBDIR%%/libQt5Widgets.prl
%%QT_LIBDIR%%/libQt5Widgets.so
%%QT_LIBDIR%%/libQt5Widgets.so.5
@@ -499,8 +496,8 @@
%%DEBUG%%%%QT_LIBDIR%%/libQt5Widgets.so.%%FULLVER%%.debug
%%QT_BINDIR%%/uic
%%QT_MKSPECDIR%%/modules/qt_lib_widgets.pri
-%%GTK2%%%%QT_PLUGINDIR%%/platformthemes/libqgtk2.so
-%%GTK2%%%%DEBUG%%%%QT_PLUGINDIR%%/platformthemes/libqgtk2.so.debug
%%QT_MKSPECDIR%%/modules/qt_lib_widgets_private.pri
+%%GTK3%%%%QT_PLUGINDIR%%/platformthemes/libqgtk3.so
+%%GTK3%%%%DEBUG%%%%QT_PLUGINDIR%%/platformthemes/libqgtk3.so.debug
libdata/pkgconfig/Qt5Widgets.pc
share/pixmaps/qt5logo.png