diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-01-24 18:10:14 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-01-24 18:10:14 +0000 |
| commit | 4c67812e0161cb63098ede0c2645e53c5060ecd9 (patch) | |
| tree | 66663b28c2c298161be86b00114ab18d6fad8670 | |
| parent | 7b72d170ba3c89c7e408c333297d8ecfa3ba72f1 (diff) | |
| download | ports-4c67812e0161cb63098ede0c2645e53c5060ecd9.tar.gz ports-4c67812e0161cb63098ede0c2645e53c5060ecd9.zip | |
Notes
90 files changed, 2700 insertions, 685 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index a88505c5710c..244b58f7273a 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -27,7 +27,7 @@ Qt_Pre_Include= bsd.qt.mk # Qt versions currently supported by the framework. _QT_SUPPORTED?= 4 5 QT4_VERSION?= 4.8.7 -QT5_VERSION?= 5.4.1 +QT5_VERSION?= 5.5.1 QT_PREFIX?= ${LOCALBASE} @@ -90,12 +90,21 @@ DISTFILES= ${DISTNAME:S,$,${EXTRACT_SUFX},} DIST_SUBDIR= KDE/Qt/${_QT_VERSION} USES+= tar:xz +# Qt (at least when used with qmake) has a tendency to overlink: some libraries +# have dependencies on others in the mkspec configurations and the latter are +# always passed to the linker even if they are not actually used. By passing +# --as-needed to the linker by default when building the Qt ports we do not +# have to declare a lot of unnecessary dependencies in USE_QT5. +# This could arguably work for Qt4 too, but since it is maintenance mode it is +# better not to fix what is not explicitly broken there. +LDFLAGS+= -Wl,--as-needed + . if ${.TARGETS:Mmakesum} || ${.TARGETS:Mfetch} && \ defined(DISABLE_SIZE) && defined(NO_CHECKSUM) # Ensure that the "makesum" target (with its inner "fetch" one) uses # devel/qt*/distinfo for every port. -QT_DIST= base declarative doc graphicaleffects imageformats \ - multimedia quick1 quickcontrols script serialport svg tools \ +QT_DIST= 3d base canvas3d connectivity declarative doc enginio graphicaleffects imageformats \ + location multimedia quick1 quickcontrols script sensors serialport svg tools \ translations webchannel webkit webkit-examples websockets x11extras xmlpatterns . endif @@ -290,22 +299,27 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \ .endif # !defined(QT_NONSTANDARD) _USE_QT_ALL= assistant clucene dbus declarative designer gui help \ - imageformats linguist linguisttools multimedia network opengl pixeltool \ - qdbusviewer qmake script scripttools sql sql-ibase sql-mysql \ - sql-odbc sql-pgsql sql-sqlite2 sql-sqlite3 svg testlib webkit \ + imageformats l10n linguist linguisttools multimedia \ + network opengl pixeltool qdbusviewer qmake script \ + scripttools sql sql-ibase sql-mysql sql-odbc sql-pgsql \ + sql-sqlite2 sql-sqlite3 svg testlib webkit \ xml xmlpatterns _USE_QT4_ONLY= accessible assistant-adp assistantclient codecs-cn codecs-jp \ codecs-kr codecs-tw corelib demo doc graphicssystems-opengl \ - help-tools iconengines inputmethods l10n makeqpf moc phonon \ + help-tools iconengines inputmethods makeqpf moc phonon \ phonon-gst porting qdoc3 qmlviewer qt3support qtconfig \ qtestlib qvfb rcc uic uic3 xmlpatterns-tool -_USE_QT5_ONLY= buildtools concurrent core graphicaleffects \ - paths phonon4 printsupport qdbus qdoc qev qml quick \ - quickcontrols serialport uitools webchannel websockets \ +_USE_QT5_ONLY= 3d buildtools canvas3d concurrent connectivity core \ + enginio graphicaleffects location paths phonon4 \ + printsupport qdbus qdoc qev qml quick quickcontrols \ + sensors serialport uiplugin uitools webchannel websockets \ widgets x11extras +3d_PORT= graphics/${_QT_RELNAME}-3d +3d_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}3DCore.so + accessible_PORT= accessibility/${_QT_RELNAME}-accessible accessible_PATH= ${QT_PLUGINDIR}/accessible/libqtaccessiblewidgets.so @@ -321,6 +335,9 @@ assistantclient_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}AssistantClient.so buildtools_PORT= devel/${_QT_RELNAME}-buildtools buildtools_PATH= ${MOC} +canvas3d_PORT= x11-toolkits/${_QT_RELNAME}-canvas3d +canvas3d_PATH= ${QT_QMLDIR}/QtCanvas3D/qmldir + clucene_PORT= textproc/clucene-${_QT_RELNAME} clucene_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}CLucene.so @@ -339,6 +356,9 @@ codecs-tw_PATH= ${QT_PLUGINDIR}/codecs/libqtwcodecs.so concurrent_PORT= devel/${_QT_RELNAME}-concurrent concurrent_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}Concurrent.so +connectivity_PORT= comms/${_QT_RELNAME}-connectivity +connectivity_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}Bluetooth.so + core_PORT= devel/${_QT_RELNAME}-core core_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}Core.so @@ -360,6 +380,9 @@ designer_PATH= ${QT_BINDIR}/designer${_QT_BINSUFX} doc_PORT= misc/${_QT_RELNAME}-doc doc_PATH= ${_QT_RELNAME}-doc>=${_QT_VERSION:R:R} +enginio_PORT= net/${_QT_RELNAME}-enginio +enginio_PATH= ${QT_LIBDIR}/libEnginio.so + graphicaleffects_PORT= graphics/${_QT_RELNAME}-graphicaleffects graphicaleffects_PATH= ${QT_QMLDIR}/QtGraphicalEffects/qmldir @@ -390,6 +413,9 @@ linguist_PATH= ${QT_BINDIR}/linguist${_QT_BINSUFX} linguisttools_PORT= devel/${_QT_RELNAME}-linguisttools linguisttools_PATH= ${LRELEASE} +location_PORT= devel/${_QT_RELNAME}-location +location_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}Location.so + l10n_PORT= misc/${_QT_RELNAME}-l10n l10n_PATH= ${_QT_RELNAME}-l10n>=${_QT_VERSION:R:R} @@ -474,6 +500,9 @@ qvfb_PATH= ${QT_BINDIR}/qvfb${_QT_BINSUFX} rcc_PORT= devel/${_QT_RELNAME}-rcc rcc_PATH= ${RCC} +sensors_PORT= comms/${_QT_RELNAME}-sensors +sensors_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}Sensors.so + script_PORT= devel/${_QT_RELNAME}-script script_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}Script.so @@ -515,6 +544,9 @@ uic_PATH= ${UIC} uic3_PORT= devel/${_QT_RELNAME}-uic3 uic3_PATH= ${QT_BINDIR}/uic3 +uiplugin_PORT= x11-toolkits/${_QT_RELNAME}-uiplugin +uiplugin_PATH= ${QT_INCDIR}/QtUiPlugin/QtUiPlugin + uitools_PORT= devel/${_QT_RELNAME}-uitools uitools_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}UiTools.a diff --git a/comms/Makefile b/comms/Makefile index 31ee133e4c2a..20e939993c35 100644 --- a/comms/Makefile +++ b/comms/Makefile @@ -141,6 +141,8 @@ SUBDIR += qico SUBDIR += qrq SUBDIR += qsstv + SUBDIR += qt5-connectivity + SUBDIR += qt5-sensors SUBDIR += qt5-serialport SUBDIR += qtel SUBDIR += quisk diff --git a/comms/qt5-connectivity/Makefile b/comms/qt5-connectivity/Makefile new file mode 100644 index 000000000000..c504ea587f2c --- /dev/null +++ b/comms/qt5-connectivity/Makefile @@ -0,0 +1,17 @@ +# $FreeBSD$ + +PORTNAME= connectivity +DISTVERSION= ${QT5_VERSION} +CATEGORIES= comms +PKGNAMEPREFIX= qt5- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt connectivity (Bluetooth/NFC) module + +USE_QT5= concurrent core qml quick buildtools_build +QT_DIST= ${PORTNAME} +USES= qmake + +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} + +.include <bsd.port.mk> diff --git a/comms/qt5-connectivity/pkg-plist b/comms/qt5-connectivity/pkg-plist new file mode 100644 index 000000000000..a17a9dd25e26 --- /dev/null +++ b/comms/qt5-connectivity/pkg-plist @@ -0,0 +1,208 @@ +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/adapter1_bluez5_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/adapter_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/agent_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/androidbroadcastreceiver_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluez5_helper_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/bluez_data_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/corebluetoothwrapper_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/device1_bluez5_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/device_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/devicediscoverybroadcastreceiver_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/hcimanager_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/inputstreamthread_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/jni_android_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/localdevicebroadcastreceiver_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/lowenergynotificationhub_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/manager_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/obex_agent_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/obex_client1_bluez5_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/obex_client_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/obex_manager_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/obex_objectpush1_bluez5_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/obex_transfer1_bluez5_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/obex_transfer_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/objectmanager_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtcentralmanager_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtchanneldelegate_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtconnectionmonitor_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtdeviceinquiry_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtdevicepair_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtl2capchannel_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtledeviceinquiry_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtobexsession_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtrfcommchannel_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtsdpinquiry_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtservicerecord_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtsocketlistener_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtutility_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/ppshelpers_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/profile1_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/properties_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothaddress_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothdevicediscoveryagent_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothdevicediscoverytimer_osx_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothdeviceinfo_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothhostinfo_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothlocaldevice_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothserver_osx_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothserver_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothservicediscoveryagent_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothserviceinfo_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_osx_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothsocket_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferreply_bluez_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferreply_osx_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferreply_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferreply_qnx_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qbluetoothtransferrequest_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_osx_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergyserviceprivate_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qprivatelinearbuffer_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/serveracceptancethread_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/service_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/servicediscoverybroadcastreceiver_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/servicemap_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/uistrings_p.h +%%QT_INCDIR%%/QtBluetooth/QBluetoothAddress +%%QT_INCDIR%%/QtBluetooth/QBluetoothDeviceDiscoveryAgent +%%QT_INCDIR%%/QtBluetooth/QBluetoothDeviceInfo +%%QT_INCDIR%%/QtBluetooth/QBluetoothHostInfo +%%QT_INCDIR%%/QtBluetooth/QBluetoothLocalDevice +%%QT_INCDIR%%/QtBluetooth/QBluetoothServer +%%QT_INCDIR%%/QtBluetooth/QBluetoothServiceDiscoveryAgent +%%QT_INCDIR%%/QtBluetooth/QBluetoothServiceInfo +%%QT_INCDIR%%/QtBluetooth/QBluetoothSocket +%%QT_INCDIR%%/QtBluetooth/QBluetoothTransferManager +%%QT_INCDIR%%/QtBluetooth/QBluetoothTransferReply +%%QT_INCDIR%%/QtBluetooth/QBluetoothTransferRequest +%%QT_INCDIR%%/QtBluetooth/QBluetoothUuid +%%QT_INCDIR%%/QtBluetooth/QLowEnergyCharacteristic +%%QT_INCDIR%%/QtBluetooth/QLowEnergyController +%%QT_INCDIR%%/QtBluetooth/QLowEnergyDescriptor +%%QT_INCDIR%%/QtBluetooth/QLowEnergyHandle +%%QT_INCDIR%%/QtBluetooth/QLowEnergyService +%%QT_INCDIR%%/QtBluetooth/QtBluetooth +%%QT_INCDIR%%/QtBluetooth/QtBluetoothDepends +%%QT_INCDIR%%/QtBluetooth/QtBluetoothVersion +%%QT_INCDIR%%/QtBluetooth/qbluetooth.h +%%QT_INCDIR%%/QtBluetooth/qbluetoothaddress.h +%%QT_INCDIR%%/QtBluetooth/qbluetoothdevicediscoveryagent.h +%%QT_INCDIR%%/QtBluetooth/qbluetoothdeviceinfo.h +%%QT_INCDIR%%/QtBluetooth/qbluetoothglobal.h +%%QT_INCDIR%%/QtBluetooth/qbluetoothhostinfo.h +%%QT_INCDIR%%/QtBluetooth/qbluetoothlocaldevice.h +%%QT_INCDIR%%/QtBluetooth/qbluetoothserver.h +%%QT_INCDIR%%/QtBluetooth/qbluetoothservicediscoveryagent.h +%%QT_INCDIR%%/QtBluetooth/qbluetoothserviceinfo.h +%%QT_INCDIR%%/QtBluetooth/qbluetoothsocket.h +%%QT_INCDIR%%/QtBluetooth/qbluetoothtransfermanager.h +%%QT_INCDIR%%/QtBluetooth/qbluetoothtransferreply.h +%%QT_INCDIR%%/QtBluetooth/qbluetoothtransferrequest.h +%%QT_INCDIR%%/QtBluetooth/qbluetoothuuid.h +%%QT_INCDIR%%/QtBluetooth/qlowenergycharacteristic.h +%%QT_INCDIR%%/QtBluetooth/qlowenergycontroller.h +%%QT_INCDIR%%/QtBluetooth/qlowenergydescriptor.h +%%QT_INCDIR%%/QtBluetooth/qlowenergyservice.h +%%QT_INCDIR%%/QtBluetooth/qtbluetoothversion.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/adapter_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/agent_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/dbusobjectmanager_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/dbusproperties_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/manager_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/neard_helper_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpserver_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpserver_p_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpserver_qnx_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpserver_simulator_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpsocket_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpsocket_p_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpsocket_qnx_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qllcpsocket_simulator_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qndefnfcsmartposterrecord_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qndefrecord_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_emulator_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_neard_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_qnx_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanager_simulator_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanagerimpl_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldmanagervirtualbase_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldsharemanager_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldsharemanager_qnx_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldsharemanagerimpl_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldsharetarget_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldsharetarget_qnx_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldsharetargetimpl_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldtagtype1_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldtagtype2_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldtagtype3_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldtagtype4_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldtarget_emulator_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldtarget_neard_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldtarget_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnearfieldtarget_qnx_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnxnfceventfilter_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnxnfcmanager_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qnxnfcsharemanager_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/qtlv_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/tag_p.h +%%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/targetemulator_p.h +%%QT_INCDIR%%/QtNfc/QNdefFilter +%%QT_INCDIR%%/QtNfc/QNdefMessage +%%QT_INCDIR%%/QtNfc/QNdefNfcIconRecord +%%QT_INCDIR%%/QtNfc/QNdefNfcSmartPosterRecord +%%QT_INCDIR%%/QtNfc/QNdefNfcTextRecord +%%QT_INCDIR%%/QtNfc/QNdefNfcUriRecord +%%QT_INCDIR%%/QtNfc/QNdefRecord +%%QT_INCDIR%%/QtNfc/QNearFieldManager +%%QT_INCDIR%%/QtNfc/QNearFieldShareManager +%%QT_INCDIR%%/QtNfc/QNearFieldShareTarget +%%QT_INCDIR%%/QtNfc/QNearFieldTarget +%%QT_INCDIR%%/QtNfc/QQmlNdefRecord +%%QT_INCDIR%%/QtNfc/QtNfc +%%QT_INCDIR%%/QtNfc/QtNfcDepends +%%QT_INCDIR%%/QtNfc/QtNfcVersion +%%QT_INCDIR%%/QtNfc/qndeffilter.h +%%QT_INCDIR%%/QtNfc/qndefmessage.h +%%QT_INCDIR%%/QtNfc/qndefnfcsmartposterrecord.h +%%QT_INCDIR%%/QtNfc/qndefnfctextrecord.h +%%QT_INCDIR%%/QtNfc/qndefnfcurirecord.h +%%QT_INCDIR%%/QtNfc/qndefrecord.h +%%QT_INCDIR%%/QtNfc/qnearfieldmanager.h +%%QT_INCDIR%%/QtNfc/qnearfieldsharemanager.h +%%QT_INCDIR%%/QtNfc/qnearfieldsharetarget.h +%%QT_INCDIR%%/QtNfc/qnearfieldtarget.h +%%QT_INCDIR%%/QtNfc/qnfcglobal.h +%%QT_INCDIR%%/QtNfc/qqmlndefrecord.h +%%QT_INCDIR%%/QtNfc/qtnfcversion.h +%%QT_LIBDIR%%/cmake/Qt5Bluetooth/Qt5BluetoothConfig.cmake +%%QT_LIBDIR%%/cmake/Qt5Bluetooth/Qt5BluetoothConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt5Nfc/Qt5NfcConfig.cmake +%%QT_LIBDIR%%/cmake/Qt5Nfc/Qt5NfcConfigVersion.cmake +%%QT_LIBDIR%%/libQt5Bluetooth.prl +%%QT_LIBDIR%%/libQt5Bluetooth.so +%%QT_LIBDIR%%/libQt5Bluetooth.so.5 +%%QT_LIBDIR%%/libQt5Bluetooth.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt5Bluetooth.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt5Bluetooth.so.%%FULLVER%%.debug +%%QT_LIBDIR%%/libQt5Nfc.prl +%%QT_LIBDIR%%/libQt5Nfc.so +%%QT_LIBDIR%%/libQt5Nfc.so.5 +%%QT_LIBDIR%%/libQt5Nfc.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt5Nfc.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt5Nfc.so.%%FULLVER%%.debug +%%QT_MKSPECDIR%%/modules/qt_lib_bluetooth.pri +%%QT_MKSPECDIR%%/modules/qt_lib_bluetooth_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_nfc.pri +%%QT_MKSPECDIR%%/modules/qt_lib_nfc_private.pri +%%QT_QMLDIR%%/QtBluetooth/libdeclarative_bluetooth.so +%%DEBUG%%%%QT_QMLDIR%%/QtBluetooth/libdeclarative_bluetooth.so.debug +%%QT_QMLDIR%%/QtBluetooth/plugins.qmltypes +%%QT_QMLDIR%%/QtBluetooth/qmldir +%%QT_QMLDIR%%/QtNfc/libdeclarative_nfc.so +%%DEBUG%%%%QT_QMLDIR%%/QtNfc/libdeclarative_nfc.so.debug +%%QT_QMLDIR%%/QtNfc/plugins.qmltypes +%%QT_QMLDIR%%/QtNfc/qmldir +libdata/pkgconfig/Qt5Bluetooth.pc +libdata/pkgconfig/Qt5Nfc.pc diff --git a/comms/qt5-sensors/Makefile b/comms/qt5-sensors/Makefile new file mode 100644 index 000000000000..27749bc7d9f5 --- /dev/null +++ b/comms/qt5-sensors/Makefile @@ -0,0 +1,17 @@ +# $FreeBSD$ + +PORTNAME= sensors +DISTVERSION= ${QT5_VERSION} +CATEGORIES= comms +PKGNAMEPREFIX= qt5- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt sensors module + +USE_QT5= core qml quick buildtools_build +QT_DIST= ${PORTNAME} +USES= qmake + +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} + +.include <bsd.port.mk> diff --git a/comms/qt5-sensors/pkg-plist b/comms/qt5-sensors/pkg-plist new file mode 100644 index 000000000000..dd476871a332 --- /dev/null +++ b/comms/qt5-sensors/pkg-plist @@ -0,0 +1,140 @@ +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qaccelerometer_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qaltimeter_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qambientlightsensor_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qambienttemperaturesensor_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qcompass_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qdistancesensor_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qgyroscope_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qholstersensor_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qirproximitysensor_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qlightsensor_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qmagnetometer_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qorientationsensor_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qpressuresensor_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qproximitysensor_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qrotationsensor_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qsensor_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qsensorbackend_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qsensorgesture_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qsensorgesturemanagerprivate_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qtapsensor_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qtiltsensor_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/sensorlog_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/simulatorgesturescommon_p.h +%%QT_INCDIR%%/QtSensors/QAccelerometer +%%QT_INCDIR%%/QtSensors/QAccelerometerFilter +%%QT_INCDIR%%/QtSensors/QAccelerometerReading +%%QT_INCDIR%%/QtSensors/QAltimeter +%%QT_INCDIR%%/QtSensors/QAltimeterFilter +%%QT_INCDIR%%/QtSensors/QAltimeterReading +%%QT_INCDIR%%/QtSensors/QAmbientLightFilter +%%QT_INCDIR%%/QtSensors/QAmbientLightReading +%%QT_INCDIR%%/QtSensors/QAmbientLightSensor +%%QT_INCDIR%%/QtSensors/QAmbientTemperatureFilter +%%QT_INCDIR%%/QtSensors/QAmbientTemperatureReading +%%QT_INCDIR%%/QtSensors/QAmbientTemperatureSensor +%%QT_INCDIR%%/QtSensors/QCompass +%%QT_INCDIR%%/QtSensors/QCompassFilter +%%QT_INCDIR%%/QtSensors/QCompassReading +%%QT_INCDIR%%/QtSensors/QDistanceFilter +%%QT_INCDIR%%/QtSensors/QDistanceReading +%%QT_INCDIR%%/QtSensors/QDistanceSensor +%%QT_INCDIR%%/QtSensors/QGyroscope +%%QT_INCDIR%%/QtSensors/QGyroscopeFilter +%%QT_INCDIR%%/QtSensors/QGyroscopeReading +%%QT_INCDIR%%/QtSensors/QHolsterFilter +%%QT_INCDIR%%/QtSensors/QHolsterReading +%%QT_INCDIR%%/QtSensors/QHolsterSensor +%%QT_INCDIR%%/QtSensors/QIRProximityFilter +%%QT_INCDIR%%/QtSensors/QIRProximityReading +%%QT_INCDIR%%/QtSensors/QIRProximitySensor +%%QT_INCDIR%%/QtSensors/QLightFilter +%%QT_INCDIR%%/QtSensors/QLightReading +%%QT_INCDIR%%/QtSensors/QLightSensor +%%QT_INCDIR%%/QtSensors/QMagnetometer +%%QT_INCDIR%%/QtSensors/QMagnetometerFilter +%%QT_INCDIR%%/QtSensors/QMagnetometerReading +%%QT_INCDIR%%/QtSensors/QOrientationFilter +%%QT_INCDIR%%/QtSensors/QOrientationReading +%%QT_INCDIR%%/QtSensors/QOrientationSensor +%%QT_INCDIR%%/QtSensors/QPressureFilter +%%QT_INCDIR%%/QtSensors/QPressureReading +%%QT_INCDIR%%/QtSensors/QPressureSensor +%%QT_INCDIR%%/QtSensors/QProximityFilter +%%QT_INCDIR%%/QtSensors/QProximityReading +%%QT_INCDIR%%/QtSensors/QProximitySensor +%%QT_INCDIR%%/QtSensors/QRotationFilter +%%QT_INCDIR%%/QtSensors/QRotationReading +%%QT_INCDIR%%/QtSensors/QRotationSensor +%%QT_INCDIR%%/QtSensors/QSensor +%%QT_INCDIR%%/QtSensors/QSensorBackend +%%QT_INCDIR%%/QtSensors/QSensorBackendFactory +%%QT_INCDIR%%/QtSensors/QSensorChangesInterface +%%QT_INCDIR%%/QtSensors/QSensorFilter +%%QT_INCDIR%%/QtSensors/QSensorGesture +%%QT_INCDIR%%/QtSensors/QSensorGestureManager +%%QT_INCDIR%%/QtSensors/QSensorGesturePluginInterface +%%QT_INCDIR%%/QtSensors/QSensorGestureRecognizer +%%QT_INCDIR%%/QtSensors/QSensorManager +%%QT_INCDIR%%/QtSensors/QSensorPluginInterface +%%QT_INCDIR%%/QtSensors/QSensorReading +%%QT_INCDIR%%/QtSensors/QTapFilter +%%QT_INCDIR%%/QtSensors/QTapReading +%%QT_INCDIR%%/QtSensors/QTapSensor +%%QT_INCDIR%%/QtSensors/QTiltFilter +%%QT_INCDIR%%/QtSensors/QTiltReading +%%QT_INCDIR%%/QtSensors/QTiltSensor +%%QT_INCDIR%%/QtSensors/QtSensors +%%QT_INCDIR%%/QtSensors/QtSensorsDepends +%%QT_INCDIR%%/QtSensors/QtSensorsVersion +%%QT_INCDIR%%/QtSensors/qaccelerometer.h +%%QT_INCDIR%%/QtSensors/qaltimeter.h +%%QT_INCDIR%%/QtSensors/qambientlightsensor.h +%%QT_INCDIR%%/QtSensors/qambienttemperaturesensor.h +%%QT_INCDIR%%/QtSensors/qcompass.h +%%QT_INCDIR%%/QtSensors/qdistancesensor.h +%%QT_INCDIR%%/QtSensors/qgyroscope.h +%%QT_INCDIR%%/QtSensors/qholstersensor.h +%%QT_INCDIR%%/QtSensors/qirproximitysensor.h +%%QT_INCDIR%%/QtSensors/qlightsensor.h +%%QT_INCDIR%%/QtSensors/qmagnetometer.h +%%QT_INCDIR%%/QtSensors/qorientationsensor.h +%%QT_INCDIR%%/QtSensors/qpressuresensor.h +%%QT_INCDIR%%/QtSensors/qproximitysensor.h +%%QT_INCDIR%%/QtSensors/qrotationsensor.h +%%QT_INCDIR%%/QtSensors/qsensor.h +%%QT_INCDIR%%/QtSensors/qsensorbackend.h +%%QT_INCDIR%%/QtSensors/qsensorgesture.h +%%QT_INCDIR%%/QtSensors/qsensorgesturemanager.h +%%QT_INCDIR%%/QtSensors/qsensorgestureplugininterface.h +%%QT_INCDIR%%/QtSensors/qsensorgesturerecognizer.h +%%QT_INCDIR%%/QtSensors/qsensormanager.h +%%QT_INCDIR%%/QtSensors/qsensorplugin.h +%%QT_INCDIR%%/QtSensors/qsensorsglobal.h +%%QT_INCDIR%%/QtSensors/qtapsensor.h +%%QT_INCDIR%%/QtSensors/qtiltsensor.h +%%QT_INCDIR%%/QtSensors/qtsensorsversion.h +%%QT_LIBDIR%%/cmake/Qt5Sensors/Qt5SensorsConfig.cmake +%%QT_LIBDIR%%/cmake/Qt5Sensors/Qt5SensorsConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt5Sensors/Qt5Sensors_QShakeSensorGesturePlugin.cmake +%%QT_LIBDIR%%/cmake/Qt5Sensors/Qt5Sensors_QtSensorGesturePlugin.cmake +%%QT_LIBDIR%%/cmake/Qt5Sensors/Qt5Sensors_genericSensorPlugin.cmake +%%QT_LIBDIR%%/libQt5Sensors.prl +%%QT_LIBDIR%%/libQt5Sensors.so +%%QT_LIBDIR%%/libQt5Sensors.so.5 +%%QT_LIBDIR%%/libQt5Sensors.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt5Sensors.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt5Sensors.so.%%FULLVER%%.debug +%%QT_MKSPECDIR%%/modules/qt_lib_sensors.pri +%%QT_MKSPECDIR%%/modules/qt_lib_sensors_private.pri +%%QT_PLUGINDIR%%/sensorgestures/libqtsensorgestures_plugin.so +%%DEBUG%%%%QT_PLUGINDIR%%/sensorgestures/libqtsensorgestures_plugin.so.debug +%%QT_PLUGINDIR%%/sensorgestures/libqtsensorgestures_shakeplugin.so +%%DEBUG%%%%QT_PLUGINDIR%%/sensorgestures/libqtsensorgestures_shakeplugin.so.debug +%%QT_PLUGINDIR%%/sensors/libqtsensors_generic.so +%%DEBUG%%%%QT_PLUGINDIR%%/sensors/libqtsensors_generic.so.debug +%%QT_QMLDIR%%/QtSensors/libdeclarative_sensors.so +%%DEBUG%%%%QT_QMLDIR%%/QtSensors/libdeclarative_sensors.so.debug +%%QT_QMLDIR%%/QtSensors/plugins.qmltypes +%%QT_QMLDIR%%/QtSensors/qmldir +libdata/pkgconfig/Qt5Sensors.pc diff --git a/comms/qt5-serialport/pkg-plist b/comms/qt5-serialport/pkg-plist index 012924fd00c1..1b444990cb18 100644 --- a/comms/qt5-serialport/pkg-plist +++ b/comms/qt5-serialport/pkg-plist @@ -1,27 +1,15 @@ -%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qcore_mac_p.h -%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qcore_unix_p.h -%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qlockfile_p.h -%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qringbuffer_p.h %%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_p.h -%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_symbian_p.h -%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_unix_p.h -%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_win_p.h -%%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialport_wince_p.h %%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qserialportinfo_p.h %%QT_INCDIR%%/QtSerialPort/%%FULLVER%%/QtSerialPort/private/qtudev_p.h -%%QT_INCDIR%%/QtSerialPort/QLockFile %%QT_INCDIR%%/QtSerialPort/QSerialPort %%QT_INCDIR%%/QtSerialPort/QSerialPortInfo -%%QT_INCDIR%%/QtSerialPort/QWinEventNotifier %%QT_INCDIR%%/QtSerialPort/QtSerialPort %%QT_INCDIR%%/QtSerialPort/QtSerialPortDepends %%QT_INCDIR%%/QtSerialPort/QtSerialPortVersion -%%QT_INCDIR%%/QtSerialPort/qlockfile.h %%QT_INCDIR%%/QtSerialPort/qserialport.h %%QT_INCDIR%%/QtSerialPort/qserialportglobal.h %%QT_INCDIR%%/QtSerialPort/qserialportinfo.h %%QT_INCDIR%%/QtSerialPort/qtserialportversion.h -%%QT_INCDIR%%/QtSerialPort/qwineventnotifier.h %%QT_LIBDIR%%/cmake/Qt5SerialPort/Qt5SerialPortConfig.cmake %%QT_LIBDIR%%/cmake/Qt5SerialPort/Qt5SerialPortConfigVersion.cmake %%QT_LIBDIR%%/libQt5SerialPort.prl diff --git a/devel/Makefile b/devel/Makefile index 31b17d24d0e2..280c08da24d2 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -4601,6 +4601,7 @@ SUBDIR += qt5-help SUBDIR += qt5-linguist SUBDIR += qt5-linguisttools + SUBDIR += qt5-location SUBDIR += qt5-qdbus SUBDIR += qt5-qdbusviewer SUBDIR += qt5-qdoc diff --git a/devel/qmake5/Makefile b/devel/qmake5/Makefile index ee16873c12bc..6c4c5fec2223 100644 --- a/devel/qmake5/Makefile +++ b/devel/qmake5/Makefile @@ -2,7 +2,6 @@ PORTNAME= qmake DISTVERSION= ${QT5_VERSION} -PORTREVISION= 4 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qmake5/pkg-plist b/devel/qmake5/pkg-plist index 875d4efd7b6e..e1a6aff6c215 100644 --- a/devel/qmake5/pkg-plist +++ b/devel/qmake5/pkg-plist @@ -11,8 +11,6 @@ %%QT_MKSPECDIR%%/android-g++/qplatformdefs.h %%QT_MKSPECDIR%%/blackberry-armle-v7-qcc/qmake.conf %%QT_MKSPECDIR%%/blackberry-armle-v7-qcc/qplatformdefs.h -%%QT_MKSPECDIR%%/blackberry-armv7le-qcc/qmake.conf -%%QT_MKSPECDIR%%/blackberry-armv7le-qcc/qplatformdefs.h %%QT_MKSPECDIR%%/blackberry-x86-qcc/qmake.conf %%QT_MKSPECDIR%%/blackberry-x86-qcc/qplatformdefs.h %%QT_MKSPECDIR%%/common/aix/qplatformdefs.h @@ -39,33 +37,34 @@ %%QT_MKSPECDIR%%/common/mac.conf %%QT_MKSPECDIR%%/common/mac/qplatformdefs.h %%QT_MKSPECDIR%%/common/macx.conf +%%QT_MKSPECDIR%%/common/msvc-desktop.conf %%QT_MKSPECDIR%%/common/nacl/g++-nacl32.conf %%QT_MKSPECDIR%%/common/nacl/g++-nacl64.conf %%QT_MKSPECDIR%%/common/nacl/nacl-base.conf %%QT_MKSPECDIR%%/common/nacl/qplatformdefs.h %%QT_MKSPECDIR%%/common/posix/qplatformdefs.h -%%QT_MKSPECDIR%%/common/qcc-base-qnx-armv7le.conf +%%QT_MKSPECDIR%%/common/qcc-base-qnx-armle-v7.conf %%QT_MKSPECDIR%%/common/qcc-base-qnx-x86.conf %%QT_MKSPECDIR%%/common/qcc-base-qnx.conf %%QT_MKSPECDIR%%/common/qcc-base.conf %%QT_MKSPECDIR%%/common/qnx/qplatformdefs.h +%%QT_MKSPECDIR%%/common/sanitize.conf %%QT_MKSPECDIR%%/common/shell-unix.conf %%QT_MKSPECDIR%%/common/shell-win32.conf %%QT_MKSPECDIR%%/common/unix.conf %%QT_MKSPECDIR%%/common/wince/qmake.conf %%QT_MKSPECDIR%%/common/wince/qplatformdefs.h +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_150x150.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_30x30.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_310x150.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_310x310.png %%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_44x44.png %%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_480x800.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_620x300.png +%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_70x70.png %%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_71x71.png -%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_large.png -%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_medium.png -%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_small.png -%%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_splash.png %%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_store.png -%%QT_MKSPECDIR%%/common/winrt_winphone/assets/tile_iconic_medium.png -%%QT_MKSPECDIR%%/common/winrt_winphone/assets/tile_iconic_small.png -%%QT_MKSPECDIR%%/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in -%%QT_MKSPECDIR%%/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in +%%QT_MKSPECDIR%%/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in %%QT_MKSPECDIR%%/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in %%QT_MKSPECDIR%%/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in %%QT_MKSPECDIR%%/common/winrt_winphone/qmake.conf @@ -74,12 +73,6 @@ %%QT_MKSPECDIR%%/cygwin-g++/qplatformdefs.h %%QT_MKSPECDIR%%/darwin-g++/qmake.conf %%QT_MKSPECDIR%%/darwin-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/devices/blackberry-playbook-armle-v7-qcc/qmake.conf -%%QT_MKSPECDIR%%/devices/blackberry-playbook-armle-v7-qcc/qplatformdefs.h -%%QT_MKSPECDIR%%/devices/blackberry-playbook-armv7le-qcc/qmake.conf -%%QT_MKSPECDIR%%/devices/blackberry-playbook-armv7le-qcc/qplatformdefs.h -%%QT_MKSPECDIR%%/devices/blackberry-playbook-x86-qcc/qmake.conf -%%QT_MKSPECDIR%%/devices/blackberry-playbook-x86-qcc/qplatformdefs.h %%QT_MKSPECDIR%%/devices/common/linux_arm_device_post.conf %%QT_MKSPECDIR%%/devices/common/linux_device_post.conf %%QT_MKSPECDIR%%/devices/common/linux_device_pre.conf @@ -88,7 +81,6 @@ %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/devices/linux-arm-hisilicon-hix5hd2-g++/qeglfshooks_hix5hd2.cpp %%QT_MKSPECDIR%%/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-arm-hisilicon-hix5hd2-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-arm-trident-pnx8473-g++/qmake.conf @@ -97,15 +89,17 @@ %%QT_MKSPECDIR%%/devices/linux-beagleboard-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-imx53qsb-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-imx53qsb-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/devices/linux-imx6-g++/qeglfshooks_imx6.cpp %%QT_MKSPECDIR%%/devices/linux-imx6-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-imx6-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp %%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-mipsel-broadcom-97425-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp +%%QT_MKSPECDIR%%/devices/linux-odroid-xu3-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-odroid-xu3-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-rasp-pi-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-rasp-pi-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-rasp-pi2-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-rasp-pi2-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7108-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf @@ -130,7 +124,7 @@ %%QT_MKSPECDIR%%/features/data/cmake/Qt5BasicConfig.cmake.in %%QT_MKSPECDIR%%/features/data/cmake/Qt5ConfigVersion.cmake.in %%QT_MKSPECDIR%%/features/data/cmake/Qt5PluginTarget.cmake.in -%%QT_MKSPECDIR%%/features/data/headersclean/tst_headersclean.cpp.in +%%QT_MKSPECDIR%%/features/data/dummy.cpp %%QT_MKSPECDIR%%/features/dbusadaptors.prf %%QT_MKSPECDIR%%/features/dbuscommon.pri %%QT_MKSPECDIR%%/features/dbusinterfaces.prf @@ -149,8 +143,8 @@ %%QT_MKSPECDIR%%/features/incredibuild_xge.prf %%QT_MKSPECDIR%%/features/java.prf %%QT_MKSPECDIR%%/features/lex.prf -%%QT_MKSPECDIR%%/features/link_pkgconfig.prf %%QT_MKSPECDIR%%/features/link_ltcg.prf +%%QT_MKSPECDIR%%/features/link_pkgconfig.prf %%QT_MKSPECDIR%%/features/ltcg.prf %%QT_MKSPECDIR%%/features/mac/default_post.prf %%QT_MKSPECDIR%%/features/mac/default_pre.prf @@ -181,7 +175,6 @@ %%QT_MKSPECDIR%%/features/qt_docs_targets.prf %%QT_MKSPECDIR%%/features/qt_example_installs.prf %%QT_MKSPECDIR%%/features/qt_functions.prf -%%QT_MKSPECDIR%%/features/qt_headersclean.prf %%QT_MKSPECDIR%%/features/qt_helper_lib.prf %%QT_MKSPECDIR%%/features/qt_installs.prf %%QT_MKSPECDIR%%/features/qt_module.prf @@ -194,10 +187,12 @@ %%QT_MKSPECDIR%%/features/resolve_config.prf %%QT_MKSPECDIR%%/features/resolve_target.prf %%QT_MKSPECDIR%%/features/resources.prf +%%QT_MKSPECDIR%%/features/sanitizer.prf %%QT_MKSPECDIR%%/features/silent.prf %%QT_MKSPECDIR%%/features/simd.prf %%QT_MKSPECDIR%%/features/spec_post.prf %%QT_MKSPECDIR%%/features/spec_pre.prf +%%QT_MKSPECDIR%%/features/static_runtime.prf %%QT_MKSPECDIR%%/features/testcase.prf %%QT_MKSPECDIR%%/features/testcase_targets.prf %%QT_MKSPECDIR%%/features/testcocoon.prf @@ -236,8 +231,10 @@ %%QT_MKSPECDIR%%/features/win32/windeployqt.prf %%QT_MKSPECDIR%%/features/win32/windows.prf %%QT_MKSPECDIR%%/features/winrt/console.prf +%%QT_MKSPECDIR%%/features/winrt/default_pre.prf %%QT_MKSPECDIR%%/features/winrt/font_deployment.prf %%QT_MKSPECDIR%%/features/winrt/package_manifest.prf +%%QT_MKSPECDIR%%/features/xctest.prf %%QT_MKSPECDIR%%/features/yacc.prf %%QT_MKSPECDIR%%/freebsd-clang/qmake.conf %%QT_MKSPECDIR%%/freebsd-clang/qplatformdefs.h @@ -245,6 +242,8 @@ %%QT_MKSPECDIR%%/freebsd-g++/qplatformdefs.h %%QT_MKSPECDIR%%/freebsd-icc/qmake.conf %%QT_MKSPECDIR%%/freebsd-icc/qplatformdefs.h +%%QT_MKSPECDIR%%/haiku-g++/qmake.conf +%%QT_MKSPECDIR%%/haiku-g++/qplatformdefs.h %%QT_MKSPECDIR%%/hpux-acc-64/qmake.conf %%QT_MKSPECDIR%%/hpux-acc-64/qplatformdefs.h %%QT_MKSPECDIR%%/hpux-acc-o64/qmake.conf @@ -346,6 +345,9 @@ %%QT_MKSPECDIR%%/macx-llvm/Info.plist.lib %%QT_MKSPECDIR%%/macx-llvm/qmake.conf %%QT_MKSPECDIR%%/macx-llvm/qplatformdefs.h +%%QT_MKSPECDIR%%/macx-xcode/QtTest.plist +%%QT_MKSPECDIR%%/macx-xcode/WorkspaceSettings.xcsettings +%%QT_MKSPECDIR%%/macx-xcode/default.xcscheme %%QT_MKSPECDIR%%/macx-xcode/qmake.conf %%QT_MKSPECDIR%%/macx-xcode/qplatformdefs.h %%QT_MKSPECDIR%%/netbsd-g++/qmake.conf @@ -358,8 +360,6 @@ %%QT_MKSPECDIR%%/qmodule.pri %%QT_MKSPECDIR%%/qnx-armle-v7-qcc/qmake.conf %%QT_MKSPECDIR%%/qnx-armle-v7-qcc/qplatformdefs.h -%%QT_MKSPECDIR%%/qnx-armv7le-qcc/qmake.conf -%%QT_MKSPECDIR%%/qnx-armv7le-qcc/qplatformdefs.h %%QT_MKSPECDIR%%/qnx-x86-qcc/qmake.conf %%QT_MKSPECDIR%%/qnx-x86-qcc/qplatformdefs.h %%QT_MKSPECDIR%%/sco-cc/qmake.conf @@ -389,8 +389,6 @@ %%QT_MKSPECDIR%%/unsupported/android-g++/qeglfshooks_surfaceflinger.cpp %%QT_MKSPECDIR%%/unsupported/android-g++/qmake.conf %%QT_MKSPECDIR%%/unsupported/android-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/unsupported/integrity-ghs/qmake.conf -%%QT_MKSPECDIR%%/unsupported/integrity-ghs/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/linux-armcc/qmake.conf %%QT_MKSPECDIR%%/unsupported/linux-armcc/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/linux-host-g++/qmake.conf @@ -411,8 +409,6 @@ %%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-dcc/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-g++/qmake.conf %%QT_MKSPECDIR%%/unsupported/vxworks-simpentium-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/unsupported/win32-msvc2003/qmake.conf -%%QT_MKSPECDIR%%/unsupported/win32-msvc2003/qplatformdefs.h %%QT_MKSPECDIR%%/win32-g++/qmake.conf %%QT_MKSPECDIR%%/win32-g++/qplatformdefs.h %%QT_MKSPECDIR%%/win32-icc/qmake.conf @@ -427,6 +423,8 @@ %%QT_MKSPECDIR%%/win32-msvc2012/qplatformdefs.h %%QT_MKSPECDIR%%/win32-msvc2013/qmake.conf %%QT_MKSPECDIR%%/win32-msvc2013/qplatformdefs.h +%%QT_MKSPECDIR%%/win32-msvc2015/qmake.conf +%%QT_MKSPECDIR%%/win32-msvc2015/qplatformdefs.h %%QT_MKSPECDIR%%/wince60standard-armv4i-msvc2005/qmake.conf %%QT_MKSPECDIR%%/wince60standard-armv4i-msvc2005/qplatformdefs.h %%QT_MKSPECDIR%%/wince60standard-x86-msvc2005/qmake.conf @@ -435,23 +433,21 @@ %%QT_MKSPECDIR%%/wince70embedded-armv4i-msvc2008/qplatformdefs.h %%QT_MKSPECDIR%%/wince70embedded-x86-msvc2008/qmake.conf %%QT_MKSPECDIR%%/wince70embedded-x86-msvc2008/qplatformdefs.h -%%QT_MKSPECDIR%%/winphone-arm-msvc2012/qmake.conf -%%QT_MKSPECDIR%%/winphone-arm-msvc2012/qplatformdefs.h +%%QT_MKSPECDIR%%/wince80colibri-armv7-msvc2012/qmake.conf +%%QT_MKSPECDIR%%/wince80colibri-armv7-msvc2012/qplatformdefs.h %%QT_MKSPECDIR%%/winphone-arm-msvc2013/qmake.conf %%QT_MKSPECDIR%%/winphone-arm-msvc2013/qplatformdefs.h -%%QT_MKSPECDIR%%/winphone-x86-msvc2012/qmake.conf -%%QT_MKSPECDIR%%/winphone-x86-msvc2012/qplatformdefs.h %%QT_MKSPECDIR%%/winphone-x86-msvc2013/qmake.conf %%QT_MKSPECDIR%%/winphone-x86-msvc2013/qplatformdefs.h -%%QT_MKSPECDIR%%/winrt-arm-msvc2012/qmake.conf -%%QT_MKSPECDIR%%/winrt-arm-msvc2012/qplatformdefs.h %%QT_MKSPECDIR%%/winrt-arm-msvc2013/qmake.conf %%QT_MKSPECDIR%%/winrt-arm-msvc2013/qplatformdefs.h -%%QT_MKSPECDIR%%/winrt-x64-msvc2012/qmake.conf -%%QT_MKSPECDIR%%/winrt-x64-msvc2012/qplatformdefs.h +%%QT_MKSPECDIR%%/winrt-arm-msvc2015/qmake.conf +%%QT_MKSPECDIR%%/winrt-arm-msvc2015/qplatformdefs.h %%QT_MKSPECDIR%%/winrt-x64-msvc2013/qmake.conf %%QT_MKSPECDIR%%/winrt-x64-msvc2013/qplatformdefs.h -%%QT_MKSPECDIR%%/winrt-x86-msvc2012/qmake.conf -%%QT_MKSPECDIR%%/winrt-x86-msvc2012/qplatformdefs.h +%%QT_MKSPECDIR%%/winrt-x64-msvc2015/qmake.conf +%%QT_MKSPECDIR%%/winrt-x64-msvc2015/qplatformdefs.h %%QT_MKSPECDIR%%/winrt-x86-msvc2013/qmake.conf %%QT_MKSPECDIR%%/winrt-x86-msvc2013/qplatformdefs.h +%%QT_MKSPECDIR%%/winrt-x86-msvc2015/qmake.conf +%%QT_MKSPECDIR%%/winrt-x86-msvc2015/qplatformdefs.h diff --git a/devel/qt5-assistant/Makefile b/devel/qt5-assistant/Makefile index c4d6c0a749f6..86d597a25201 100644 --- a/devel/qt5-assistant/Makefile +++ b/devel/qt5-assistant/Makefile @@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 documentation browser -USE_QT5= core help network printsupport sql webkit widgets \ +USE_QT5= core gui help network printsupport sql webkit widgets \ buildtools_build sql-sqlite3_run QT_DIST= tools USES= qmake diff --git a/devel/qt5-assistant/files/patch-src__src.pro b/devel/qt5-assistant/files/patch-src__src.pro index db5a512547ec..cb146d87d743 100644 --- a/devel/qt5-assistant/files/patch-src__src.pro +++ b/devel/qt5-assistant/files/patch-src__src.pro @@ -3,7 +3,7 @@ missing dependencies. --- src/src.pro +++ src/src.pro -@@ -1,38 +1,2 @@ +@@ -1,37 +1,2 @@ TEMPLATE = subdirs - -qtHaveModule(widgets) { @@ -14,13 +14,13 @@ missing dependencies. - pixeltool \ - qtestlib \ - designer --# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig - - linguist.depends = designer - } -} - --SUBDIRS += linguist +-SUBDIRS += linguist \ +- qtplugininfo -if(!android|android_app):!ios: SUBDIRS += qtpaths - -mac { @@ -39,7 +39,6 @@ missing dependencies. - -qtNomakeTools( \ - pixeltool \ -- qtconfig \ - macdeployqt \ -) +SUBDIRS = assistant diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile index 7c043640fe88..6724b9a8a497 100644 --- a/devel/qt5-core/Makefile +++ b/devel/qt5-core/Makefile @@ -2,7 +2,6 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 3 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-core/files/patch-git_08be8691 b/devel/qt5-core/files/patch-git_08be8691 new file mode 100644 index 000000000000..e76184024579 --- /dev/null +++ b/devel/qt5-core/files/patch-git_08be8691 @@ -0,0 +1,45 @@ +commit 08be8691f7ba5e522cbc000b1880941128ad5f8c +Author: Dmitry Shachnev <mitya57@gmail.com> +Date: Fri Oct 23 21:21:38 2015 +0300 + + Fix QStorageInfo on BSD4 systems + + - On NetBSD, the defines were not properly defined; + - On all other BSD systems, we use statfs which does not have f_frsize + member, revert to using f_bsize there. + + Task-number: QTBUG-48267 + Change-Id: Ia1ed484ac61a615fcbb5b45affb516b5e86a64b0 + Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> + Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> + Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> + +--- src/corelib/io/qstorageinfo_unix.cpp ++++ src/corelib/io/qstorageinfo_unix.cpp +@@ -68,8 +68,8 @@ + + #if defined(Q_OS_BSD4) + # if defined(Q_OS_NETBSD) +- define QT_STATFSBUF struct statvfs +- define QT_STATFS ::statvfs ++# define QT_STATFSBUF struct statvfs ++# define QT_STATFS ::statvfs + # else + # define QT_STATFSBUF struct statfs + # define QT_STATFS ::statfs +@@ -506,9 +506,15 @@ void QStorageInfoPrivate::retrieveVolumeInfo() + valid = true; + ready = true; + ++#if defined(Q_OS_BSD4) && !defined(Q_OS_NETBSD) ++ bytesTotal = statfs_buf.f_blocks * statfs_buf.f_bsize; ++ bytesFree = statfs_buf.f_bfree * statfs_buf.f_bsize; ++ bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_bsize; ++#else + bytesTotal = statfs_buf.f_blocks * statfs_buf.f_frsize; + bytesFree = statfs_buf.f_bfree * statfs_buf.f_frsize; + bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_frsize; ++#endif + #if defined(Q_OS_ANDROID) || defined (Q_OS_BSD4) + #if defined(_STATFS_F_FLAGS) + readOnly = (statfs_buf.f_flags & ST_RDONLY) != 0; diff --git a/devel/qt5-core/files/patch-git_090bf50 b/devel/qt5-core/files/patch-git_090bf50 new file mode 100644 index 000000000000..ec11c942c6dc --- /dev/null +++ b/devel/qt5-core/files/patch-git_090bf50 @@ -0,0 +1,25 @@ +commit 090bf50771ec1e5d089b0ae0488059a5643883b2 +Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Sun Dec 27 01:24:34 2015 +0100 + + forkfd: Only enable pipe2 on FreeBSD >= 10.0. + + The system call is not present on earlier releases, and since the 9.x + series will be supported until the end of 2016, add a check for the + __FreeBSD_version macro and only enable pipe2 support if the value is + high enough. + + Change-Id: I5633531cec7e95d42ff5f4b14afe772ae8d7d66d + Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> + +--- src/3rdparty/forkfd/forkfd.c ++++ src/3rdparty/forkfd/forkfd.c +@@ -62,7 +62,7 @@ + # undef HAVE_WAITID + #endif + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) && defined(__FreeBSD_version) && __FreeBSD_version >= 1000032 + # define HAVE_PIPE2 1 + #endif + diff --git a/devel/qt5-core/files/patch-git_6552469 b/devel/qt5-core/files/patch-git_6552469 new file mode 100644 index 000000000000..f68df09f7bdf --- /dev/null +++ b/devel/qt5-core/files/patch-git_6552469 @@ -0,0 +1,43 @@ +commit 655246969eaa916fbc098a7315dc24830f5b8b5d +Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Mon Dec 28 11:43:36 2015 +0100 + + forkfd: Also define BSD visibility macros in forkfd_qt.cpp. + + This is a follow-up to c8c4ad0 ("forkfd: Define __BSD_VISIBLE and + _NETBSD_SOURCE"). + + Defining those macros in forkfd.c is not enough: forkfd_qt.cpp also sets + _POSIX_C_SOURCE, and sys/cdefs.h can be included implicitly via Qt's + headers (<algorithm> ends up pulling unistd.h that leads to sys/cdefs.h + and sys/types.h with both libstdc++ and older libc++ versions). In this + case, __BSD_VISIBLE/_NETBSD_SOURCE are not defined, _POSIX_C_SOURCE is, + several type definitions are omitted and by the time we include + sys/time.h in forkfd.c the build fails. On FreeBSD < 11, the error looks + like this: + + In file included from io/../../3rdparty/forkfd/forkfd.c:36, + from io/forkfd_qt.cpp:80: + /usr/include/sys/time.h:94: error: 'u_int' has not been declared + + Change-Id: I01fa2f5861027d99936d3026faeee9f0db3ecabd + Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> + +--- src/corelib/io/forkfd_qt.cpp ++++ src/corelib/io/forkfd_qt.cpp +@@ -39,6 +39,15 @@ + # define _XOPEN_SOURCE 700 + #endif + ++// Define BSD visibility macros. These are also defined in forkfd.c, but the ++// headers using them may be included before forkfd.c itself. ++#ifndef _NETBSD_SOURCE ++# define _NETBSD_SOURCE 1 ++#endif ++#ifndef __BSD_VISIBLE ++# define __BSD_VISIBLE 1 ++#endif ++ + #include <QtCore/qatomic.h> + #include "qprocess_p.h" + diff --git a/devel/qt5-core/files/patch-git_c8c4ad0 b/devel/qt5-core/files/patch-git_c8c4ad0 new file mode 100644 index 000000000000..134b19423b88 --- /dev/null +++ b/devel/qt5-core/files/patch-git_c8c4ad0 @@ -0,0 +1,31 @@ +commit c8c4ad0c62cacec749b6c42e0a58339446093bba +Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Sat Dec 26 02:30:58 2015 +0100 + + forkfd: Define __BSD_VISIBLE and _NETBSD_SOURCE. + + pipe2's availability on BSD operating systems depends on the + __BSD_VISIBLE macro on FreeBSD and OpenBSD and _NETBSD_SOURCE on + NetBSD (DragonFly BSD appears to define it unconditionally). + + Those two macros are generally set by default, except when + _POSIX_C_SOURCE is set. Since we consciously set _POSIX_C_SOURCE but + need pipe2, explicitly define the visibility macros. + + This fixes the -no-pch build on FreeBSD at least. + + Change-Id: Icc77f6b5d1f9a5bf7bd8048cabbb01f8f89397cc + Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +--- src/3rdparty/forkfd/forkfd.c ++++ src/3rdparty/forkfd/forkfd.c +@@ -25,8 +25,10 @@ + + #ifndef _GNU_SOURCE + # define _GNU_SOURCE ++# define _NETBSD_SOURCE 1 + # define _POSIX_C_SOURCE 200809L + # define _XOPEN_SOURCE 700 ++# define __BSD_VISIBLE 1 + #endif + #include "forkfd.h" + diff --git a/devel/qt5-core/pkg-plist b/devel/qt5-core/pkg-plist index ca1df08535ce..e02466214e85 100644 --- a/devel/qt5-core/pkg-plist +++ b/devel/qt5-core/pkg-plist @@ -20,6 +20,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdataurl_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatetime_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatetimeparser_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdebug_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdir_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qelfparser_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeucjpcodec_p.h @@ -120,6 +121,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstate_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstatemachine_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstorageinfo_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstringalgorithms_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qstringiterator_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemerror_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemlibrary_p.h diff --git a/devel/qt5-designer/Makefile b/devel/qt5-designer/Makefile index 23808d7940bd..5800a0945a09 100644 --- a/devel/qt5-designer/Makefile +++ b/devel/qt5-designer/Makefile @@ -8,8 +8,8 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 graphical user interface designer -USE_QT5= assistant_run core gui network printsupport webkit \ - widgets xml buildtools_build +USE_QT5= assistant_run core gui network printsupport quick uiplugin \ + webkit widgets xml buildtools_build QT_DIST= tools USES= qmake USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} @@ -23,7 +23,9 @@ BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${WRKSRC}/src/${PORTNAME} post-patch: - @${REINPLACE_CMD} -e '/uitools/ d' \ +# uiplugin is built in x11-toolkits/qt5-uiplugin. +# uitools is built in devel/qt5-uitools. + ${REINPLACE_CMD} -e '/uiplugin/ d' -e '/uitools/ d' \ ${WRKSRC}/src/${PORTNAME}/src/src.pro post-install: diff --git a/devel/qt5-designer/files/patch-src__src.pro b/devel/qt5-designer/files/patch-src__src.pro index 9c21c99b3e22..42398d73a6f4 100644 --- a/devel/qt5-designer/files/patch-src__src.pro +++ b/devel/qt5-designer/files/patch-src__src.pro @@ -3,7 +3,7 @@ missing dependencies. --- src/src.pro +++ src/src.pro -@@ -1,38 +1,2 @@ +@@ -1,37 +1,2 @@ TEMPLATE = subdirs - -qtHaveModule(widgets) { @@ -14,13 +14,13 @@ missing dependencies. - pixeltool \ - qtestlib \ - designer --# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig - - linguist.depends = designer - } -} - --SUBDIRS += linguist +-SUBDIRS += linguist \ +- qtplugininfo -if(!android|android_app):!ios: SUBDIRS += qtpaths - -mac { @@ -39,7 +39,6 @@ missing dependencies. - -qtNomakeTools( \ - pixeltool \ -- qtconfig \ - macdeployqt \ -) +SUBDIRS = designer diff --git a/devel/qt5-designer/pkg-plist b/devel/qt5-designer/pkg-plist index e9d7eb553f0e..19e16ee8940b 100644 --- a/devel/qt5-designer/pkg-plist +++ b/devel/qt5-designer/pkg-plist @@ -194,10 +194,10 @@ %%QT_MKSPECDIR%%/modules/qt_lib_designer.pri %%QT_MKSPECDIR%%/modules/qt_lib_designer_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_designercomponents_private.pri -%%QT_PLUGINDIR%%/designer/libqwebview.so -%%DEBUG%%%%QT_PLUGINDIR%%/designer/libqwebview.so.debug %%QT_PLUGINDIR%%/designer/libqquickwidget.so %%DEBUG%%%%QT_PLUGINDIR%%/designer/libqquickwidget.so.debug +%%QT_PLUGINDIR%%/designer/libqwebview.so +%%DEBUG%%%%QT_PLUGINDIR%%/designer/libqwebview.so.debug libdata/pkgconfig/Qt5Designer.pc libdata/pkgconfig/Qt5DesignerComponents.pc share/pixmaps/designer-qt5.png diff --git a/devel/qt5-help/files/patch-src__src.pro b/devel/qt5-help/files/patch-src__src.pro index db5a512547ec..cb146d87d743 100644 --- a/devel/qt5-help/files/patch-src__src.pro +++ b/devel/qt5-help/files/patch-src__src.pro @@ -3,7 +3,7 @@ missing dependencies. --- src/src.pro +++ src/src.pro -@@ -1,38 +1,2 @@ +@@ -1,37 +1,2 @@ TEMPLATE = subdirs - -qtHaveModule(widgets) { @@ -14,13 +14,13 @@ missing dependencies. - pixeltool \ - qtestlib \ - designer --# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig - - linguist.depends = designer - } -} - --SUBDIRS += linguist +-SUBDIRS += linguist \ +- qtplugininfo -if(!android|android_app):!ios: SUBDIRS += qtpaths - -mac { @@ -39,7 +39,6 @@ missing dependencies. - -qtNomakeTools( \ - pixeltool \ -- qtconfig \ - macdeployqt \ -) +SUBDIRS = assistant diff --git a/devel/qt5-linguist/Makefile b/devel/qt5-linguist/Makefile index 0370cae18396..ce8b21165e00 100644 --- a/devel/qt5-linguist/Makefile +++ b/devel/qt5-linguist/Makefile @@ -8,8 +8,9 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 translation tool -USE_QT5= assistant_run core linguisttools_run printsupport \ - uitools_build widgets xml buildtools_build +USE_QT5= core gui printsupport widgets xml \ + assistant_run linguisttools_run \ + buildtools_build designer_build uitools_build QT_DIST= tools USES= qmake diff --git a/devel/qt5-linguist/files/patch-src__src.pro b/devel/qt5-linguist/files/patch-src__src.pro index 6d56b5176d96..8739f1fd7d96 100644 --- a/devel/qt5-linguist/files/patch-src__src.pro +++ b/devel/qt5-linguist/files/patch-src__src.pro @@ -3,7 +3,7 @@ missing dependencies. --- src/src.pro +++ src/src.pro -@@ -1,38 +1,2 @@ +@@ -1,37 +1,2 @@ TEMPLATE = subdirs - -qtHaveModule(widgets) { @@ -14,13 +14,13 @@ missing dependencies. - pixeltool \ - qtestlib \ - designer --# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig - - linguist.depends = designer - } -} - --SUBDIRS += linguist +-SUBDIRS += linguist \ +- qtplugininfo -if(!android|android_app):!ios: SUBDIRS += qtpaths - -mac { @@ -39,7 +39,6 @@ missing dependencies. - -qtNomakeTools( \ - pixeltool \ -- qtconfig \ - macdeployqt \ -) +SUBDIRS = linguist diff --git a/devel/qt5-linguisttools/Makefile b/devel/qt5-linguisttools/Makefile index 9a4d7248e80c..0cc71b40b156 100644 --- a/devel/qt5-linguisttools/Makefile +++ b/devel/qt5-linguisttools/Makefile @@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt localization tools -USE_QT5= core xml buildtools_build qml_build +USE_QT5= core xml buildtools_build QT_DIST= tools USES= qmake diff --git a/devel/qt5-linguisttools/files/patch-src__src.pro b/devel/qt5-linguisttools/files/patch-src__src.pro index 6d56b5176d96..8739f1fd7d96 100644 --- a/devel/qt5-linguisttools/files/patch-src__src.pro +++ b/devel/qt5-linguisttools/files/patch-src__src.pro @@ -3,7 +3,7 @@ missing dependencies. --- src/src.pro +++ src/src.pro -@@ -1,38 +1,2 @@ +@@ -1,37 +1,2 @@ TEMPLATE = subdirs - -qtHaveModule(widgets) { @@ -14,13 +14,13 @@ missing dependencies. - pixeltool \ - qtestlib \ - designer --# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig - - linguist.depends = designer - } -} - --SUBDIRS += linguist +-SUBDIRS += linguist \ +- qtplugininfo -if(!android|android_app):!ios: SUBDIRS += qtpaths - -mac { @@ -39,7 +39,6 @@ missing dependencies. - -qtNomakeTools( \ - pixeltool \ -- qtconfig \ - macdeployqt \ -) +SUBDIRS = linguist diff --git a/devel/qt5-location/Makefile b/devel/qt5-location/Makefile new file mode 100644 index 000000000000..e637741e871a --- /dev/null +++ b/devel/qt5-location/Makefile @@ -0,0 +1,17 @@ +# $FreeBSD$ + +PORTNAME= location +DISTVERSION= ${QT5_VERSION} +CATEGORIES= devel +PKGNAMEPREFIX= qt5- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt location module + +USE_QT5= core dbus gui network qml quick buildtools_build +QT_DIST= ${PORTNAME} +USES= qmake + +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} + +.include <bsd.port.mk> diff --git a/devel/qt5-location/files/patch-qtlocation.pro b/devel/qt5-location/files/patch-qtlocation.pro new file mode 100644 index 000000000000..71fd09e7f60b --- /dev/null +++ b/devel/qt5-location/files/patch-qtlocation.pro @@ -0,0 +1,12 @@ +Do not look for Geoclue, it brings some additional glib-related dependencies +that are not worth it, given that in Qt 5.6 it is no longer a dependency. + +--- qtlocation.pro.orig 2016-01-20 16:52:51 UTC ++++ qtlocation.pro +@@ -1,6 +1,4 @@ + load(configure) +-qtCompileTest(geoclue) +-qtCompileTest(geoclue-satellite) + qtCompileTest(gypsy) + + load(qt_parts) diff --git a/devel/qt5-location/pkg-plist b/devel/qt5-location/pkg-plist new file mode 100644 index 000000000000..1756d5ff2106 --- /dev/null +++ b/devel/qt5-location/pkg-plist @@ -0,0 +1,231 @@ +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qcache3q_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocameracapabilities_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocameradata_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocameratiles_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocodereply_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocodingmanager_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeocodingmanagerengine_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomaneuver_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomap_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomap_p_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomapcontroller_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomappingmanager_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomappingmanager_p_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomappingmanagerengine_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomappingmanagerengine_p_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomapscene_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomaptype_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomaptype_p_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroute_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutereply_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeorouterequest_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutesegment_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutingmanager_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutingmanagerengine_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoserviceprovider_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotilecache_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmap_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmap_p_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmappingmanagerengine_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmappingmanagerengine_p_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmapreply_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmapreply_p_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotilefetcher_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotilefetcher_p_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotilerequestmanager_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotilespec_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotilespec_p_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplace_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplaceattribute_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplacecategory_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplacecontactdetail_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplacecontent_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplacecontentrequest_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplaceeditorial_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplaceicon_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplaceimage_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplacemanagerengine_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplaceproposedsearchresult_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplaceratings_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplacereply_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplaceresult_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplacereview_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplacesearchresult_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplacesupplier_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qplaceuser_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/unsupportedreplies_p.h +%%QT_INCDIR%%/QtLocation/QGeoCodeReply +%%QT_INCDIR%%/QtLocation/QGeoCodingManager +%%QT_INCDIR%%/QtLocation/QGeoCodingManagerEngine +%%QT_INCDIR%%/QtLocation/QGeoManeuver +%%QT_INCDIR%%/QtLocation/QGeoRoute +%%QT_INCDIR%%/QtLocation/QGeoRouteReply +%%QT_INCDIR%%/QtLocation/QGeoRouteRequest +%%QT_INCDIR%%/QtLocation/QGeoRouteSegment +%%QT_INCDIR%%/QtLocation/QGeoRoutingManager +%%QT_INCDIR%%/QtLocation/QGeoRoutingManagerEngine +%%QT_INCDIR%%/QtLocation/QGeoServiceProvider +%%QT_INCDIR%%/QtLocation/QGeoServiceProviderFactory +%%QT_INCDIR%%/QtLocation/QLocation +%%QT_INCDIR%%/QtLocation/QPlace +%%QT_INCDIR%%/QtLocation/QPlaceAttribute +%%QT_INCDIR%%/QtLocation/QPlaceCategory +%%QT_INCDIR%%/QtLocation/QPlaceContactDetail +%%QT_INCDIR%%/QtLocation/QPlaceContent +%%QT_INCDIR%%/QtLocation/QPlaceContentReply +%%QT_INCDIR%%/QtLocation/QPlaceContentRequest +%%QT_INCDIR%%/QtLocation/QPlaceDetailsReply +%%QT_INCDIR%%/QtLocation/QPlaceEditorial +%%QT_INCDIR%%/QtLocation/QPlaceIcon +%%QT_INCDIR%%/QtLocation/QPlaceIdReply +%%QT_INCDIR%%/QtLocation/QPlaceImage +%%QT_INCDIR%%/QtLocation/QPlaceManager +%%QT_INCDIR%%/QtLocation/QPlaceManagerEngine +%%QT_INCDIR%%/QtLocation/QPlaceMatchReply +%%QT_INCDIR%%/QtLocation/QPlaceMatchRequest +%%QT_INCDIR%%/QtLocation/QPlaceProposedSearchResult +%%QT_INCDIR%%/QtLocation/QPlaceRatings +%%QT_INCDIR%%/QtLocation/QPlaceReply +%%QT_INCDIR%%/QtLocation/QPlaceResult +%%QT_INCDIR%%/QtLocation/QPlaceReview +%%QT_INCDIR%%/QtLocation/QPlaceSearchReply +%%QT_INCDIR%%/QtLocation/QPlaceSearchRequest +%%QT_INCDIR%%/QtLocation/QPlaceSearchResult +%%QT_INCDIR%%/QtLocation/QPlaceSearchSuggestionReply +%%QT_INCDIR%%/QtLocation/QPlaceSupplier +%%QT_INCDIR%%/QtLocation/QPlaceUser +%%QT_INCDIR%%/QtLocation/QtLocation +%%QT_INCDIR%%/QtLocation/QtLocationDepends +%%QT_INCDIR%%/QtLocation/QtLocationVersion +%%QT_INCDIR%%/QtLocation/placemacro.h +%%QT_INCDIR%%/QtLocation/qgeocodereply.h +%%QT_INCDIR%%/QtLocation/qgeocodingmanager.h +%%QT_INCDIR%%/QtLocation/qgeocodingmanagerengine.h +%%QT_INCDIR%%/QtLocation/qgeomaneuver.h +%%QT_INCDIR%%/QtLocation/qgeoroute.h +%%QT_INCDIR%%/QtLocation/qgeoroutereply.h +%%QT_INCDIR%%/QtLocation/qgeorouterequest.h +%%QT_INCDIR%%/QtLocation/qgeoroutesegment.h +%%QT_INCDIR%%/QtLocation/qgeoroutingmanager.h +%%QT_INCDIR%%/QtLocation/qgeoroutingmanagerengine.h +%%QT_INCDIR%%/QtLocation/qgeoserviceprovider.h +%%QT_INCDIR%%/QtLocation/qgeoserviceproviderfactory.h +%%QT_INCDIR%%/QtLocation/qlocation.h +%%QT_INCDIR%%/QtLocation/qlocationglobal.h +%%QT_INCDIR%%/QtLocation/qplace.h +%%QT_INCDIR%%/QtLocation/qplaceattribute.h +%%QT_INCDIR%%/QtLocation/qplacecategory.h +%%QT_INCDIR%%/QtLocation/qplacecontactdetail.h +%%QT_INCDIR%%/QtLocation/qplacecontent.h +%%QT_INCDIR%%/QtLocation/qplacecontentreply.h +%%QT_INCDIR%%/QtLocation/qplacecontentrequest.h +%%QT_INCDIR%%/QtLocation/qplacedetailsreply.h +%%QT_INCDIR%%/QtLocation/qplaceeditorial.h +%%QT_INCDIR%%/QtLocation/qplaceicon.h +%%QT_INCDIR%%/QtLocation/qplaceidreply.h +%%QT_INCDIR%%/QtLocation/qplaceimage.h +%%QT_INCDIR%%/QtLocation/qplacemanager.h +%%QT_INCDIR%%/QtLocation/qplacemanagerengine.h +%%QT_INCDIR%%/QtLocation/qplacematchreply.h +%%QT_INCDIR%%/QtLocation/qplacematchrequest.h +%%QT_INCDIR%%/QtLocation/qplaceproposedsearchresult.h +%%QT_INCDIR%%/QtLocation/qplaceratings.h +%%QT_INCDIR%%/QtLocation/qplacereply.h +%%QT_INCDIR%%/QtLocation/qplaceresult.h +%%QT_INCDIR%%/QtLocation/qplacereview.h +%%QT_INCDIR%%/QtLocation/qplacesearchreply.h +%%QT_INCDIR%%/QtLocation/qplacesearchrequest.h +%%QT_INCDIR%%/QtLocation/qplacesearchresult.h +%%QT_INCDIR%%/QtLocation/qplacesearchsuggestionreply.h +%%QT_INCDIR%%/QtLocation/qplacesupplier.h +%%QT_INCDIR%%/QtLocation/qplaceuser.h +%%QT_INCDIR%%/QtLocation/qtlocationversion.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qdeclarativegeoaddress_p.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qdeclarativegeolocation_p.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qdoublevector2d_p.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qdoublevector3d_p.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeoaddress_p.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeocircle_p.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeocoordinate_p.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeolocation_p.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfosource_p.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeoprojection_p.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeorectangle_p.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeoshape_p.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationutils_p.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qnmeapositioninfosource_p.h +%%QT_INCDIR%%/QtPositioning/QGeoAddress +%%QT_INCDIR%%/QtPositioning/QGeoAreaMonitorInfo +%%QT_INCDIR%%/QtPositioning/QGeoAreaMonitorSource +%%QT_INCDIR%%/QtPositioning/QGeoCircle +%%QT_INCDIR%%/QtPositioning/QGeoCoordinate +%%QT_INCDIR%%/QtPositioning/QGeoLocation +%%QT_INCDIR%%/QtPositioning/QGeoPositionInfo +%%QT_INCDIR%%/QtPositioning/QGeoPositionInfoSource +%%QT_INCDIR%%/QtPositioning/QGeoPositionInfoSourceFactory +%%QT_INCDIR%%/QtPositioning/QGeoRectangle +%%QT_INCDIR%%/QtPositioning/QGeoSatelliteInfo +%%QT_INCDIR%%/QtPositioning/QGeoSatelliteInfoSource +%%QT_INCDIR%%/QtPositioning/QGeoShape +%%QT_INCDIR%%/QtPositioning/QNmeaPositionInfoSource +%%QT_INCDIR%%/QtPositioning/QtPositioning +%%QT_INCDIR%%/QtPositioning/QtPositioningDepends +%%QT_INCDIR%%/QtPositioning/QtPositioningVersion +%%QT_INCDIR%%/QtPositioning/qgeoaddress.h +%%QT_INCDIR%%/QtPositioning/qgeoareamonitorinfo.h +%%QT_INCDIR%%/QtPositioning/qgeoareamonitorsource.h +%%QT_INCDIR%%/QtPositioning/qgeocircle.h +%%QT_INCDIR%%/QtPositioning/qgeocoordinate.h +%%QT_INCDIR%%/QtPositioning/qgeolocation.h +%%QT_INCDIR%%/QtPositioning/qgeopositioninfo.h +%%QT_INCDIR%%/QtPositioning/qgeopositioninfosource.h +%%QT_INCDIR%%/QtPositioning/qgeopositioninfosourcefactory.h +%%QT_INCDIR%%/QtPositioning/qgeorectangle.h +%%QT_INCDIR%%/QtPositioning/qgeosatelliteinfo.h +%%QT_INCDIR%%/QtPositioning/qgeosatelliteinfosource.h +%%QT_INCDIR%%/QtPositioning/qgeoshape.h +%%QT_INCDIR%%/QtPositioning/qnmeapositioninfosource.h +%%QT_INCDIR%%/QtPositioning/qpositioningglobal.h +%%QT_INCDIR%%/QtPositioning/qtpositioningversion.h +%%QT_LIBDIR%%/cmake/Qt5Location/Qt5LocationConfig.cmake +%%QT_LIBDIR%%/cmake/Qt5Location/Qt5LocationConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryMapbox.cmake +%%QT_LIBDIR%%/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryNokia.cmake +%%QT_LIBDIR%%/cmake/Qt5Location/Qt5Location_QGeoServiceProviderFactoryOsm.cmake +%%QT_LIBDIR%%/cmake/Qt5Positioning/Qt5PositioningConfig.cmake +%%QT_LIBDIR%%/cmake/Qt5Positioning/Qt5PositioningConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt5Positioning/Qt5Positioning_QGeoPositionInfoSourceFactoryPoll.cmake +%%QT_LIBDIR%%/libQt5Location.prl +%%QT_LIBDIR%%/libQt5Location.so +%%QT_LIBDIR%%/libQt5Location.so.5 +%%QT_LIBDIR%%/libQt5Location.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt5Location.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt5Location.so.%%FULLVER%%.debug +%%QT_LIBDIR%%/libQt5Positioning.prl +%%QT_LIBDIR%%/libQt5Positioning.so +%%QT_LIBDIR%%/libQt5Positioning.so.5 +%%QT_LIBDIR%%/libQt5Positioning.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt5Positioning.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt5Positioning.so.%%FULLVER%%.debug +%%QT_MKSPECDIR%%/modules/qt_lib_location.pri +%%QT_MKSPECDIR%%/modules/qt_lib_location_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_positioning.pri +%%QT_MKSPECDIR%%/modules/qt_lib_positioning_private.pri +%%QT_PLUGINDIR%%/geoservices/libqtgeoservices_mapbox.so +%%DEBUG%%%%QT_PLUGINDIR%%/geoservices/libqtgeoservices_mapbox.so.debug +%%QT_PLUGINDIR%%/geoservices/libqtgeoservices_nokia.so +%%DEBUG%%%%QT_PLUGINDIR%%/geoservices/libqtgeoservices_nokia.so.debug +%%QT_PLUGINDIR%%/geoservices/libqtgeoservices_osm.so +%%DEBUG%%%%QT_PLUGINDIR%%/geoservices/libqtgeoservices_osm.so.debug +%%QT_PLUGINDIR%%/position/libqtposition_positionpoll.so +%%DEBUG%%%%QT_PLUGINDIR%%/position/libqtposition_positionpoll.so.debug +%%QT_QMLDIR%%/QtLocation/libdeclarative_location.so +%%DEBUG%%%%QT_QMLDIR%%/QtLocation/libdeclarative_location.so.debug +%%QT_QMLDIR%%/QtLocation/plugins.qmltypes +%%QT_QMLDIR%%/QtLocation/qmldir +%%QT_QMLDIR%%/QtPositioning/libdeclarative_positioning.so +%%DEBUG%%%%QT_QMLDIR%%/QtPositioning/libdeclarative_positioning.so.debug +%%QT_QMLDIR%%/QtPositioning/plugins.qmltypes +%%QT_QMLDIR%%/QtPositioning/qmldir +libdata/pkgconfig/Qt5Location.pc +libdata/pkgconfig/Qt5Positioning.pc diff --git a/devel/qt5-qdbusviewer/Makefile b/devel/qt5-qdbusviewer/Makefile index 2c4bf4237042..3e4d0e7cb036 100644 --- a/devel/qt5-qdbusviewer/Makefile +++ b/devel/qt5-qdbusviewer/Makefile @@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 graphical interface to D-Bus -USE_QT5= core dbus widgets xml buildtools_build +USE_QT5= core dbus gui widgets xml buildtools_build QT_DIST= tools USES= qmake diff --git a/devel/qt5-qdbusviewer/files/patch-src__src.pro b/devel/qt5-qdbusviewer/files/patch-src__src.pro index 806df233f94d..94111058c4af 100644 --- a/devel/qt5-qdbusviewer/files/patch-src__src.pro +++ b/devel/qt5-qdbusviewer/files/patch-src__src.pro @@ -3,9 +3,9 @@ missing dependencies. --- src/src.pro +++ src/src.pro -@@ -1,38 +1,3 @@ +@@ -1,37 +1,2 @@ TEMPLATE = subdirs - +- -qtHaveModule(widgets) { - no-png { - message("Some graphics-related tools are unavailable without PNG support") @@ -14,13 +14,13 @@ missing dependencies. - pixeltool \ - qtestlib \ - designer --# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig - - linguist.depends = designer - } -} - --SUBDIRS += linguist +-SUBDIRS += linguist \ +- qtplugininfo -if(!android|android_app):!ios: SUBDIRS += qtpaths - -mac { @@ -31,7 +31,7 @@ missing dependencies. - SUBDIRS += androiddeployqt -} - - qtHaveModule(dbus): SUBDIRS += qdbus +-qtHaveModule(dbus): SUBDIRS += qdbus - -win32|winrt:SUBDIRS += windeployqt -winrt:SUBDIRS += winrtrunner @@ -39,6 +39,6 @@ missing dependencies. - -qtNomakeTools( \ - pixeltool \ -- qtconfig \ - macdeployqt \ -) ++SUBDIRS += qdbus diff --git a/devel/qt5-testlib/pkg-plist b/devel/qt5-testlib/pkg-plist index 96b8909365f7..bd9027f6f1f5 100644 --- a/devel/qt5-testlib/pkg-plist +++ b/devel/qt5-testlib/pkg-plist @@ -20,6 +20,7 @@ %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestresult_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesttable_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestxunitstreamer_p.h +%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxctestlogger_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxmltestlogger_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxunittestlogger_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/valgrind_p.h diff --git a/devel/qt5-uitools/Makefile b/devel/qt5-uitools/Makefile index efb0b8674156..623b02d98ad2 100644 --- a/devel/qt5-uitools/Makefile +++ b/devel/qt5-uitools/Makefile @@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt Designer UI forms support module -USE_QT5= core widgets buildtools_build +USE_QT5= core gui uiplugin widgets buildtools_build QT_DIST= tools USES= qmake USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt5-uitools/files/patch-src__designer__src__src.pro b/devel/qt5-uitools/files/patch-src__designer__src__src.pro index 0e5f5694b57e..986de795bb49 100644 --- a/devel/qt5-uitools/files/patch-src__designer__src__src.pro +++ b/devel/qt5-uitools/files/patch-src__designer__src__src.pro @@ -3,10 +3,10 @@ missing dependencies. --- src/designer/src/src.pro +++ src/designer/src/src.pro -@@ -1,20 +1,4 @@ - TEMPLATE = subdirs +@@ -2,22 +2,4 @@ TEMPLATE = subdirs SUBDIRS = \ + uiplugin \ - uitools \ - lib \ - components \ @@ -14,6 +14,8 @@ missing dependencies. - -contains(QT_CONFIG, shared): SUBDIRS += plugins - +-uitools.depends = uiplugin +-lib.depends = uiplugin -components.depends = lib -designer.depends = components -plugins.depends = lib diff --git a/devel/qt5-uitools/files/patch-src__src.pro b/devel/qt5-uitools/files/patch-src__src.pro index 9c21c99b3e22..42398d73a6f4 100644 --- a/devel/qt5-uitools/files/patch-src__src.pro +++ b/devel/qt5-uitools/files/patch-src__src.pro @@ -3,7 +3,7 @@ missing dependencies. --- src/src.pro +++ src/src.pro -@@ -1,38 +1,2 @@ +@@ -1,37 +1,2 @@ TEMPLATE = subdirs - -qtHaveModule(widgets) { @@ -14,13 +14,13 @@ missing dependencies. - pixeltool \ - qtestlib \ - designer --# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig - - linguist.depends = designer - } -} - --SUBDIRS += linguist +-SUBDIRS += linguist \ +- qtplugininfo -if(!android|android_app):!ios: SUBDIRS += qtpaths - -mac { @@ -39,7 +39,6 @@ missing dependencies. - -qtNomakeTools( \ - pixeltool \ -- qtconfig \ - macdeployqt \ -) +SUBDIRS = designer diff --git a/devel/qt5/Makefile b/devel/qt5/Makefile index 8517931a6924..380858bf84c0 100644 --- a/devel/qt5/Makefile +++ b/devel/qt5/Makefile @@ -2,33 +2,12 @@ PORTNAME= qt5 DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= kde@FreeBSD.org COMMENT= Cross-platform application and UI framework (metaport) -USE_QT5= clucene concurrent core dbus declarative designer \ - graphicaleffects gui help imageformats multimedia \ - network opengl paths printsupport qml quick quickcontrols \ - script scripttools serialport sql svg testlib webchannel \ - webkit websockets widgets x11extras xml xmlpatterns -USE_QT5:= ${USE_QT5:S/$/_run/} +USE_QT5= ${_USE_QT_ALL:Nphonon4:S/$/_run/} # phonon4 is not part of Qt itself. USES= metaport -OPTIONS_DEFINE= SQL_PLUGINS TOOLS -OPTIONS_DEFAULT=${OPTIONS_DEFINE} - -SQL_PLUGINS_DESC= Install database plugins for QtSql -SQL_PLUGINS_USE=sql-ibase sql-mysql sql-odbc sql-pgsql sql-sqlite2 \ - sql-sqlite3 - -TOOLS_DESC= Install Qt tools (qmake, moc, etc.) -TOOLS_USE= assistant buildtools linguist linguisttools \ - pixeltool qdbus qdbusviewer qdoc qev qmake - -.for opt in ${OPTIONS_DEFINE} -${opt}_USE:= ${${opt}_USE:S/^/QT5=/:S/$/_run/} -.endfor - .include <bsd.port.mk> diff --git a/devel/qt5/distinfo b/devel/qt5/distinfo index b2a5e2b499f2..30eb243e820d 100644 --- a/devel/qt5/distinfo +++ b/devel/qt5/distinfo @@ -1,38 +1,50 @@ -SHA256 (KDE/Qt/5.4.1/qtbase-opensource-src-5.4.1.tar.xz) = 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 -SIZE (KDE/Qt/5.4.1/qtbase-opensource-src-5.4.1.tar.xz) = 46132220 -SHA256 (KDE/Qt/5.4.1/qtdeclarative-opensource-src-5.4.1.tar.xz) = 15124e242a8a4a8fc5bedd32910b3b0b372b6c2b63f99572c4a2427e668d4417 -SIZE (KDE/Qt/5.4.1/qtdeclarative-opensource-src-5.4.1.tar.xz) = 18406948 -SHA256 (KDE/Qt/5.4.1/qtdoc-opensource-src-5.4.1.tar.xz) = 18b1229234aaba204870cea7c06b99d4c6b9a1f689a1a204c010bfee3b15cfa9 -SIZE (KDE/Qt/5.4.1/qtdoc-opensource-src-5.4.1.tar.xz) = 16050812 -SHA256 (KDE/Qt/5.4.1/qtgraphicaleffects-opensource-src-5.4.1.tar.xz) = bae2f0e8120f0b4e6e1b56a486713821615d0af7c69fb4ecdcbabc22b8f8351c -SIZE (KDE/Qt/5.4.1/qtgraphicaleffects-opensource-src-5.4.1.tar.xz) = 14323700 -SHA256 (KDE/Qt/5.4.1/qtimageformats-opensource-src-5.4.1.tar.xz) = 3f6c5bb568ebbee24700c439a60b2e512026dfee5be896c846e4f289cc5b846f -SIZE (KDE/Qt/5.4.1/qtimageformats-opensource-src-5.4.1.tar.xz) = 2108976 -SHA256 (KDE/Qt/5.4.1/qtmultimedia-opensource-src-5.4.1.tar.xz) = 3830dd4a11727cc4a3ab32dc10e4cd016739d0b1b0c59685512853e10f1e534e -SIZE (KDE/Qt/5.4.1/qtmultimedia-opensource-src-5.4.1.tar.xz) = 3184784 -SHA256 (KDE/Qt/5.4.1/qtquick1-opensource-src-5.4.1.tar.xz) = eb5324c784eef15b3d0f7e2fc2265b0f2e823a31330e88e09379972313ca432d -SIZE (KDE/Qt/5.4.1/qtquick1-opensource-src-5.4.1.tar.xz) = 15983524 -SHA256 (KDE/Qt/5.4.1/qtquickcontrols-opensource-src-5.4.1.tar.xz) = fe0852c510b7ab9111310d6880d1b1f34908274099aefa5a14316173b25cfbc2 -SIZE (KDE/Qt/5.4.1/qtquickcontrols-opensource-src-5.4.1.tar.xz) = 945324 -SHA256 (KDE/Qt/5.4.1/qtscript-opensource-src-5.4.1.tar.xz) = f432acc8376b86279faee273ff4e26226059d0cffbaced35e05a559d2efbcbaf -SIZE (KDE/Qt/5.4.1/qtscript-opensource-src-5.4.1.tar.xz) = 2581684 -SHA256 (KDE/Qt/5.4.1/qtserialport-opensource-src-5.4.1.tar.xz) = 79d99e826bf49e469a651cdc2d499d8b54e52bb8aaa279719a3afa03eba5d0ff -SIZE (KDE/Qt/5.4.1/qtserialport-opensource-src-5.4.1.tar.xz) = 255120 -SHA256 (KDE/Qt/5.4.1/qtsvg-opensource-src-5.4.1.tar.xz) = be8a90ccce2e873d3489a416d1748089f46e329519acb990cf851d6c9f9de12c -SIZE (KDE/Qt/5.4.1/qtsvg-opensource-src-5.4.1.tar.xz) = 1758812 -SHA256 (KDE/Qt/5.4.1/qttools-opensource-src-5.4.1.tar.xz) = 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 -SIZE (KDE/Qt/5.4.1/qttools-opensource-src-5.4.1.tar.xz) = 9262024 -SHA256 (KDE/Qt/5.4.1/qttranslations-opensource-src-5.4.1.tar.xz) = 3c4d045f974bc9ee76bb85d319737cf182b8697c4ba72d2c075d3609cfaf9041 -SIZE (KDE/Qt/5.4.1/qttranslations-opensource-src-5.4.1.tar.xz) = 1071784 -SHA256 (KDE/Qt/5.4.1/qtwebchannel-opensource-src-5.4.1.tar.xz) = c4acb9ec9886fca6d0c2adc5b45970347ae1b3e4b5e0055ab370540faef7b251 -SIZE (KDE/Qt/5.4.1/qtwebchannel-opensource-src-5.4.1.tar.xz) = 84636 -SHA256 (KDE/Qt/5.4.1/qtwebkit-opensource-src-5.4.1.tar.xz) = 6607211ef8a913dc778617bf4ba0970e34cc71e1da3abb477eabe0035e7119bf -SIZE (KDE/Qt/5.4.1/qtwebkit-opensource-src-5.4.1.tar.xz) = 33457544 -SHA256 (KDE/Qt/5.4.1/qtwebkit-examples-opensource-src-5.4.1.tar.xz) = 19187bb31c349c67f90c92df896f14f9167b982bdef5187e83fd68407826720a -SIZE (KDE/Qt/5.4.1/qtwebkit-examples-opensource-src-5.4.1.tar.xz) = 3419316 -SHA256 (KDE/Qt/5.4.1/qtwebsockets-opensource-src-5.4.1.tar.xz) = daf56f98c5e267253bd2d2e421472fc02faa1703a9063cc14cf8afce6967ab44 -SIZE (KDE/Qt/5.4.1/qtwebsockets-opensource-src-5.4.1.tar.xz) = 74784 -SHA256 (KDE/Qt/5.4.1/qtx11extras-opensource-src-5.4.1.tar.xz) = 20a61cdb9f925e9ab959bed1e7aeb1855b721619d5dc5f3691b8c1ce186e8c2e -SIZE (KDE/Qt/5.4.1/qtx11extras-opensource-src-5.4.1.tar.xz) = 25460 -SHA256 (KDE/Qt/5.4.1/qtxmlpatterns-opensource-src-5.4.1.tar.xz) = f5142ff4d3f1154550530eddf310d2ff149c6f0055d3d028ad48cb5491c65318 -SIZE (KDE/Qt/5.4.1/qtxmlpatterns-opensource-src-5.4.1.tar.xz) = 1307228 +SHA256 (KDE/Qt/5.5.1/qt3d-opensource-src-5.5.1.tar.xz) = e380906e2bcbd825dab45043bf063dd88b793c0d5fb050ee915bf4e2b58b1bf7 +SIZE (KDE/Qt/5.5.1/qt3d-opensource-src-5.5.1.tar.xz) = 18061948 +SHA256 (KDE/Qt/5.5.1/qtbase-opensource-src-5.5.1.tar.xz) = dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 +SIZE (KDE/Qt/5.5.1/qtbase-opensource-src-5.5.1.tar.xz) = 46389212 +SHA256 (KDE/Qt/5.5.1/qtcanvas3d-opensource-src-5.5.1.tar.xz) = 759b171030d7110751943643885c1484c7900fed7737424d202e36bdeba0b080 +SIZE (KDE/Qt/5.5.1/qtcanvas3d-opensource-src-5.5.1.tar.xz) = 10409580 +SHA256 (KDE/Qt/5.5.1/qtconnectivity-opensource-src-5.5.1.tar.xz) = 3637e6def8582fc0fb3684179b93650720ba2da1311a560d358296153f245023 +SIZE (KDE/Qt/5.5.1/qtconnectivity-opensource-src-5.5.1.tar.xz) = 2660592 +SHA256 (KDE/Qt/5.5.1/qtdeclarative-opensource-src-5.5.1.tar.xz) = 5fd14eefb83fff36fb17681693a70868f6aaf6138603d799c16466a094b26791 +SIZE (KDE/Qt/5.5.1/qtdeclarative-opensource-src-5.5.1.tar.xz) = 18627840 +SHA256 (KDE/Qt/5.5.1/qtdoc-opensource-src-5.5.1.tar.xz) = 9f0daf55a1765f637b5d8096a195842281a49adc5a82e7ddc75e541c62e00f86 +SIZE (KDE/Qt/5.5.1/qtdoc-opensource-src-5.5.1.tar.xz) = 2669772 +SHA256 (KDE/Qt/5.5.1/qtenginio-opensource-src-5.5.1.tar.xz) = a79936bd5b6a35aba28dd282291b28c8fa869b8d86652c62efe5e268d94defe2 +SIZE (KDE/Qt/5.5.1/qtenginio-opensource-src-5.5.1.tar.xz) = 523788 +SHA256 (KDE/Qt/5.5.1/qtgraphicaleffects-opensource-src-5.5.1.tar.xz) = 9bca0f8db3a4289eceebfa9504915440fe3fa6301d90b65705e4ece528c12d47 +SIZE (KDE/Qt/5.5.1/qtgraphicaleffects-opensource-src-5.5.1.tar.xz) = 14329444 +SHA256 (KDE/Qt/5.5.1/qtimageformats-opensource-src-5.5.1.tar.xz) = c97fee00c602f9f089fea480546d6e9d61a2b2297c2f163bfd9f8aba92b754a5 +SIZE (KDE/Qt/5.5.1/qtimageformats-opensource-src-5.5.1.tar.xz) = 1892820 +SHA256 (KDE/Qt/5.5.1/qtlocation-opensource-src-5.5.1.tar.xz) = 1fe948cb87649f4450be921cf3cdefc311595a80ef6a7a7b7484901baa0d6316 +SIZE (KDE/Qt/5.5.1/qtlocation-opensource-src-5.5.1.tar.xz) = 3108096 +SHA256 (KDE/Qt/5.5.1/qtmultimedia-opensource-src-5.5.1.tar.xz) = 7cc7ca99f41587c188303670499e5c75101f9a8cb6178e8f29cc941e637d957f +SIZE (KDE/Qt/5.5.1/qtmultimedia-opensource-src-5.5.1.tar.xz) = 3464340 +SHA256 (KDE/Qt/5.5.1/qtquick1-opensource-src-5.5.1.tar.xz) = c812a7e59a8b9f0a87693181059933e15fef04bc875b6486cd653be1b9b51f2c +SIZE (KDE/Qt/5.5.1/qtquick1-opensource-src-5.5.1.tar.xz) = 16028732 +SHA256 (KDE/Qt/5.5.1/qtquickcontrols-opensource-src-5.5.1.tar.xz) = 1b7a8389d656066c629bd2cb520b39a7eb041d184b567dd1b9639b88d841fcf0 +SIZE (KDE/Qt/5.5.1/qtquickcontrols-opensource-src-5.5.1.tar.xz) = 5976316 +SHA256 (KDE/Qt/5.5.1/qtscript-opensource-src-5.5.1.tar.xz) = cd46dddd998f22bcb06447e0407fef81f7052f25bc770b1c27625654cee828fd +SIZE (KDE/Qt/5.5.1/qtscript-opensource-src-5.5.1.tar.xz) = 2604884 +SHA256 (KDE/Qt/5.5.1/qtsensors-opensource-src-5.5.1.tar.xz) = 5d264fc0729a5d7679bd4eb8d7a0a9b142ed38d09fa68fc7dfe57f64afc8eeea +SIZE (KDE/Qt/5.5.1/qtsensors-opensource-src-5.5.1.tar.xz) = 1989556 +SHA256 (KDE/Qt/5.5.1/qtserialport-opensource-src-5.5.1.tar.xz) = a034dbfb023db1b9b9de54390f7e76a48c1d1eb12533b0ffd574505c99968f7a +SIZE (KDE/Qt/5.5.1/qtserialport-opensource-src-5.5.1.tar.xz) = 260984 +SHA256 (KDE/Qt/5.5.1/qtsvg-opensource-src-5.5.1.tar.xz) = f7f588be48befd9ccab5a6086832551b8899e8bed9e603ddea979581e05a91c7 +SIZE (KDE/Qt/5.5.1/qtsvg-opensource-src-5.5.1.tar.xz) = 1802880 +SHA256 (KDE/Qt/5.5.1/qttools-opensource-src-5.5.1.tar.xz) = 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd +SIZE (KDE/Qt/5.5.1/qttools-opensource-src-5.5.1.tar.xz) = 9327100 +SHA256 (KDE/Qt/5.5.1/qttranslations-opensource-src-5.5.1.tar.xz) = 41f800710f0bc6ca263f1e54f1fa22be7043962999304e73ce9887ebefc7a4c6 +SIZE (KDE/Qt/5.5.1/qttranslations-opensource-src-5.5.1.tar.xz) = 1153132 +SHA256 (KDE/Qt/5.5.1/qtwebchannel-opensource-src-5.5.1.tar.xz) = 7f4295ee57cd4ecba3cb263452d2a08d501b45c9a2b8b7794b6a97d7652f15d0 +SIZE (KDE/Qt/5.5.1/qtwebchannel-opensource-src-5.5.1.tar.xz) = 96684 +SHA256 (KDE/Qt/5.5.1/qtwebkit-opensource-src-5.5.1.tar.xz) = 77583f9dbd3e6ad874386df71b165dc3ce88efdabbc6e5d97a959ee2187d6d69 +SIZE (KDE/Qt/5.5.1/qtwebkit-opensource-src-5.5.1.tar.xz) = 33489924 +SHA256 (KDE/Qt/5.5.1/qtwebkit-examples-opensource-src-5.5.1.tar.xz) = 098935b42d6d249027d1a635e4e70edc3d2969dd860f825b36aec06fc72e46c6 +SIZE (KDE/Qt/5.5.1/qtwebkit-examples-opensource-src-5.5.1.tar.xz) = 3428204 +SHA256 (KDE/Qt/5.5.1/qtwebsockets-opensource-src-5.5.1.tar.xz) = cf4e834a867b90337188be504ef20184c52666370f721e704952988f8cb12deb +SIZE (KDE/Qt/5.5.1/qtwebsockets-opensource-src-5.5.1.tar.xz) = 170440 +SHA256 (KDE/Qt/5.5.1/qtx11extras-opensource-src-5.5.1.tar.xz) = 6387a01d972b62e1ad39e5a25e07d0492200f62fc87cf4366122085aeeebeb65 +SIZE (KDE/Qt/5.5.1/qtx11extras-opensource-src-5.5.1.tar.xz) = 33416 +SHA256 (KDE/Qt/5.5.1/qtxmlpatterns-opensource-src-5.5.1.tar.xz) = b537eb0252988e3805a32a16c65038973371d647baf246fdf703bde725d0e8ec +SIZE (KDE/Qt/5.5.1/qtxmlpatterns-opensource-src-5.5.1.tar.xz) = 1323560 diff --git a/devel/qt5/files/extrapatch-configure b/devel/qt5/files/extrapatch-configure index 2c02359b83cb..e46e91711e4a 100644 --- a/devel/qt5/files/extrapatch-configure +++ b/devel/qt5/files/extrapatch-configure @@ -16,9 +16,9 @@ as the value of QMAKE_DEFAULT_LIBDIRS in mkspecs/qconfig.pri (which qmake uses to filter out those same paths when processing .pro files). ---- configure -+++ configure -@@ -3683,7 +3683,7 @@ setBootstrapVariable() +--- configure.orig 2015-03-16 17:16:10.000000000 +0100 ++++ configure 2015-05-01 09:35:38.595937000 +0200 +@@ -3853,7 +3853,7 @@ } # build qmake @@ -27,7 +27,7 @@ echo "Creating qmake..." mkdir -p "$outpath/qmake" || exit -@@ -4542,8 +4542,8 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do +@@ -4777,8 +4777,8 @@ SQLITE_AUTODETECT_FAILED="no" if [ "$CFG_SQLITE" = "system" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists sqlite3 2>/dev/null; then @@ -38,8 +38,8 @@ else QT_CFLAGS_SQLITE= QT_LFLAGS_SQLITE="-lsqlite3 -lz" -@@ -4643,8 +4643,8 @@ fi - # auto-detect libdbus-1 support +@@ -4881,8 +4881,8 @@ + fi if [ "$CFG_DBUS" = "linked" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --atleast-version="$MIN_DBUS_1_VERSION" dbus-1 2>/dev/null; then - QT_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null` @@ -49,7 +49,7 @@ else QT_LIBS_DBUS="-ldbus-1" fi -@@ -4672,8 +4672,8 @@ fi +@@ -4928,8 +4928,8 @@ # auto-detect Glib support if [ "$CFG_GLIB" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then @@ -60,7 +60,7 @@ fi if compileTest unix/glib "Glib" $QT_CFLAGS_GLIB $QT_LIBS_GLIB; then CFG_GLIB=yes -@@ -4696,9 +4696,9 @@ fi +@@ -4952,9 +4952,9 @@ # auto-detect GTK style support if [ "$CFG_GLIB" = "yes" -a "$CFG_QGTKSTYLE" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then @@ -73,7 +73,7 @@ fi if [ -n "$QT_CFLAGS_QGTK2" ] ; then CFG_QGTKSTYLE=yes -@@ -4745,8 +4745,8 @@ fi +@@ -5001,8 +5001,8 @@ # Auto-detect PulseAudio support if [ "$CFG_PULSEAUDIO" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then @@ -84,22 +84,7 @@ fi if compileTest unix/pulseaudio "PulseAudio" $QT_CFLAGS_PULSEAUDIO $QT_LIBS_PULSEAUDIO; then CFG_PULSEAUDIO=yes -@@ -4870,10 +4870,10 @@ if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then - elif [ "$CFG_OPENGL" = "es2" ]; then - #OpenGL ES 2.0 - if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists glesv2 2>/dev/null; then -- QMAKE_INCDIR_OPENGL_ES2=`$PKG_CONFIG --cflags-only-I glesv2 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'` -- QMAKE_LIBDIR_OPENGL_ES2=`$PKG_CONFIG --libs-only-L glesv2 2>/dev/null | sed -e 's,^-L,,g' -e 's, -L, ,g'` -- QMAKE_LIBS_OPENGL_ES2=`$PKG_CONFIG --libs glesv2 2>/dev/null` -- QMAKE_CFLAGS_OPENGL_ES2=`$PKG_CONFIG --cflags glesv2 2>/dev/null` -+ QMAKE_INCDIR_OPENGL_ES2=`$PKG_CONFIG --cflags-only-I glesv2 2>/dev/null | filterIncludeOptions | sed -e 's,^-I,,g' -e 's, -I, ,g'` -+ QMAKE_LIBDIR_OPENGL_ES2=`$PKG_CONFIG --libs-only-L glesv2 2>/dev/null | filterLibraryOptions | sed -e 's,^-L,,g' -e 's, -L, ,g'` -+ QMAKE_LIBS_OPENGL_ES2=`$PKG_CONFIG --libs glesv2 2>/dev/null | filterLibraryOptions` -+ QMAKE_CFLAGS_OPENGL_ES2=`$PKG_CONFIG --cflags glesv2 2>/dev/null | filterIncludeOptions` - QMakeVar set QMAKE_INCDIR_OPENGL_ES2 "`shellArgumentListToQMakeList "$QMAKE_INCDIR_OPENGL_ES2"`" - QMakeVar set QMAKE_LIBDIR_OPENGL_ES2 "`shellArgumentListToQMakeList "$QMAKE_LIBDIR_OPENGL_ES2"`" - QMakeVar set QMAKE_LIBS_OPENGL_ES2 "`shellArgumentListToQMakeList "$QMAKE_LIBS_OPENGL_ES2"`" -@@ -4918,8 +4918,8 @@ fi +@@ -5165,8 +5165,8 @@ # auto-detect FontConfig support if [ "$CFG_FONTCONFIG" != "no" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig --exists freetype2 2>/dev/null; then @@ -110,7 +95,7 @@ else QT_CFLAGS_FONTCONFIG= QT_LIBS_FONTCONFIG="-lfreetype -lfontconfig" -@@ -4945,9 +4945,9 @@ ORIG_CFG_KMS="$CFG_KMS" +@@ -5192,9 +5192,9 @@ if [ "$CFG_LIBUDEV" != "no" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists libudev 2>/dev/null; then @@ -123,7 +108,7 @@ QMakeVar set QMAKE_INCDIR_LIBUDEV "$QMAKE_INCDIR_LIBUDEV" QMakeVar set QMAKE_LIBS_LIBUDEV "$QMAKE_LIBS_LIBUDEV" fi -@@ -5036,8 +5036,8 @@ fi +@@ -5333,8 +5333,8 @@ if [ "$CFG_XCB" != "no" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then @@ -134,7 +119,7 @@ fi if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "x11" 2> /dev/null; then QMAKE_X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`" -@@ -5056,16 +5056,16 @@ if [ "$CFG_XCB" != "no" ]; then +@@ -5353,16 +5353,16 @@ CFG_XCB="system" if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then XCB_PACKAGES="xcb xcb-shm xcb-sync xcb-xfixes xcb-randr xcb-image xcb-keysyms xcb-icccm xcb-shape" @@ -155,7 +140,7 @@ if compileTest qpa/xcb-xkb "xcb-xkb" $QMAKE_CFLAGS_XKB $QMAKE_LIBS_XKB; then CFG_XKB=yes fi -@@ -5119,8 +5119,8 @@ fi +@@ -5416,8 +5416,8 @@ if [ "$CFG_DIRECTFB" != "no" ]; then if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists directfb 2>/dev/null; then @@ -166,7 +151,7 @@ if compileTest qpa/directfb "DirectFB" $QMAKE_CFLAGS_DIRECTFB $QMAKE_LIBS_DIRECTFB; then CFG_DIRECTFB=yes elif [ "$CFG_DIRECTFB" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then -@@ -5173,8 +5173,8 @@ if [ "$CFG_XCB" != "no" ]; then +@@ -5470,8 +5470,8 @@ if [ "$CFG_XKBCOMMON" != "no" ] && [ "$CFG_XKBCOMMON" != "qt" ]; then # Check if there is a suitable system-wide xkbcommon if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xkbcommon xkbcommon-x11 >= $MIN_REQ_XKBCOMMON" 2>/dev/null; then @@ -177,7 +162,7 @@ QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON" QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON" -@@ -5227,9 +5227,9 @@ if [ "$CFG_EGL" != "no" ]; then +@@ -5524,9 +5524,9 @@ fi if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then diff --git a/devel/qt5/files/extrapatch-libtool b/devel/qt5/files/extrapatch-libtool index 2679a1e5c87e..fccea74b0530 100644 --- a/devel/qt5/files/extrapatch-libtool +++ b/devel/qt5/files/extrapatch-libtool @@ -1,11 +1,11 @@ ---- mkspecs/features/qt_module.prf.orig -+++ mkspecs/features/qt_module.prf -@@ -189,7 +189,7 @@ - QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace +--- mkspecs/features/qt_module.prf.orig 2015-03-16 17:16:43.000000000 +0100 ++++ mkspecs/features/qt_module.prf 2015-05-01 09:47:31.767105000 +0200 +@@ -200,7 +200,7 @@ + QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace unix { - CONFIG += create_libtool explicitlib + CONFIG += explicitlib - QMAKE_LIBTOOL_LIBDIR = $$qt_libdir - QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace - } + host_build: \ + QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS] + else: \ diff --git a/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h b/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h index e665063d4b18..fbc864b3058b 100644 --- a/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h +++ b/devel/qt5/files/extrapatch-src_corelib_global_qcompilerdetection.h @@ -1,15 +1,31 @@ ---- src/corelib/global/qcompilerdetection.h.orig 2016-01-03 18:13:55 UTC +--- src/corelib/global/qcompilerdetection.h.orig 2015-10-13 04:35:31 UTC +++ src/corelib/global/qcompilerdetection.h -@@ -900,10 +900,10 @@ - # undef Q_COMPILER_REF_QUALIFIERS +@@ -941,13 +941,26 @@ + # undef Q_COMPILER_CONSTEXPR # endif # endif // Q_OS_QNX -# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \ - && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402) +# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && !defined(_LIBCPP_VERSION) - // Mac OS X: Apple has not updated libstdc++ since 2007, which means it does not have + // Apple has not updated libstdc++ since 2007, which means it does not have // <initializer_list> or std::move. Let's disable these features +// The same applies to FreeBSD's base libstdc++ version used in FreeBSD 9.x. # undef Q_COMPILER_INITIALIZER_LISTS # undef Q_COMPILER_RVALUE_REFS # undef Q_COMPILER_REF_QUALIFIERS ++// FreeBSD's base libstdc++ does not support std::u{16,32}string. ++# undef Q_COMPILER_UNICODE_STRINGS ++// FreeBSD's base libstdc++ does not support std::declval, which is used in ++// together with noexcept in some headers such as qpair.h (as of Qt 5.5). ++// Since there is no macro checking for std::declval, just disable noexcept ++// altogether. ++# undef Q_COMPILER_NOEXCEPT ++// FreeBSD's base libstdc++ is missing constexpr keywords on important ++// functions like std::numeric_limits<>::min(). Disable constexpr even if clang ++// advertises support for it. ++# undef Q_COMPILER_CONSTEXPR ++// FreeBSD's base libstdc++ does not support std::nullptr_t. ++# undef Q_COMPILER_NULLPTR + // Also disable <atomic>, since it's clearly not there + # undef Q_COMPILER_ATOMICS + # endif diff --git a/graphics/Makefile b/graphics/Makefile index 8fa512734158..0cb09c2441cf 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -891,6 +891,7 @@ SUBDIR += qt4-opengl SUBDIR += qt4-pixeltool SUBDIR += qt4-svg + SUBDIR += qt5-3d SUBDIR += qt5-graphicaleffects SUBDIR += qt5-imageformats SUBDIR += qt5-opengl diff --git a/graphics/qt5-3d/Makefile b/graphics/qt5-3d/Makefile new file mode 100644 index 000000000000..8d502496292e --- /dev/null +++ b/graphics/qt5-3d/Makefile @@ -0,0 +1,18 @@ +# $FreeBSD$ + +PORTNAME= 3d +DISTVERSION= ${QT5_VERSION} +CATEGORIES= graphics +PKGNAMEPREFIX= qt5- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt3D module + +# Base GCC fails to build the code, pull in a more recent compiler. +USES= compiler:c++0x qmake +USE_QT5= concurrent core gui qml quick buildtools_build +QT_DIST= ${PORTNAME} + +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} + +.include <bsd.port.mk> diff --git a/graphics/qt5-3d/files/patch-git_d512090 b/graphics/qt5-3d/files/patch-git_d512090 new file mode 100644 index 000000000000..b5948439c32b --- /dev/null +++ b/graphics/qt5-3d/files/patch-git_d512090 @@ -0,0 +1,150 @@ +Patch reworked for Qt 5.5. +Sent upstream: https://codereview.qt-project.org/#/c/144744/ + +commit d5120908c74133d9fd249b920cff0dc76313f43f +Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Mon Dec 28 00:46:31 2015 +0100 + + Stop using enum references that require C++11. + + Use Qt::Foo instead of Qt::Enum::Foo, which is a C++11 extension. When + building with clang without -std=c++11, this results in warnings. With + older GCC versions, the code simply does not build. + + This is similar to commit deffdaf9 ("GraphicsHelper: fix switch"). + + Change-Id: I28389b90bafb3df87187742ef55267ce2df1ba1a + Reviewed-by: Sean Harmer <sean.harmer@kdab.com> + +--- src/input/q3dmouseevent.cpp ++++ src/input/q3dmouseevent.cpp +@@ -114,16 +114,16 @@ Q3DMouseEvent::~Q3DMouseEvent() + Q3DMouseEvent::Buttons Q3DMouseEvent::button() const + { + switch (m_event.button()) { +- case Qt::MouseButton::LeftButton: +- return Q3DMouseEvent::Buttons::LeftButton; +- case Qt::MouseButton::RightButton: +- return Q3DMouseEvent::Buttons::RightButton; +- case Qt::MouseButton::MiddleButton: +- return Q3DMouseEvent::Buttons::MiddleButton; +- case Qt::MouseButton::BackButton: +- return Q3DMouseEvent::Buttons::BackButton; ++ case Qt::LeftButton: ++ return Q3DMouseEvent::LeftButton; ++ case Qt::RightButton: ++ return Q3DMouseEvent::RightButton; ++ case Qt::MiddleButton: ++ return Q3DMouseEvent::MiddleButton; ++ case Qt::BackButton: ++ return Q3DMouseEvent::BackButton; + default: +- return Q3DMouseEvent::Buttons::NoButton; ++ return Q3DMouseEvent::NoButton; + } + } + +@@ -143,17 +143,17 @@ Q3DMouseEvent::Modifiers Q3DMouseEvent::modifier() const + { + switch (m_event.modifiers()) { + case Qt::ShiftModifier: +- return Q3DMouseEvent::Modifiers::ShiftModifier; ++ return Q3DMouseEvent::ShiftModifier; + case Qt::ControlModifier: +- return Q3DMouseEvent::Modifiers::ControlModifier; ++ return Q3DMouseEvent::ControlModifier; + case Qt::AltModifier: +- return Q3DMouseEvent::Modifiers::AltModifier; ++ return Q3DMouseEvent::AltModifier; + case Qt::MetaModifier: +- return Q3DMouseEvent::Modifiers::MetaModifier; ++ return Q3DMouseEvent::MetaModifier; + case Qt::KeypadModifier: +- return Q3DMouseEvent::Modifiers::KeypadModifier; ++ return Q3DMouseEvent::KeypadModifier; + default: +- return Q3DMouseEvent::Modifiers::NoModifier; ++ return Q3DMouseEvent::NoModifier; + } + } + +@@ -242,17 +242,17 @@ Q3DWheelEvent::Modifiers Q3DWheelEvent::modifier() const + { + switch (m_event.modifiers()) { + case Qt::ShiftModifier: +- return Q3DWheelEvent::Modifiers::ShiftModifier; ++ return Q3DWheelEvent::ShiftModifier; + case Qt::ControlModifier: +- return Q3DWheelEvent::Modifiers::ControlModifier; ++ return Q3DWheelEvent::ControlModifier; + case Qt::AltModifier: +- return Q3DWheelEvent::Modifiers::AltModifier; ++ return Q3DWheelEvent::AltModifier; + case Qt::MetaModifier: +- return Q3DWheelEvent::Modifiers::MetaModifier; ++ return Q3DWheelEvent::MetaModifier; + case Qt::KeypadModifier: +- return Q3DWheelEvent::Modifiers::KeypadModifier; ++ return Q3DWheelEvent::KeypadModifier; + default: +- return Q3DWheelEvent::Modifiers::NoModifier; ++ return Q3DWheelEvent::NoModifier; + } + } + +--- src/input/q3dmouseevent.h ++++ src/input/q3dmouseevent.h +@@ -59,11 +59,11 @@ class QT3DINPUTSHARED_EXPORT QMouseEvent : public QObject + + public: + enum Buttons { +- LeftButton = Qt::MouseButton::LeftButton, +- RightButton = Qt::MouseButton::RightButton, +- MiddleButton = Qt::MouseButton::MiddleButton, +- BackButton = Qt::MouseButton::BackButton, +- NoButton = Qt::MouseButton::NoButton ++ LeftButton = Qt::LeftButton, ++ RightButton = Qt::RightButton, ++ MiddleButton = Qt::MiddleButton, ++ BackButton = Qt::BackButton, ++ NoButton = Qt::NoButton + }; + Q_ENUM(Buttons) + +@@ -109,11 +109,11 @@ class QT3DINPUTSHARED_EXPORT QWheelEvent : public QObject + + public: + enum Buttons { +- LeftButton = Qt::MouseButton::LeftButton, +- RightButton = Qt::MouseButton::RightButton, +- MiddleButton = Qt::MouseButton::MiddleButton, +- BackButton = Qt::MouseButton::BackButton, +- NoButton = Qt::MouseButton::NoButton ++ LeftButton = Qt::LeftButton, ++ RightButton = Qt::RightButton, ++ MiddleButton = Qt::MiddleButton, ++ BackButton = Qt::BackButton, ++ NoButton = Qt::NoButton + }; + Q_ENUM(Buttons) + +--- src/quick3d/quick3d/items/quick3dentityloader.cpp ++++ src/quick3d/quick3d/items/quick3dentityloader.cpp +@@ -64,7 +64,7 @@ protected: + Quick3DEntityLoaderPrivate *priv = Quick3DEntityLoaderPrivate::get(m_loader); + + switch (status) { +- case Status::Ready: { ++ case Ready: { + Q_ASSERT(priv->m_entity == Q_NULLPTR); + priv->m_entity = qobject_cast<QEntity *>(object()); + Q_ASSERT(priv->m_entity != Q_NULLPTR); +@@ -73,7 +73,7 @@ protected: + break; + } + +- case Status::Error: { ++ case Error: { + QQmlEnginePrivate::warning(qmlEngine(m_loader), errors()); + priv->clear(); + emit m_loader->entityChanged(); diff --git a/graphics/qt5-3d/files/patch-git_deffdaf9 b/graphics/qt5-3d/files/patch-git_deffdaf9 new file mode 100644 index 000000000000..7adf87c0ea8d --- /dev/null +++ b/graphics/qt5-3d/files/patch-git_deffdaf9 @@ -0,0 +1,34 @@ +Paths reworked for Qt 5.5. + +commit deffdaf9b14c78535a1290757d54082a51dd518f +Author: Paul Lemire <paul.lemire@kdab.com> +Date: Thu Nov 19 12:18:02 2015 +0100 + + GraphicsHelper: fix switch + + Change-Id: I9bc47d84407d1ed6fc5efd7d2acfff094855939c + Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com> + +--- src/render/backend/qgraphicscontext.cpp ++++ src/render/backend/qgraphicscontext.cpp +@@ -1032,15 +1032,15 @@ GLuint QGraphicsContext::byteSizeFromTyp + GLint QGraphicsContext::glDataTypeFromAttributeDataType(QAttribute::DataType dataType) + { + switch (dataType) { +- case QAttribute::DataType::Byte: ++ case QAttribute::Byte: + return GL_BYTE; +- case QAttribute::DataType::UnsignedByte: ++ case QAttribute::UnsignedByte: + return GL_UNSIGNED_BYTE; +- case QAttribute::DataType::Short: ++ case QAttribute::Short: + return GL_SHORT; +- case QAttribute::DataType::UnsignedShort: ++ case QAttribute::UnsignedShort: + return GL_UNSIGNED_SHORT; +- case QAttribute::DataType::Int: ++ case QAttribute::Int: + return GL_INT; + case QAttribute::UnsignedInt: + return GL_UNSIGNED_INT; diff --git a/graphics/qt5-3d/pkg-plist b/graphics/qt5-3d/pkg-plist new file mode 100644 index 000000000000..9c81511384c7 --- /dev/null +++ b/graphics/qt5-3d/pkg-plist @@ -0,0 +1,731 @@ +%%QT_INCDIR%%/Qt3DCollision/%%FULLVER%%/Qt3DCollision/private/qabstractcollider_p.h +%%QT_INCDIR%%/Qt3DCollision/%%FULLVER%%/Qt3DCollision/private/qboxcollider_p.h +%%QT_INCDIR%%/Qt3DCollision/%%FULLVER%%/Qt3DCollision/private/qcapsulecollider_p.h +%%QT_INCDIR%%/Qt3DCollision/%%FULLVER%%/Qt3DCollision/private/qcollisionaspect_p.h +%%QT_INCDIR%%/Qt3DCollision/%%FULLVER%%/Qt3DCollision/private/qgeometrycollider_p.h +%%QT_INCDIR%%/Qt3DCollision/%%FULLVER%%/Qt3DCollision/private/qspherecollider_p.h +%%QT_INCDIR%%/Qt3DCollision/QAbstractCollider +%%QT_INCDIR%%/Qt3DCollision/QBoxCollider +%%QT_INCDIR%%/Qt3DCollision/QCapsuleCollider +%%QT_INCDIR%%/Qt3DCollision/QCollisionAspect +%%QT_INCDIR%%/Qt3DCollision/QGeometryCollider +%%QT_INCDIR%%/Qt3DCollision/QSphereCollider +%%QT_INCDIR%%/Qt3DCollision/Qt3DCollision +%%QT_INCDIR%%/Qt3DCollision/Qt3DCollisionDepends +%%QT_INCDIR%%/Qt3DCollision/Qt3DCollisionVersion +%%QT_INCDIR%%/Qt3DCollision/qabstractcollider.h +%%QT_INCDIR%%/Qt3DCollision/qboxcollider.h +%%QT_INCDIR%%/Qt3DCollision/qcapsulecollider.h +%%QT_INCDIR%%/Qt3DCollision/qcollisionaspect.h +%%QT_INCDIR%%/Qt3DCollision/qgeometrycollider.h +%%QT_INCDIR%%/Qt3DCollision/qspherecollider.h +%%QT_INCDIR%%/Qt3DCollision/qt3dcollision_global.h +%%QT_INCDIR%%/Qt3DCollision/qt3dcollisionversion.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/corelogging_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/dependencyhandler_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/nullservices_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/propertychangehandler_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qabstractaspect_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qabstractaspectjobmanager_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qabstractattribute_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qabstractbuffer_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qabstractcollisionqueryservice_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qabstractframeadvanceservice_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qabstractserviceprovider_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qabstracttransform_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qaspectengine_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qaspectfactory_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qaspectjob_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qaspectjobmanager_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qaspectmanager_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qbackendnode_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qbackendscenepropertychange_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qboundedcircularbuffer_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qcamera_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qcameralens_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qchangearbiter_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qcircularbuffer_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qcollisionqueryresult_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qcomponent_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qentity_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qframeallocator_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qlockableobserverinterface_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qlookattransform_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qmatrixtransform_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qnode_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qobservableinterface_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qobserverinterface_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qopenglinformationservice_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qpostman_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qresourcemanager_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qrotatetransform_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qscaletransform_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qscene_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qscenechange_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qscenepropertychange_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qscheduler_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qsysteminformationservice_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qt3dcore_global_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qthreadpooler_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qtickclock_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qtickclockservice_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qtransform_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qtranslatetransform_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qurlhelper_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/task_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/weaverjob_p.h +%%QT_INCDIR%%/Qt3DCore/FunctorType +%%QT_INCDIR%%/Qt3DCore/QAbstractAspect +%%QT_INCDIR%%/Qt3DCore/QAbstractAttribute +%%QT_INCDIR%%/Qt3DCore/QAbstractBuffer +%%QT_INCDIR%%/Qt3DCore/QAbstractBufferPtr +%%QT_INCDIR%%/Qt3DCore/QAbstractCollisionQueryService +%%QT_INCDIR%%/Qt3DCore/QAbstractFrameAdvanceService +%%QT_INCDIR%%/Qt3DCore/QAbstractFunctor +%%QT_INCDIR%%/Qt3DCore/QAbstractServiceProvider +%%QT_INCDIR%%/Qt3DCore/QAbstractTransform +%%QT_INCDIR%%/Qt3DCore/QAspectEngine +%%QT_INCDIR%%/Qt3DCore/QAspectFactory +%%QT_INCDIR%%/Qt3DCore/QAspectJob +%%QT_INCDIR%%/Qt3DCore/QAspectJobProviderInterface +%%QT_INCDIR%%/Qt3DCore/QAspectJobPtr +%%QT_INCDIR%%/Qt3DCore/QAspectThread +%%QT_INCDIR%%/Qt3DCore/QAxisAlignedBoundingBox +%%QT_INCDIR%%/Qt3DCore/QBackendNode +%%QT_INCDIR%%/Qt3DCore/QBackendNodeFactory +%%QT_INCDIR%%/Qt3DCore/QBackendNodeFunctor +%%QT_INCDIR%%/Qt3DCore/QBackendNodeFunctorPtr +%%QT_INCDIR%%/Qt3DCore/QBackendScenePropertyChange +%%QT_INCDIR%%/Qt3DCore/QBackendScenePropertyChangePtr +%%QT_INCDIR%%/Qt3DCore/QBoundingSphere +%%QT_INCDIR%%/Qt3DCore/QBoundingVolume +%%QT_INCDIR%%/Qt3DCore/QBoundingVolumeProvider +%%QT_INCDIR%%/Qt3DCore/QCamera +%%QT_INCDIR%%/Qt3DCore/QCameraLens +%%QT_INCDIR%%/Qt3DCore/QCollisionQueryResult +%%QT_INCDIR%%/Qt3DCore/QComponent +%%QT_INCDIR%%/Qt3DCore/QComponentList +%%QT_INCDIR%%/Qt3DCore/QEntity +%%QT_INCDIR%%/Qt3DCore/QFrameAllocator +%%QT_INCDIR%%/Qt3DCore/QHandle +%%QT_INCDIR%%/Qt3DCore/QHandleManager +%%QT_INCDIR%%/Qt3DCore/QLookAtTransform +%%QT_INCDIR%%/Qt3DCore/QMatrixTransform +%%QT_INCDIR%%/Qt3DCore/QNode +%%QT_INCDIR%%/Qt3DCore/QNodeId +%%QT_INCDIR%%/Qt3DCore/QNodeList +%%QT_INCDIR%%/Qt3DCore/QNodePtr +%%QT_INCDIR%%/Qt3DCore/QNodeVisitor +%%QT_INCDIR%%/Qt3DCore/QOpenGLInformationService +%%QT_INCDIR%%/Qt3DCore/QQueryHandle +%%QT_INCDIR%%/Qt3DCore/QRay3D +%%QT_INCDIR%%/Qt3DCore/QRotateTransform +%%QT_INCDIR%%/Qt3DCore/QScaleTransform +%%QT_INCDIR%%/Qt3DCore/QSceneChange +%%QT_INCDIR%%/Qt3DCore/QSceneChangePtr +%%QT_INCDIR%%/Qt3DCore/QSceneObserverInterface +%%QT_INCDIR%%/Qt3DCore/QScenePropertyChange +%%QT_INCDIR%%/Qt3DCore/QScenePropertyChangePtr +%%QT_INCDIR%%/Qt3DCore/QServiceLocator +%%QT_INCDIR%%/Qt3DCore/QSystemInformationService +%%QT_INCDIR%%/Qt3DCore/QTransform +%%QT_INCDIR%%/Qt3DCore/QTranslateTransform +%%QT_INCDIR%%/Qt3DCore/Qt3DCore +%%QT_INCDIR%%/Qt3DCore/Qt3DCoreDepends +%%QT_INCDIR%%/Qt3DCore/Qt3DCoreVersion +%%QT_INCDIR%%/Qt3DCore/qabstractaspect.h +%%QT_INCDIR%%/Qt3DCore/qabstractattribute.h +%%QT_INCDIR%%/Qt3DCore/qabstractbuffer.h +%%QT_INCDIR%%/Qt3DCore/qabstractcollisionqueryservice.h +%%QT_INCDIR%%/Qt3DCore/qabstractframeadvanceservice.h +%%QT_INCDIR%%/Qt3DCore/qabstractfunctor.h +%%QT_INCDIR%%/Qt3DCore/qabstracttransform.h +%%QT_INCDIR%%/Qt3DCore/qaspectengine.h +%%QT_INCDIR%%/Qt3DCore/qaspectfactory.h +%%QT_INCDIR%%/Qt3DCore/qaspectjob.h +%%QT_INCDIR%%/Qt3DCore/qaspectjobproviderinterface.h +%%QT_INCDIR%%/Qt3DCore/qaspectthread.h +%%QT_INCDIR%%/Qt3DCore/qaxisalignedboundingbox.h +%%QT_INCDIR%%/Qt3DCore/qbackendnode.h +%%QT_INCDIR%%/Qt3DCore/qbackendnodefactory.h +%%QT_INCDIR%%/Qt3DCore/qbackendscenepropertychange.h +%%QT_INCDIR%%/Qt3DCore/qboundingsphere.h +%%QT_INCDIR%%/Qt3DCore/qboundingvolume.h +%%QT_INCDIR%%/Qt3DCore/qboundingvolumeprovider.h +%%QT_INCDIR%%/Qt3DCore/qcamera.h +%%QT_INCDIR%%/Qt3DCore/qcameralens.h +%%QT_INCDIR%%/Qt3DCore/qcollisionqueryresult.h +%%QT_INCDIR%%/Qt3DCore/qcomponent.h +%%QT_INCDIR%%/Qt3DCore/qentity.h +%%QT_INCDIR%%/Qt3DCore/qframeallocator.h +%%QT_INCDIR%%/Qt3DCore/qhandle.h +%%QT_INCDIR%%/Qt3DCore/qhandlemanager.h +%%QT_INCDIR%%/Qt3DCore/qlookattransform.h +%%QT_INCDIR%%/Qt3DCore/qmatrixtransform.h +%%QT_INCDIR%%/Qt3DCore/qnode.h +%%QT_INCDIR%%/Qt3DCore/qnodeid.h +%%QT_INCDIR%%/Qt3DCore/qnodevisitor.h +%%QT_INCDIR%%/Qt3DCore/qopenglinformationservice.h +%%QT_INCDIR%%/Qt3DCore/qray3d.h +%%QT_INCDIR%%/Qt3DCore/qrotatetransform.h +%%QT_INCDIR%%/Qt3DCore/qscaletransform.h +%%QT_INCDIR%%/Qt3DCore/qscenechange.h +%%QT_INCDIR%%/Qt3DCore/qsceneobserverinterface.h +%%QT_INCDIR%%/Qt3DCore/qscenepropertychange.h +%%QT_INCDIR%%/Qt3DCore/qservicelocator.h +%%QT_INCDIR%%/Qt3DCore/qsysteminformationservice.h +%%QT_INCDIR%%/Qt3DCore/qt3dcore_global.h +%%QT_INCDIR%%/Qt3DCore/qt3dcoreversion.h +%%QT_INCDIR%%/Qt3DCore/qtransform.h +%%QT_INCDIR%%/Qt3DCore/qtranslatetransform.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/assignkeyboardfocusjob_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/cameracontroller_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/handle_types_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/inputhandler_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/inputmanagers_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/keyboardcontroller_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/keyboardeventfilter_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/keyboardinput_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/keyeventdispatcherjob_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/mousecontroller_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/mouseeventdispatcherjob_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/mouseinput_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qinputaspect_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qkeyboardcontroller_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qkeyboardinput_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qmousecontroller_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qmouseinput_p.h +%%QT_INCDIR%%/Qt3DInput/MouseEventFilter +%%QT_INCDIR%%/Qt3DInput/Q3DKeyEvent +%%QT_INCDIR%%/Qt3DInput/Q3DKeyEventPtr +%%QT_INCDIR%%/Qt3DInput/Q3DMouseEvent +%%QT_INCDIR%%/Qt3DInput/Q3DMouseEventPtr +%%QT_INCDIR%%/Qt3DInput/Q3DWheelEvent +%%QT_INCDIR%%/Qt3DInput/Q3DWheelEventPtr +%%QT_INCDIR%%/Qt3DInput/QInputAspect +%%QT_INCDIR%%/Qt3DInput/QKeyboardController +%%QT_INCDIR%%/Qt3DInput/QKeyboardInput +%%QT_INCDIR%%/Qt3DInput/QMouseController +%%QT_INCDIR%%/Qt3DInput/QMouseInput +%%QT_INCDIR%%/Qt3DInput/Qt3DInput +%%QT_INCDIR%%/Qt3DInput/Qt3DInputDepends +%%QT_INCDIR%%/Qt3DInput/Qt3DInputVersion +%%QT_INCDIR%%/Qt3DInput/mouseeventfilter.h +%%QT_INCDIR%%/Qt3DInput/q3dkeyevent.h +%%QT_INCDIR%%/Qt3DInput/q3dmouseevent.h +%%QT_INCDIR%%/Qt3DInput/qinputaspect.h +%%QT_INCDIR%%/Qt3DInput/qkeyboardcontroller.h +%%QT_INCDIR%%/Qt3DInput/qkeyboardinput.h +%%QT_INCDIR%%/Qt3DInput/qmousecontroller.h +%%QT_INCDIR%%/Qt3DInput/qmouseinput.h +%%QT_INCDIR%%/Qt3DInput/qt3dinput_global.h +%%QT_INCDIR%%/Qt3DInput/qt3dinputversion.h +%%QT_INCDIR%%/Qt3DLogic/%%FULLVER%%/Qt3DLogic/private/handle_types_p.h +%%QT_INCDIR%%/Qt3DLogic/%%FULLVER%%/Qt3DLogic/private/logiccallbackjob_p.h +%%QT_INCDIR%%/Qt3DLogic/%%FULLVER%%/Qt3DLogic/private/logicexecutor_p.h +%%QT_INCDIR%%/Qt3DLogic/%%FULLVER%%/Qt3DLogic/private/logichandler_p.h +%%QT_INCDIR%%/Qt3DLogic/%%FULLVER%%/Qt3DLogic/private/logicmanager_p.h +%%QT_INCDIR%%/Qt3DLogic/%%FULLVER%%/Qt3DLogic/private/logicmanagers_p.h +%%QT_INCDIR%%/Qt3DLogic/%%FULLVER%%/Qt3DLogic/private/qlogicaspect_p.h +%%QT_INCDIR%%/Qt3DLogic/%%FULLVER%%/Qt3DLogic/private/qlogiccomponent_p.h +%%QT_INCDIR%%/Qt3DLogic/QLogicAspect +%%QT_INCDIR%%/Qt3DLogic/QLogicComponent +%%QT_INCDIR%%/Qt3DLogic/Qt3DLogic +%%QT_INCDIR%%/Qt3DLogic/Qt3DLogicDepends +%%QT_INCDIR%%/Qt3DLogic/Qt3DLogicVersion +%%QT_INCDIR%%/Qt3DLogic/qlogicaspect.h +%%QT_INCDIR%%/Qt3DLogic/qlogiccomponent.h +%%QT_INCDIR%%/Qt3DLogic/qt3dlogic_global.h +%%QT_INCDIR%%/Qt3DLogic/qt3dlogicversion.h +%%QT_INCDIR%%/Qt3DQuick/%%FULLVER%%/Qt3DQuick/private/qqmlaspectengine_p.h +%%QT_INCDIR%%/Qt3DQuick/%%FULLVER%%/Qt3DQuick/private/qt3dquick_global_p.h +%%QT_INCDIR%%/Qt3DQuick/%%FULLVER%%/Qt3DQuick/private/qt3dquickvaluetypes_p.h +%%QT_INCDIR%%/Qt3DQuick/%%FULLVER%%/Qt3DQuick/private/quick3dentityloader_p.h +%%QT_INCDIR%%/Qt3DQuick/%%FULLVER%%/Qt3DQuick/private/quick3dnodeinstantiator_p.h +%%QT_INCDIR%%/Qt3DQuick/%%FULLVER%%/Qt3DQuick/private/quick3dnodeinstantiator_p_p.h +%%QT_INCDIR%%/Qt3DQuick/QQmlAspectEngine +%%QT_INCDIR%%/Qt3DQuick/Qt3DQuick +%%QT_INCDIR%%/Qt3DQuick/Qt3DQuickDepends +%%QT_INCDIR%%/Qt3DQuick/Qt3DQuickVersion +%%QT_INCDIR%%/Qt3DQuick/Quick3DConfiguration +%%QT_INCDIR%%/Qt3DQuick/Quick3DEntity +%%QT_INCDIR%%/Qt3DQuick/Quick3DEntityLoader +%%QT_INCDIR%%/Qt3DQuick/Quick3DNode +%%QT_INCDIR%%/Qt3DQuick/Quick3DTransform +%%QT_INCDIR%%/Qt3DQuick/qqmlaspectengine.h +%%QT_INCDIR%%/Qt3DQuick/qt3dquick_global.h +%%QT_INCDIR%%/Qt3DQuick/qt3dquickversion.h +%%QT_INCDIR%%/Qt3DQuick/quick3dconfiguration.h +%%QT_INCDIR%%/Qt3DQuick/quick3dentity.h +%%QT_INCDIR%%/Qt3DQuick/quick3dentityloader.h +%%QT_INCDIR%%/Qt3DQuick/quick3dnode.h +%%QT_INCDIR%%/Qt3DQuick/quick3dtransform.h +%%QT_INCDIR%%/Qt3DQuickRenderer/%%FULLVER%%/Qt3DQuickRenderer/private/quick3dparameter_p.h +%%QT_INCDIR%%/Qt3DQuickRenderer/%%FULLVER%%/Qt3DQuickRenderer/private/shaderpropertyparser_p.h +%%QT_INCDIR%%/Qt3DQuickRenderer/Qt3DQuickRenderer +%%QT_INCDIR%%/Qt3DQuickRenderer/Qt3DQuickRendererDepends +%%QT_INCDIR%%/Qt3DQuickRenderer/Qt3DQuickRendererVersion +%%QT_INCDIR%%/Qt3DQuickRenderer/Quick3DEffect +%%QT_INCDIR%%/Qt3DQuickRenderer/Quick3DGeometry +%%QT_INCDIR%%/Qt3DQuickRenderer/Quick3DMaterial +%%QT_INCDIR%%/Qt3DQuickRenderer/Quick3DParameter +%%QT_INCDIR%%/Qt3DQuickRenderer/Quick3DRenderPass +%%QT_INCDIR%%/Qt3DQuickRenderer/Quick3DRenderPassFilter +%%QT_INCDIR%%/Qt3DQuickRenderer/Quick3DRenderTarget +%%QT_INCDIR%%/Qt3DQuickRenderer/Quick3DRenderTargetSelector +%%QT_INCDIR%%/Qt3DQuickRenderer/Quick3DScene +%%QT_INCDIR%%/Qt3DQuickRenderer/Quick3DShaderData +%%QT_INCDIR%%/Qt3DQuickRenderer/Quick3DShaderDataArray +%%QT_INCDIR%%/Qt3DQuickRenderer/Quick3DSortMethod +%%QT_INCDIR%%/Qt3DQuickRenderer/Quick3DStateSet +%%QT_INCDIR%%/Qt3DQuickRenderer/Quick3DTechnique +%%QT_INCDIR%%/Qt3DQuickRenderer/Quick3DTechniqueFilter +%%QT_INCDIR%%/Qt3DQuickRenderer/Quick3DTextureExtension +%%QT_INCDIR%%/Qt3DQuickRenderer/Quick3DViewport +%%QT_INCDIR%%/Qt3DQuickRenderer/qt3dquickrenderer_global.h +%%QT_INCDIR%%/Qt3DQuickRenderer/qt3dquickrendererversion.h +%%QT_INCDIR%%/Qt3DQuickRenderer/quick3deffect.h +%%QT_INCDIR%%/Qt3DQuickRenderer/quick3dgeometry.h +%%QT_INCDIR%%/Qt3DQuickRenderer/quick3dmaterial.h +%%QT_INCDIR%%/Qt3DQuickRenderer/quick3dparameter.h +%%QT_INCDIR%%/Qt3DQuickRenderer/quick3drenderpass.h +%%QT_INCDIR%%/Qt3DQuickRenderer/quick3drenderpassfilter.h +%%QT_INCDIR%%/Qt3DQuickRenderer/quick3drendertarget.h +%%QT_INCDIR%%/Qt3DQuickRenderer/quick3drendertargetselector.h +%%QT_INCDIR%%/Qt3DQuickRenderer/quick3dscene.h +%%QT_INCDIR%%/Qt3DQuickRenderer/quick3dshaderdata.h +%%QT_INCDIR%%/Qt3DQuickRenderer/quick3dshaderdataarray.h +%%QT_INCDIR%%/Qt3DQuickRenderer/quick3dsortmethod.h +%%QT_INCDIR%%/Qt3DQuickRenderer/quick3dstateset.h +%%QT_INCDIR%%/Qt3DQuickRenderer/quick3dtechnique.h +%%QT_INCDIR%%/Qt3DQuickRenderer/quick3dtechniquefilter.h +%%QT_INCDIR%%/Qt3DQuickRenderer/quick3dtexture.h +%%QT_INCDIR%%/Qt3DQuickRenderer/quick3dviewport.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/abstractsceneparser_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/attachmentpack_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/blendstate_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/buffermanager_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/cameraselectornode_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/clearbuffer_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/framecleanupjob_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/framegraphnode_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/framegraphsubtreeselector_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/framegraphvisitor_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/framepreparationjob_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/genericstate_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/geometryrenderermanager_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/handle_types_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/layerfilternode_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/loadbufferjob_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/loadgeometryjob_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/loadscenejob_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/loadtexturedatajob_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/managers_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/nodraw_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/objloader_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/parameterpack_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/platformsurfacefilter_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qabstractlight_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qabstractsceneloader_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qabstracttextureimage_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qabstracttextureprovider_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qannotation_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qattribute_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qbuffer_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qcameraselector_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qclearbuffer_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qdiffusemapmaterial_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qdiffusespecularmapmaterial_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qdirectionallight_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qeffect_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qforwardrenderer_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qframegraph_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qframegraphnode_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qframegraphselector_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qgeometryrenderer_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qgoochmaterial_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qgraphicscontext_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qgraphicshelperes2_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qgraphicshelpergl2_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qgraphicshelpergl3_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qgraphicshelpergl4_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qgraphicshelperinterface_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qgraphicsutils_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qlayer_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qlayerfilter_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qmaterial_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qmesh_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qnormaldiffusemapalphamaterial_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qnormaldiffusemapmaterial_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qnormaldiffusespecularmapmaterial_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qparameter_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qparametermapping_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qpervertexcolormaterial_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qphongmaterial_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qpointlight_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qraycastingservice_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qrenderaspect_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qrenderattachment_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qrenderpass_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qrenderpassfilter_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qrenderstate_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qrendertarget_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qrendertargetselector_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qshaderdata_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qshaderprogram_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qskyboxentity_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qsortcriterion_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qsortmethod_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qspotlight_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qstateset_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qt3drenderer_global_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qtechnique_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qtechniquefilter_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/quniformvalue_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qviewport_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/qwindow_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderannotation_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderattachment_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderattribute_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderbuffer_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/rendercameralens_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/rendercommand_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderconfiguration_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/rendereffect_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderentity_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderer_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/rendergeometry_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/rendergeometryrenderer_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderlayer_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderlogging_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/rendermaterial_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/rendernodefunctor_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderparameter_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderparametermapping_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderpassfilternode_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderqueue_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderrenderpass_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderscene_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/rendershader_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/rendershaderdata_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderstate_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/rendertarget_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/rendertargetselectornode_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/rendertechnique_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/rendertexture_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/rendertextureimage_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderthread_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/rendertransform_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderview_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderviewjob_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/renderviewjobutils_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/scenemanager_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/shadervariables_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/sortcriterion_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/sortmethod_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/statesetnode_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/techniquefilternode_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/texturedatamanager_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/uniformbuffer_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/updateboundingvolumejob_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/updateworldtransformjob_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/viewportnode_p.h +%%QT_INCDIR%%/Qt3DRenderer/%%FULLVER%%/Qt3DRenderer/private/vsyncframeadvanceservice_p.h +%%QT_INCDIR%%/Qt3DRenderer/ParameterList +%%QT_INCDIR%%/Qt3DRenderer/PropertyReaderInterface +%%QT_INCDIR%%/Qt3DRenderer/PropertyReaderInterfacePtr +%%QT_INCDIR%%/Qt3DRenderer/QAbstractLight +%%QT_INCDIR%%/Qt3DRenderer/QAbstractSceneLoader +%%QT_INCDIR%%/Qt3DRenderer/QAbstractTextureImage +%%QT_INCDIR%%/Qt3DRenderer/QAbstractTextureProvider +%%QT_INCDIR%%/Qt3DRenderer/QAlphaCoverage +%%QT_INCDIR%%/Qt3DRenderer/QAlphaTest +%%QT_INCDIR%%/Qt3DRenderer/QAnnotation +%%QT_INCDIR%%/Qt3DRenderer/QAttribute +%%QT_INCDIR%%/Qt3DRenderer/QAttributeList +%%QT_INCDIR%%/Qt3DRenderer/QBlendEquation +%%QT_INCDIR%%/Qt3DRenderer/QBlendState +%%QT_INCDIR%%/Qt3DRenderer/QBlendStateSeparate +%%QT_INCDIR%%/Qt3DRenderer/QBuffer +%%QT_INCDIR%%/Qt3DRenderer/QBufferFunctor +%%QT_INCDIR%%/Qt3DRenderer/QBufferFunctorPtr +%%QT_INCDIR%%/Qt3DRenderer/QCameraSelector +%%QT_INCDIR%%/Qt3DRenderer/QClearBuffer +%%QT_INCDIR%%/Qt3DRenderer/QClipPlane +%%QT_INCDIR%%/Qt3DRenderer/QColorMask +%%QT_INCDIR%%/Qt3DRenderer/QCuboidMesh +%%QT_INCDIR%%/Qt3DRenderer/QCullFace +%%QT_INCDIR%%/Qt3DRenderer/QCylinderMesh +%%QT_INCDIR%%/Qt3DRenderer/QDepthMask +%%QT_INCDIR%%/Qt3DRenderer/QDepthTest +%%QT_INCDIR%%/Qt3DRenderer/QDiffuseMapMaterial +%%QT_INCDIR%%/Qt3DRenderer/QDiffuseSpecularMapMaterial +%%QT_INCDIR%%/Qt3DRenderer/QDirectionalLight +%%QT_INCDIR%%/Qt3DRenderer/QDithering +%%QT_INCDIR%%/Qt3DRenderer/QEffect +%%QT_INCDIR%%/Qt3DRenderer/QForwardRenderer +%%QT_INCDIR%%/Qt3DRenderer/QFrameGraph +%%QT_INCDIR%%/Qt3DRenderer/QFrameGraphNode +%%QT_INCDIR%%/Qt3DRenderer/QFrameGraphSelector +%%QT_INCDIR%%/Qt3DRenderer/QFrameGraphSelectorFunctor +%%QT_INCDIR%%/Qt3DRenderer/QFrameGraphSelectorFunctorPtr +%%QT_INCDIR%%/Qt3DRenderer/QFrontFace +%%QT_INCDIR%%/Qt3DRenderer/QGeometry +%%QT_INCDIR%%/Qt3DRenderer/QGeometryFunctor +%%QT_INCDIR%%/Qt3DRenderer/QGeometryFunctorPtr +%%QT_INCDIR%%/Qt3DRenderer/QGeometryRenderer +%%QT_INCDIR%%/Qt3DRenderer/QGoochMaterial +%%QT_INCDIR%%/Qt3DRenderer/QItemModelBuffer +%%QT_INCDIR%%/Qt3DRenderer/QLayer +%%QT_INCDIR%%/Qt3DRenderer/QLayerFilter +%%QT_INCDIR%%/Qt3DRenderer/QMaterial +%%QT_INCDIR%%/Qt3DRenderer/QMesh +%%QT_INCDIR%%/Qt3DRenderer/QNoDraw +%%QT_INCDIR%%/Qt3DRenderer/QNormalDiffuseMapAlphaMaterial +%%QT_INCDIR%%/Qt3DRenderer/QNormalDiffuseMapMaterial +%%QT_INCDIR%%/Qt3DRenderer/QNormalDiffuseSpecularMapMaterial +%%QT_INCDIR%%/Qt3DRenderer/QOpenGLFilter +%%QT_INCDIR%%/Qt3DRenderer/QParameter +%%QT_INCDIR%%/Qt3DRenderer/QParameterMapping +%%QT_INCDIR%%/Qt3DRenderer/QPerVertexColorMaterial +%%QT_INCDIR%%/Qt3DRenderer/QPhongMaterial +%%QT_INCDIR%%/Qt3DRenderer/QPlaneMesh +%%QT_INCDIR%%/Qt3DRenderer/QPointLight +%%QT_INCDIR%%/Qt3DRenderer/QPolygonOffset +%%QT_INCDIR%%/Qt3DRenderer/QRayCastingService +%%QT_INCDIR%%/Qt3DRenderer/QRenderAspect +%%QT_INCDIR%%/Qt3DRenderer/QRenderAttachment +%%QT_INCDIR%%/Qt3DRenderer/QRenderPass +%%QT_INCDIR%%/Qt3DRenderer/QRenderPassFilter +%%QT_INCDIR%%/Qt3DRenderer/QRenderState +%%QT_INCDIR%%/Qt3DRenderer/QRenderTarget +%%QT_INCDIR%%/Qt3DRenderer/QRenderTargetSelector +%%QT_INCDIR%%/Qt3DRenderer/QSceneLoader +%%QT_INCDIR%%/Qt3DRenderer/QScissorTest +%%QT_INCDIR%%/Qt3DRenderer/QShaderData +%%QT_INCDIR%%/Qt3DRenderer/QShaderProgram +%%QT_INCDIR%%/Qt3DRenderer/QSkyboxEntity +%%QT_INCDIR%%/Qt3DRenderer/QSortCriterion +%%QT_INCDIR%%/Qt3DRenderer/QSortMethod +%%QT_INCDIR%%/Qt3DRenderer/QSphereMesh +%%QT_INCDIR%%/Qt3DRenderer/QSpotLight +%%QT_INCDIR%%/Qt3DRenderer/QStateSet +%%QT_INCDIR%%/Qt3DRenderer/QStencilMask +%%QT_INCDIR%%/Qt3DRenderer/QStencilOp +%%QT_INCDIR%%/Qt3DRenderer/QStencilOpSeparate +%%QT_INCDIR%%/Qt3DRenderer/QStencilTest +%%QT_INCDIR%%/Qt3DRenderer/QStencilTestSeparate +%%QT_INCDIR%%/Qt3DRenderer/QTechnique +%%QT_INCDIR%%/Qt3DRenderer/QTechniqueFilter +%%QT_INCDIR%%/Qt3DRenderer/QTexture +%%QT_INCDIR%%/Qt3DRenderer/QTexture1D +%%QT_INCDIR%%/Qt3DRenderer/QTexture1DArray +%%QT_INCDIR%%/Qt3DRenderer/QTexture2D +%%QT_INCDIR%%/Qt3DRenderer/QTexture2DArray +%%QT_INCDIR%%/Qt3DRenderer/QTexture2DMultisample +%%QT_INCDIR%%/Qt3DRenderer/QTexture2DMultisampleArray +%%QT_INCDIR%%/Qt3DRenderer/QTexture3D +%%QT_INCDIR%%/Qt3DRenderer/QTextureBuffer +%%QT_INCDIR%%/Qt3DRenderer/QTextureCubeMap +%%QT_INCDIR%%/Qt3DRenderer/QTextureCubeMapArray +%%QT_INCDIR%%/Qt3DRenderer/QTextureDataFunctor +%%QT_INCDIR%%/Qt3DRenderer/QTextureDataFunctorPtr +%%QT_INCDIR%%/Qt3DRenderer/QTextureImage +%%QT_INCDIR%%/Qt3DRenderer/QTextureRectangle +%%QT_INCDIR%%/Qt3DRenderer/QTextureWrapMode +%%QT_INCDIR%%/Qt3DRenderer/QTorusMesh +%%QT_INCDIR%%/Qt3DRenderer/QViewport +%%QT_INCDIR%%/Qt3DRenderer/QWindow +%%QT_INCDIR%%/Qt3DRenderer/Qt3DRenderer +%%QT_INCDIR%%/Qt3DRenderer/Qt3DRendererDepends +%%QT_INCDIR%%/Qt3DRenderer/Qt3DRendererVersion +%%QT_INCDIR%%/Qt3DRenderer/Sphere +%%QT_INCDIR%%/Qt3DRenderer/TexImageData +%%QT_INCDIR%%/Qt3DRenderer/TexImageDataPtr +%%QT_INCDIR%%/Qt3DRenderer/TextureDict +%%QT_INCDIR%%/Qt3DRenderer/qabstractlight.h +%%QT_INCDIR%%/Qt3DRenderer/qabstractsceneloader.h +%%QT_INCDIR%%/Qt3DRenderer/qabstracttextureimage.h +%%QT_INCDIR%%/Qt3DRenderer/qabstracttextureprovider.h +%%QT_INCDIR%%/Qt3DRenderer/qalphacoverage.h +%%QT_INCDIR%%/Qt3DRenderer/qalphatest.h +%%QT_INCDIR%%/Qt3DRenderer/qannotation.h +%%QT_INCDIR%%/Qt3DRenderer/qattribute.h +%%QT_INCDIR%%/Qt3DRenderer/qblendequation.h +%%QT_INCDIR%%/Qt3DRenderer/qblendstate.h +%%QT_INCDIR%%/Qt3DRenderer/qbuffer.h +%%QT_INCDIR%%/Qt3DRenderer/qbufferfunctor.h +%%QT_INCDIR%%/Qt3DRenderer/qcameraselector.h +%%QT_INCDIR%%/Qt3DRenderer/qclearbuffer.h +%%QT_INCDIR%%/Qt3DRenderer/qclipplane.h +%%QT_INCDIR%%/Qt3DRenderer/qcolormask.h +%%QT_INCDIR%%/Qt3DRenderer/qcuboidmesh.h +%%QT_INCDIR%%/Qt3DRenderer/qcullface.h +%%QT_INCDIR%%/Qt3DRenderer/qcylindermesh.h +%%QT_INCDIR%%/Qt3DRenderer/qdepthmask.h +%%QT_INCDIR%%/Qt3DRenderer/qdepthtest.h +%%QT_INCDIR%%/Qt3DRenderer/qdiffusemapmaterial.h +%%QT_INCDIR%%/Qt3DRenderer/qdiffusespecularmapmaterial.h +%%QT_INCDIR%%/Qt3DRenderer/qdirectionallight.h +%%QT_INCDIR%%/Qt3DRenderer/qdithering.h +%%QT_INCDIR%%/Qt3DRenderer/qeffect.h +%%QT_INCDIR%%/Qt3DRenderer/qforwardrenderer.h +%%QT_INCDIR%%/Qt3DRenderer/qframegraph.h +%%QT_INCDIR%%/Qt3DRenderer/qframegraphnode.h +%%QT_INCDIR%%/Qt3DRenderer/qframegraphselector.h +%%QT_INCDIR%%/Qt3DRenderer/qfrontface.h +%%QT_INCDIR%%/Qt3DRenderer/qgeometry.h +%%QT_INCDIR%%/Qt3DRenderer/qgeometryfunctor.h +%%QT_INCDIR%%/Qt3DRenderer/qgeometryrenderer.h +%%QT_INCDIR%%/Qt3DRenderer/qgoochmaterial.h +%%QT_INCDIR%%/Qt3DRenderer/qitemmodelbuffer.h +%%QT_INCDIR%%/Qt3DRenderer/qlayer.h +%%QT_INCDIR%%/Qt3DRenderer/qlayerfilter.h +%%QT_INCDIR%%/Qt3DRenderer/qmaterial.h +%%QT_INCDIR%%/Qt3DRenderer/qmesh.h +%%QT_INCDIR%%/Qt3DRenderer/qnodraw.h +%%QT_INCDIR%%/Qt3DRenderer/qnormaldiffusemapalphamaterial.h +%%QT_INCDIR%%/Qt3DRenderer/qnormaldiffusemapmaterial.h +%%QT_INCDIR%%/Qt3DRenderer/qnormaldiffusespecularmapmaterial.h +%%QT_INCDIR%%/Qt3DRenderer/qopenglfilter.h +%%QT_INCDIR%%/Qt3DRenderer/qparameter.h +%%QT_INCDIR%%/Qt3DRenderer/qparametermapping.h +%%QT_INCDIR%%/Qt3DRenderer/qpervertexcolormaterial.h +%%QT_INCDIR%%/Qt3DRenderer/qphongmaterial.h +%%QT_INCDIR%%/Qt3DRenderer/qplanemesh.h +%%QT_INCDIR%%/Qt3DRenderer/qpointlight.h +%%QT_INCDIR%%/Qt3DRenderer/qpolygonoffset.h +%%QT_INCDIR%%/Qt3DRenderer/qraycastingservice.h +%%QT_INCDIR%%/Qt3DRenderer/qrenderaspect.h +%%QT_INCDIR%%/Qt3DRenderer/qrenderattachment.h +%%QT_INCDIR%%/Qt3DRenderer/qrenderpass.h +%%QT_INCDIR%%/Qt3DRenderer/qrenderpassfilter.h +%%QT_INCDIR%%/Qt3DRenderer/qrenderstate.h +%%QT_INCDIR%%/Qt3DRenderer/qrendertarget.h +%%QT_INCDIR%%/Qt3DRenderer/qrendertargetselector.h +%%QT_INCDIR%%/Qt3DRenderer/qsceneloader.h +%%QT_INCDIR%%/Qt3DRenderer/qscissortest.h +%%QT_INCDIR%%/Qt3DRenderer/qshaderdata.h +%%QT_INCDIR%%/Qt3DRenderer/qshaderprogram.h +%%QT_INCDIR%%/Qt3DRenderer/qskyboxentity.h +%%QT_INCDIR%%/Qt3DRenderer/qsortcriterion.h +%%QT_INCDIR%%/Qt3DRenderer/qsortmethod.h +%%QT_INCDIR%%/Qt3DRenderer/qspheremesh.h +%%QT_INCDIR%%/Qt3DRenderer/qspotlight.h +%%QT_INCDIR%%/Qt3DRenderer/qstateset.h +%%QT_INCDIR%%/Qt3DRenderer/qstencilmask.h +%%QT_INCDIR%%/Qt3DRenderer/qstencilop.h +%%QT_INCDIR%%/Qt3DRenderer/qstencilopseparate.h +%%QT_INCDIR%%/Qt3DRenderer/qstenciltest.h +%%QT_INCDIR%%/Qt3DRenderer/qstenciltestseparate.h +%%QT_INCDIR%%/Qt3DRenderer/qt3drenderer_global.h +%%QT_INCDIR%%/Qt3DRenderer/qt3drendererversion.h +%%QT_INCDIR%%/Qt3DRenderer/qtechnique.h +%%QT_INCDIR%%/Qt3DRenderer/qtechniquefilter.h +%%QT_INCDIR%%/Qt3DRenderer/qtexture.h +%%QT_INCDIR%%/Qt3DRenderer/qtextureimage.h +%%QT_INCDIR%%/Qt3DRenderer/qtextureproviders.h +%%QT_INCDIR%%/Qt3DRenderer/qtorusmesh.h +%%QT_INCDIR%%/Qt3DRenderer/qviewport.h +%%QT_INCDIR%%/Qt3DRenderer/qwindow.h +%%QT_INCDIR%%/Qt3DRenderer/qwrapmode.h +%%QT_INCDIR%%/Qt3DRenderer/sphere.h +%%QT_INCDIR%%/Qt3DRenderer/texturedata.h +%%QT_LIBDIR%%/cmake/Qt53DCollision/Qt53DCollisionConfig.cmake +%%QT_LIBDIR%%/cmake/Qt53DCollision/Qt53DCollisionConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt53DCore/Qt53DCoreConfig.cmake +%%QT_LIBDIR%%/cmake/Qt53DCore/Qt53DCoreConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt53DInput/Qt53DInputConfig.cmake +%%QT_LIBDIR%%/cmake/Qt53DInput/Qt53DInputConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt53DLogic/Qt53DLogicConfig.cmake +%%QT_LIBDIR%%/cmake/Qt53DLogic/Qt53DLogicConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt53DQuick/Qt53DQuickConfig.cmake +%%QT_LIBDIR%%/cmake/Qt53DQuick/Qt53DQuickConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt53DQuickRenderer/Qt53DQuickRendererConfig.cmake +%%QT_LIBDIR%%/cmake/Qt53DQuickRenderer/Qt53DQuickRendererConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt53DRenderer/Qt53DRendererConfig.cmake +%%QT_LIBDIR%%/cmake/Qt53DRenderer/Qt53DRendererConfigVersion.cmake +%%QT_LIBDIR%%/cmake/Qt53DRenderer/Qt53DRenderer_GLTFParser.cmake +%%QT_LIBDIR%%/libQt53DCollision.prl +%%QT_LIBDIR%%/libQt53DCollision.so +%%QT_LIBDIR%%/libQt53DCollision.so.5 +%%QT_LIBDIR%%/libQt53DCollision.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt53DCollision.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt53DCollision.so.%%FULLVER%%.debug +%%QT_LIBDIR%%/libQt53DCore.prl +%%QT_LIBDIR%%/libQt53DCore.so +%%QT_LIBDIR%%/libQt53DCore.so.5 +%%QT_LIBDIR%%/libQt53DCore.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt53DCore.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt53DCore.so.%%FULLVER%%.debug +%%QT_LIBDIR%%/libQt53DInput.prl +%%QT_LIBDIR%%/libQt53DInput.so +%%QT_LIBDIR%%/libQt53DInput.so.5 +%%QT_LIBDIR%%/libQt53DInput.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt53DInput.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt53DInput.so.%%FULLVER%%.debug +%%QT_LIBDIR%%/libQt53DLogic.prl +%%QT_LIBDIR%%/libQt53DLogic.so +%%QT_LIBDIR%%/libQt53DLogic.so.5 +%%QT_LIBDIR%%/libQt53DLogic.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt53DLogic.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt53DLogic.so.%%FULLVER%%.debug +%%QT_LIBDIR%%/libQt53DQuick.prl +%%QT_LIBDIR%%/libQt53DQuick.so +%%QT_LIBDIR%%/libQt53DQuick.so.5 +%%QT_LIBDIR%%/libQt53DQuick.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt53DQuick.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt53DQuick.so.%%FULLVER%%.debug +%%QT_LIBDIR%%/libQt53DQuickRenderer.prl +%%QT_LIBDIR%%/libQt53DQuickRenderer.so +%%QT_LIBDIR%%/libQt53DQuickRenderer.so.5 +%%QT_LIBDIR%%/libQt53DQuickRenderer.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt53DQuickRenderer.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt53DQuickRenderer.so.%%FULLVER%%.debug +%%QT_LIBDIR%%/libQt53DRenderer.prl +%%QT_LIBDIR%%/libQt53DRenderer.so +%%QT_LIBDIR%%/libQt53DRenderer.so.5 +%%QT_LIBDIR%%/libQt53DRenderer.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt53DRenderer.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt53DRenderer.so.%%FULLVER%%.debug +%%QT_MKSPECDIR%%/modules/qt_lib_3dcollision.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3dcollision_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3dcore.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3dcore_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3dinput.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3dinput_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3dlogic.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3dlogic_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3dquick.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3dquick_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3dquickrenderer.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3dquickrenderer_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3drenderer.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3drenderer_private.pri +%%QT_PLUGINDIR%%/sceneparsers/libgltfsceneparser.so +%%DEBUG%%%%QT_PLUGINDIR%%/sceneparsers/libgltfsceneparser.so.debug +%%QT_QMLDIR%%/Qt3D/Collision/libquick3dcollisionplugin.so +%%DEBUG%%%%QT_QMLDIR%%/Qt3D/Collision/libquick3dcollisionplugin.so.debug +%%QT_QMLDIR%%/Qt3D/Collision/qmldir +%%QT_QMLDIR%%/Qt3D/Input/libquick3dinputplugin.so +%%DEBUG%%%%QT_QMLDIR%%/Qt3D/Input/libquick3dinputplugin.so.debug +%%QT_QMLDIR%%/Qt3D/Input/qmldir +%%QT_QMLDIR%%/Qt3D/Logic/libquick3dlogicplugin.so +%%DEBUG%%%%QT_QMLDIR%%/Qt3D/Logic/libquick3dlogicplugin.so.debug +%%QT_QMLDIR%%/Qt3D/Logic/qmldir +%%QT_QMLDIR%%/Qt3D/Renderer/libquick3drendererplugin.so +%%DEBUG%%%%QT_QMLDIR%%/Qt3D/Renderer/libquick3drendererplugin.so.debug +%%QT_QMLDIR%%/Qt3D/Renderer/qmldir +%%QT_QMLDIR%%/Qt3D/libquick3dcoreplugin.so +%%DEBUG%%%%QT_QMLDIR%%/Qt3D/libquick3dcoreplugin.so.debug +%%QT_QMLDIR%%/Qt3D/qmldir +%%QT_QMLDIR%%/QtQuick/Scene3D/libqtquickscene3dplugin.so +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Scene3D/libqtquickscene3dplugin.so.debug +%%QT_QMLDIR%%/QtQuick/Scene3D/qmldir +libdata/pkgconfig/Qt53DCollision.pc +libdata/pkgconfig/Qt53DCore.pc +libdata/pkgconfig/Qt53DInput.pc +libdata/pkgconfig/Qt53DLogic.pc +libdata/pkgconfig/Qt53DQuick.pc +libdata/pkgconfig/Qt53DQuickRenderer.pc +libdata/pkgconfig/Qt53DRenderer.pc diff --git a/graphics/qt5-pixeltool/Makefile b/graphics/qt5-pixeltool/Makefile index d6bced7cae9d..0932416f1af3 100644 --- a/graphics/qt5-pixeltool/Makefile +++ b/graphics/qt5-pixeltool/Makefile @@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 screen magnifier -USE_QT5= core network widgets buildtools_build +USE_QT5= core gui widgets buildtools_build QT_DIST= tools USES= qmake diff --git a/graphics/qt5-pixeltool/files/patch-git_a685d8a b/graphics/qt5-pixeltool/files/patch-git_a685d8a new file mode 100644 index 000000000000..5f25c96cfd43 --- /dev/null +++ b/graphics/qt5-pixeltool/files/patch-git_a685d8a @@ -0,0 +1,20 @@ +commit a685d8ad61335ce9908bf5ce4d4cd63283965a83 +Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Tue Jan 19 15:19:49 2016 +0100 + + pixeltool: Stop depending on QtNetwork. + + There is nothing in the code using the QtNetwork module, so stop + requiring it in the build system. + + Change-Id: I1f7bc89a9589dc2510f38a11fc4b4aeb69d662bc + Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> + +--- src/pixeltool/pixeltool.pro ++++ src/pixeltool/pixeltool.pro +@@ -1,4 +1,4 @@ +-QT += widgets network ++QT += widgets + + mac { + QMAKE_INFO_PLIST=Info_mac.plist diff --git a/graphics/qt5-pixeltool/files/patch-src__src.pro b/graphics/qt5-pixeltool/files/patch-src__src.pro index 966cb3496f48..81e5d1f3852c 100644 --- a/graphics/qt5-pixeltool/files/patch-src__src.pro +++ b/graphics/qt5-pixeltool/files/patch-src__src.pro @@ -3,7 +3,7 @@ missing dependencies. --- src/src.pro +++ src/src.pro -@@ -1,38 +1,2 @@ +@@ -1,37 +1,2 @@ TEMPLATE = subdirs - -qtHaveModule(widgets) { @@ -14,13 +14,13 @@ missing dependencies. - pixeltool \ - qtestlib \ - designer --# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig - - linguist.depends = designer - } -} - --SUBDIRS += linguist +-SUBDIRS += linguist \ +- qtplugininfo -if(!android|android_app):!ios: SUBDIRS += qtpaths - -mac { @@ -39,7 +39,6 @@ missing dependencies. - -qtNomakeTools( \ - pixeltool \ -- qtconfig \ - macdeployqt \ -) +SUBDIRS = pixeltool diff --git a/graphics/qt5-svg/Makefile b/graphics/qt5-svg/Makefile index 85deedeeb6a2..06af1c12e8c7 100644 --- a/graphics/qt5-svg/Makefile +++ b/graphics/qt5-svg/Makefile @@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt SVG support module -USE_QT5= core gui widgets xml buildtools_build +USE_QT5= core gui widgets buildtools_build QT_DIST= ${PORTNAME} USES= qmake USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/lang/qt5-qml/files/patch-git_cf6e9711 b/lang/qt5-qml/files/patch-git_cf6e9711 deleted file mode 100644 index 54a4b13f6c9b..000000000000 --- a/lang/qt5-qml/files/patch-git_cf6e9711 +++ /dev/null @@ -1,26 +0,0 @@ -commit cf6e97119df5bf17b4a952b257d05d43b7d6ca26 -Author: Alex Richardson <arichardson.kde@gmail.com> -Date: Wed Jan 21 09:10:01 2015 +0000 - - Don't crash on FreeBSD when computing stack limits - - On FreeBSD pthread_attr_t is a pointer and is dereferenced when calling - pthread_attr_get_np() so if we don't initialize it will probably crash. - This is not a problem on glibc systems since there pthread_attr_t is an - opaque union an doesn't need to be allocated using malloc(). - - Change-Id: I227685ddf9981974ade08aee8917f7262c301787 - Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> - ---- src/qml/jsruntime/qv4engine.cpp -+++ src/qml/jsruntime/qv4engine.cpp -@@ -112,7 +112,8 @@ quintptr getStackLimit() - void* stackBottom = 0; - pthread_attr_t attr; - #if HAVE(PTHREAD_NP_H) && OS(FREEBSD) -- if (pthread_attr_get_np(pthread_self(), &attr) == 0) { -+ // on FreeBSD pthread_attr_init() must be called otherwise getting the attrs crashes -+ if (pthread_attr_init(&attr) == 0 && pthread_attr_get_np(pthread_self(), &attr) == 0) { - #else - if (pthread_getattr_np(pthread_self(), &attr) == 0) { - #endif diff --git a/lang/qt5-qml/pkg-plist b/lang/qt5-qml/pkg-plist index 5c2660163aa5..2430945ab262 100644 --- a/lang/qt5-qml/pkg-plist +++ b/lang/qt5-qml/pkg-plist @@ -30,7 +30,6 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlboundsignal_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlboundsignalexpressionpointer_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbuiltinfunctions_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbundle_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlchangeset_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcleanup_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcompiler_p.h @@ -87,9 +86,10 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllocale_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmemoryprofiler_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmetatype_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmodelindexvaluetype_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmodelsmodule_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlnotifier_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlnullablevalue_p_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlnullablevalue_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlobjectcreator_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlobjectmodel_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlopenmetaobject_p.h @@ -107,7 +107,6 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlstringconverters_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlthread_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltimer_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltrace_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypecompiler_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypeloader_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypenamecache_p.h @@ -128,6 +127,7 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qtqmlglobal_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4alloca_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4argumentsobject_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arraybuffer_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arraydata_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arrayobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4assembler_p.h @@ -137,6 +137,7 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compileddata_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compiler_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4context_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4dataview_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4dateobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4debugging_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4debugservice_p.h @@ -190,13 +191,13 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4string_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4stringobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4targetplatform_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4typedarray_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4unop_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4util_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4value_inl_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4value_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4variantobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4vme_moth_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv8debug_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv8engine_p.h %%QT_INCDIR%%/QtQml/QJSEngine %%QT_INCDIR%%/QtQml/QJSValue @@ -261,6 +262,102 @@ %%QT_INCDIR%%/QtQml/qqmlscriptstring.h %%QT_INCDIR%%/QtQml/qtqmlglobal.h %%QT_INCDIR%%/QtQml/qtqmlversion.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qbitfield_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qdeletewatcher_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qfieldlist_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qfinitestack_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qflagpointer_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qhashedstring_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qhashfield_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qintrusivelist_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qlazilyallocated_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qpodvector_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qpointervaluepair_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmlirbuilder_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsast_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsastfwd_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsastvisitor_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsengine_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsglobal_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsgrammar_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljskeywords_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljslexer_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsmemorypool_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsparser_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmlnullablevalue_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmlpool_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmlrefcount_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmlthread_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmltypecompiler_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qrecursionwatcher_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qrecyclepool_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qtqmldevtoolsglobal_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4alloca_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4argumentsobject_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4arraybuffer_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4arraydata_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4arrayobject_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4booleanobject_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4codegen_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4compileddata_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4compiler_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4context_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4dataview_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4dateobject_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4debugging_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4engine_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4errorobject_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4executableallocator_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4function_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4functionobject_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4global_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4globalobject_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4identifier_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4identifiertable_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4include_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4instr_moth_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4internalclass_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4isel_moth_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4isel_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4isel_util_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4jsir_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4jsonobject_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4lookup_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4managed_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4math_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4mathobject_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4memberdata_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4mm_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4numberobject_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4object_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4objectiterator_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4objectproto_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4persistent_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4profiling_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4property_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4qmlextensions_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4qobjectwrapper_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4regexp_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4regexpobject_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4runtime_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4scopedvalue_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4script_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4sequenceobject_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4serialize_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4sparsearray_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4ssa_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4string_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4stringobject_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4typedarray_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4util_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4value_inl_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4value_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4variantobject_p.h +%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4vme_moth_p.h +%%QT_INCDIR%%/QtQmlDevTools/QtQmlDevTools +%%QT_INCDIR%%/QtQmlDevTools/QtQmlDevToolsDepends +%%QT_INCDIR%%/QtQmlDevTools/QtQmlDevToolsVersion +%%QT_INCDIR%%/QtQmlDevTools/qtqmldevtoolsversion.h %%QT_LIBDIR%%/cmake/Qt5Qml/Qt5QmlConfig.cmake %%QT_LIBDIR%%/cmake/Qt5Qml/Qt5QmlConfigVersion.cmake %%QT_LIBDIR%%/libQt5Qml.prl diff --git a/misc/Makefile b/misc/Makefile index 6afcba075b78..fa5407270402 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -393,6 +393,7 @@ SUBDIR += qt4-l10n SUBDIR += qt4-qtconfig SUBDIR += qt4-qtdemo + SUBDIR += qt5-l10n SUBDIR += qt5ct SUBDIR += quotes SUBDIR += raspberrypi-userland diff --git a/misc/qt5-l10n/Makefile b/misc/qt5-l10n/Makefile new file mode 100644 index 000000000000..6793a2fe3d72 --- /dev/null +++ b/misc/qt5-l10n/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PORTNAME= l10n +DISTVERSION= ${QT5_VERSION} +CATEGORIES= misc +PKGNAMEPREFIX= qt5- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt localized messages + +USES= qmake +USE_QT5= qmake_build linguisttools_build +QT_DIST= translations + +.include <bsd.port.mk> diff --git a/misc/qt5-l10n/pkg-plist b/misc/qt5-l10n/pkg-plist new file mode 100644 index 000000000000..66db43041710 --- /dev/null +++ b/misc/qt5-l10n/pkg-plist @@ -0,0 +1,203 @@ +%%QT_L10NDIR%%/assistant_cs.qm +%%QT_L10NDIR%%/assistant_da.qm +%%QT_L10NDIR%%/assistant_de.qm +%%QT_L10NDIR%%/assistant_en.qm +%%QT_L10NDIR%%/assistant_fr.qm +%%QT_L10NDIR%%/assistant_hu.qm +%%QT_L10NDIR%%/assistant_ja.qm +%%QT_L10NDIR%%/assistant_ko.qm +%%QT_L10NDIR%%/assistant_pl.qm +%%QT_L10NDIR%%/assistant_ru.qm +%%QT_L10NDIR%%/assistant_sk.qm +%%QT_L10NDIR%%/assistant_sl.qm +%%QT_L10NDIR%%/assistant_uk.qm +%%QT_L10NDIR%%/assistant_zh_CN.qm +%%QT_L10NDIR%%/assistant_zh_TW.qm +%%QT_L10NDIR%%/designer_cs.qm +%%QT_L10NDIR%%/designer_de.qm +%%QT_L10NDIR%%/designer_en.qm +%%QT_L10NDIR%%/designer_fr.qm +%%QT_L10NDIR%%/designer_hu.qm +%%QT_L10NDIR%%/designer_ja.qm +%%QT_L10NDIR%%/designer_ko.qm +%%QT_L10NDIR%%/designer_pl.qm +%%QT_L10NDIR%%/designer_ru.qm +%%QT_L10NDIR%%/designer_sk.qm +%%QT_L10NDIR%%/designer_sl.qm +%%QT_L10NDIR%%/designer_uk.qm +%%QT_L10NDIR%%/designer_zh_CN.qm +%%QT_L10NDIR%%/designer_zh_TW.qm +%%QT_L10NDIR%%/linguist_cs.qm +%%QT_L10NDIR%%/linguist_de.qm +%%QT_L10NDIR%%/linguist_en.qm +%%QT_L10NDIR%%/linguist_fr.qm +%%QT_L10NDIR%%/linguist_hu.qm +%%QT_L10NDIR%%/linguist_ja.qm +%%QT_L10NDIR%%/linguist_ko.qm +%%QT_L10NDIR%%/linguist_pl.qm +%%QT_L10NDIR%%/linguist_ru.qm +%%QT_L10NDIR%%/linguist_sk.qm +%%QT_L10NDIR%%/linguist_sl.qm +%%QT_L10NDIR%%/linguist_uk.qm +%%QT_L10NDIR%%/linguist_zh_CN.qm +%%QT_L10NDIR%%/linguist_zh_TW.qm +%%QT_L10NDIR%%/qmlviewer_cs.qm +%%QT_L10NDIR%%/qmlviewer_en.qm +%%QT_L10NDIR%%/qmlviewer_fi.qm +%%QT_L10NDIR%%/qmlviewer_fr.qm +%%QT_L10NDIR%%/qmlviewer_hu.qm +%%QT_L10NDIR%%/qmlviewer_ja.qm +%%QT_L10NDIR%%/qmlviewer_ko.qm +%%QT_L10NDIR%%/qmlviewer_ru.qm +%%QT_L10NDIR%%/qmlviewer_sk.qm +%%QT_L10NDIR%%/qmlviewer_uk.qm +%%QT_L10NDIR%%/qt_ar.qm +%%QT_L10NDIR%%/qt_ca.qm +%%QT_L10NDIR%%/qt_cs.qm +%%QT_L10NDIR%%/qt_da.qm +%%QT_L10NDIR%%/qt_de.qm +%%QT_L10NDIR%%/qt_en.qm +%%QT_L10NDIR%%/qt_es.qm +%%QT_L10NDIR%%/qt_fa.qm +%%QT_L10NDIR%%/qt_fi.qm +%%QT_L10NDIR%%/qt_fr.qm +%%QT_L10NDIR%%/qt_gl.qm +%%QT_L10NDIR%%/qt_he.qm +%%QT_L10NDIR%%/qt_help_cs.qm +%%QT_L10NDIR%%/qt_help_da.qm +%%QT_L10NDIR%%/qt_help_de.qm +%%QT_L10NDIR%%/qt_help_en.qm +%%QT_L10NDIR%%/qt_help_fr.qm +%%QT_L10NDIR%%/qt_help_gl.qm +%%QT_L10NDIR%%/qt_help_hu.qm +%%QT_L10NDIR%%/qt_help_it.qm +%%QT_L10NDIR%%/qt_help_ja.qm +%%QT_L10NDIR%%/qt_help_ko.qm +%%QT_L10NDIR%%/qt_help_pl.qm +%%QT_L10NDIR%%/qt_help_ru.qm +%%QT_L10NDIR%%/qt_help_sk.qm +%%QT_L10NDIR%%/qt_help_sl.qm +%%QT_L10NDIR%%/qt_help_uk.qm +%%QT_L10NDIR%%/qt_help_zh_CN.qm +%%QT_L10NDIR%%/qt_help_zh_TW.qm +%%QT_L10NDIR%%/qt_hu.qm +%%QT_L10NDIR%%/qt_it.qm +%%QT_L10NDIR%%/qt_ja.qm +%%QT_L10NDIR%%/qt_ko.qm +%%QT_L10NDIR%%/qt_lt.qm +%%QT_L10NDIR%%/qt_pl.qm +%%QT_L10NDIR%%/qt_pt.qm +%%QT_L10NDIR%%/qt_ru.qm +%%QT_L10NDIR%%/qt_sk.qm +%%QT_L10NDIR%%/qt_sl.qm +%%QT_L10NDIR%%/qt_sv.qm +%%QT_L10NDIR%%/qt_uk.qm +%%QT_L10NDIR%%/qt_zh_CN.qm +%%QT_L10NDIR%%/qt_zh_TW.qm +%%QT_L10NDIR%%/qtbase_ca.qm +%%QT_L10NDIR%%/qtbase_cs.qm +%%QT_L10NDIR%%/qtbase_de.qm +%%QT_L10NDIR%%/qtbase_en.qm +%%QT_L10NDIR%%/qtbase_fi.qm +%%QT_L10NDIR%%/qtbase_fr.qm +%%QT_L10NDIR%%/qtbase_he.qm +%%QT_L10NDIR%%/qtbase_hu.qm +%%QT_L10NDIR%%/qtbase_it.qm +%%QT_L10NDIR%%/qtbase_ja.qm +%%QT_L10NDIR%%/qtbase_ko.qm +%%QT_L10NDIR%%/qtbase_lv.qm +%%QT_L10NDIR%%/qtbase_ru.qm +%%QT_L10NDIR%%/qtbase_sk.qm +%%QT_L10NDIR%%/qtbase_uk.qm +%%QT_L10NDIR%%/qtconfig_hu.qm +%%QT_L10NDIR%%/qtconfig_ja.qm +%%QT_L10NDIR%%/qtconfig_ko.qm +%%QT_L10NDIR%%/qtconfig_pl.qm +%%QT_L10NDIR%%/qtconfig_ru.qm +%%QT_L10NDIR%%/qtconfig_sk.qm +%%QT_L10NDIR%%/qtconfig_sl.qm +%%QT_L10NDIR%%/qtconfig_uk.qm +%%QT_L10NDIR%%/qtconfig_zh_CN.qm +%%QT_L10NDIR%%/qtconfig_zh_TW.qm +%%QT_L10NDIR%%/qtconnectivity_de.qm +%%QT_L10NDIR%%/qtconnectivity_en.qm +%%QT_L10NDIR%%/qtconnectivity_ko.qm +%%QT_L10NDIR%%/qtconnectivity_uk.qm +%%QT_L10NDIR%%/qtdeclarative_de.qm +%%QT_L10NDIR%%/qtdeclarative_en.qm +%%QT_L10NDIR%%/qtdeclarative_fi.qm +%%QT_L10NDIR%%/qtdeclarative_fr.qm +%%QT_L10NDIR%%/qtdeclarative_ja.qm +%%QT_L10NDIR%%/qtdeclarative_ko.qm +%%QT_L10NDIR%%/qtdeclarative_lv.qm +%%QT_L10NDIR%%/qtdeclarative_ru.qm +%%QT_L10NDIR%%/qtdeclarative_sk.qm +%%QT_L10NDIR%%/qtdeclarative_uk.qm +%%QT_L10NDIR%%/qtlocation_de.qm +%%QT_L10NDIR%%/qtlocation_en.qm +%%QT_L10NDIR%%/qtlocation_fr.qm +%%QT_L10NDIR%%/qtlocation_ko.qm +%%QT_L10NDIR%%/qtlocation_uk.qm +%%QT_L10NDIR%%/qtmultimedia_ca.qm +%%QT_L10NDIR%%/qtmultimedia_cs.qm +%%QT_L10NDIR%%/qtmultimedia_de.qm +%%QT_L10NDIR%%/qtmultimedia_en.qm +%%QT_L10NDIR%%/qtmultimedia_fi.qm +%%QT_L10NDIR%%/qtmultimedia_fr.qm +%%QT_L10NDIR%%/qtmultimedia_hu.qm +%%QT_L10NDIR%%/qtmultimedia_it.qm +%%QT_L10NDIR%%/qtmultimedia_ja.qm +%%QT_L10NDIR%%/qtmultimedia_ko.qm +%%QT_L10NDIR%%/qtmultimedia_ru.qm +%%QT_L10NDIR%%/qtmultimedia_sk.qm +%%QT_L10NDIR%%/qtmultimedia_uk.qm +%%QT_L10NDIR%%/qtquick1_ca.qm +%%QT_L10NDIR%%/qtquick1_cs.qm +%%QT_L10NDIR%%/qtquick1_de.qm +%%QT_L10NDIR%%/qtquick1_en.qm +%%QT_L10NDIR%%/qtquick1_fi.qm +%%QT_L10NDIR%%/qtquick1_fr.qm +%%QT_L10NDIR%%/qtquick1_he.qm +%%QT_L10NDIR%%/qtquick1_hu.qm +%%QT_L10NDIR%%/qtquick1_it.qm +%%QT_L10NDIR%%/qtquick1_ja.qm +%%QT_L10NDIR%%/qtquick1_ko.qm +%%QT_L10NDIR%%/qtquick1_ru.qm +%%QT_L10NDIR%%/qtquick1_sk.qm +%%QT_L10NDIR%%/qtquick1_uk.qm +%%QT_L10NDIR%%/qtquickcontrols_de.qm +%%QT_L10NDIR%%/qtquickcontrols_en.qm +%%QT_L10NDIR%%/qtquickcontrols_fi.qm +%%QT_L10NDIR%%/qtquickcontrols_fr.qm +%%QT_L10NDIR%%/qtquickcontrols_ja.qm +%%QT_L10NDIR%%/qtquickcontrols_ru.qm +%%QT_L10NDIR%%/qtquickcontrols_uk.qm +%%QT_L10NDIR%%/qtscript_ca.qm +%%QT_L10NDIR%%/qtscript_cs.qm +%%QT_L10NDIR%%/qtscript_de.qm +%%QT_L10NDIR%%/qtscript_en.qm +%%QT_L10NDIR%%/qtscript_fi.qm +%%QT_L10NDIR%%/qtscript_fr.qm +%%QT_L10NDIR%%/qtscript_he.qm +%%QT_L10NDIR%%/qtscript_hu.qm +%%QT_L10NDIR%%/qtscript_it.qm +%%QT_L10NDIR%%/qtscript_ja.qm +%%QT_L10NDIR%%/qtscript_ko.qm +%%QT_L10NDIR%%/qtscript_lv.qm +%%QT_L10NDIR%%/qtscript_ru.qm +%%QT_L10NDIR%%/qtscript_sk.qm +%%QT_L10NDIR%%/qtscript_uk.qm +%%QT_L10NDIR%%/qtwebsockets_en.qm +%%QT_L10NDIR%%/qtwebsockets_fr.qm +%%QT_L10NDIR%%/qtxmlpatterns_ca.qm +%%QT_L10NDIR%%/qtxmlpatterns_cs.qm +%%QT_L10NDIR%%/qtxmlpatterns_de.qm +%%QT_L10NDIR%%/qtxmlpatterns_en.qm +%%QT_L10NDIR%%/qtxmlpatterns_fr.qm +%%QT_L10NDIR%%/qtxmlpatterns_hu.qm +%%QT_L10NDIR%%/qtxmlpatterns_it.qm +%%QT_L10NDIR%%/qtxmlpatterns_ja.qm +%%QT_L10NDIR%%/qtxmlpatterns_ko.qm +%%QT_L10NDIR%%/qtxmlpatterns_ru.qm +%%QT_L10NDIR%%/qtxmlpatterns_sk.qm +%%QT_L10NDIR%%/qtxmlpatterns_uk.qm diff --git a/multimedia/qt5-multimedia/Makefile b/multimedia/qt5-multimedia/Makefile index d6d3fea8593e..97058e672ddb 100644 --- a/multimedia/qt5-multimedia/Makefile +++ b/multimedia/qt5-multimedia/Makefile @@ -2,13 +2,13 @@ PORTNAME= multimedia DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt audio, video, radio and camera support module +USE_GL= yes USE_QT5= core gui network opengl qml quick widgets \ buildtools_build QT_DIST= ${PORTNAME} @@ -28,7 +28,8 @@ AUDIOPLUGIN_DESC= Audio plugins to build ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib GSTREAMER_BUILD_DEPENDS=${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat -GSTREAMER_USE= GSTREAMER=yes,bad +GSTREAMER_EXTRA_PATCHES_OFF= ${FILESDIR}/extrapatch-no-gstreamer +GSTREAMER_USE= GSTREAMER1=bad OPENAL_USES= openal PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio @@ -45,11 +46,11 @@ QT_CONFIG+= -alsa .if ${PORT_OPTIONS:MGSTREAMER} QT_DEFINES+= GSTREAMER -QT_CONFIG+= gstreamer +QT_CONFIG+= gstreamer-1.0 .else TBR_DEPENDS+= gstreamer QT_DEFINES+= -GSTREAMER -QT_CONFIG+= -gstreamer +QT_CONFIG+= -gstreamer-1.0 .endif .if ! ${PORT_OPTIONS:MOPENAL} diff --git a/multimedia/qt5-multimedia/files/extrapatch-no-gstreamer b/multimedia/qt5-multimedia/files/extrapatch-no-gstreamer new file mode 100644 index 000000000000..737051d77e17 --- /dev/null +++ b/multimedia/qt5-multimedia/files/extrapatch-no-gstreamer @@ -0,0 +1,24 @@ +--- qtmultimedia.pro.orig 2015-12-25 21:09:16 UTC ++++ qtmultimedia.pro +@@ -18,21 +18,6 @@ win32 { + contains(QT_CONFIG, alsa):qtCompileTest(alsa) + contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio) + +- isEmpty(GST_VERSION) { +- contains(QT_CONFIG, gstreamer-0.10) { +- GST_VERSION = 0.10 +- } else: contains(QT_CONFIG, gstreamer-1.0) { +- GST_VERSION = 1.0 +- } +- } +- cache(GST_VERSION, set) +- !isEmpty(GST_VERSION):qtCompileTest(gstreamer) { +- qtCompileTest(gstreamer_photography) +- qtCompileTest(gstreamer_encodingprofiles) +- qtCompileTest(gstreamer_appsrc) +- qtCompileTest(linux_v4l) +- } +- + qtCompileTest(resourcepolicy) + qtCompileTest(gpu_vivante) + } diff --git a/multimedia/qt5-multimedia/pkg-plist b/multimedia/qt5-multimedia/pkg-plist index 66c867b841d9..9f22bb2effe1 100644 --- a/multimedia/qt5-multimedia/pkg-plist +++ b/multimedia/qt5-multimedia/pkg-plist @@ -12,10 +12,13 @@ %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstcodecsinfo_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreameraudioinputselector_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreameraudioprobecontrol_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamerbufferprobe_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamerbushelper_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamergltexturerenderer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamermessage_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamermirtexturerenderer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideoinputdevicecontrol_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideooverlay_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideoprobecontrol_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideorenderer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideorendererinterface_p.h @@ -23,6 +26,8 @@ %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstreamervideowindow_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstutils_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstvideobuffer_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstvideorendererplugin_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qgstvideorenderersink_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qimagevideobuffer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediacontrol_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmedianetworkplaylistprovider_p.h @@ -55,7 +60,9 @@ %%QT_INCDIR%%/QtMultimedia/QAbstractAudioDeviceInfo %%QT_INCDIR%%/QtMultimedia/QAbstractAudioInput %%QT_INCDIR%%/QtMultimedia/QAbstractAudioOutput +%%QT_INCDIR%%/QtMultimedia/QAbstractPlanarVideoBuffer %%QT_INCDIR%%/QtMultimedia/QAbstractVideoBuffer +%%QT_INCDIR%%/QtMultimedia/QAbstractVideoFilter %%QT_INCDIR%%/QtMultimedia/QAbstractVideoSurface %%QT_INCDIR%%/QtMultimedia/QAudio %%QT_INCDIR%%/QtMultimedia/QAudioBuffer @@ -69,7 +76,6 @@ %%QT_INCDIR%%/QtMultimedia/QAudioInputSelectorControl %%QT_INCDIR%%/QtMultimedia/QAudioOutput %%QT_INCDIR%%/QtMultimedia/QAudioOutputSelectorControl -%%QT_INCDIR%%/QtMultimedia/QAbstractPlanarVideoBuffer %%QT_INCDIR%%/QtMultimedia/QAudioProbe %%QT_INCDIR%%/QtMultimedia/QAudioRecorder %%QT_INCDIR%%/QtMultimedia/QAudioSystemFactoryInterface @@ -93,7 +99,9 @@ %%QT_INCDIR%%/QtMultimedia/QCameraInfo %%QT_INCDIR%%/QtMultimedia/QCameraInfoControl %%QT_INCDIR%%/QtMultimedia/QCameraLocksControl +%%QT_INCDIR%%/QtMultimedia/QCameraViewfinderSettings %%QT_INCDIR%%/QtMultimedia/QCameraViewfinderSettingsControl +%%QT_INCDIR%%/QtMultimedia/QCameraViewfinderSettingsControl2 %%QT_INCDIR%%/QtMultimedia/QCameraZoomControl %%QT_INCDIR%%/QtMultimedia/QImageEncoderControl %%QT_INCDIR%%/QtMultimedia/QImageEncoderSettings @@ -139,6 +147,7 @@ %%QT_INCDIR%%/QtMultimedia/QVideoDeviceSelectorControl %%QT_INCDIR%%/QtMultimedia/QVideoEncoderSettings %%QT_INCDIR%%/QtMultimedia/QVideoEncoderSettingsControl +%%QT_INCDIR%%/QtMultimedia/QVideoFilterRunnable %%QT_INCDIR%%/QtMultimedia/QVideoFrame %%QT_INCDIR%%/QtMultimedia/QVideoProbe %%QT_INCDIR%%/QtMultimedia/QVideoRendererControl @@ -148,6 +157,7 @@ %%QT_INCDIR%%/QtMultimedia/QtMultimediaDepends %%QT_INCDIR%%/QtMultimedia/QtMultimediaVersion %%QT_INCDIR%%/QtMultimedia/qabstractvideobuffer.h +%%QT_INCDIR%%/QtMultimedia/qabstractvideofilter.h %%QT_INCDIR%%/QtMultimedia/qabstractvideosurface.h %%QT_INCDIR%%/QtMultimedia/qaudio.h %%QT_INCDIR%%/QtMultimedia/qaudiobuffer.h @@ -181,6 +191,7 @@ %%QT_INCDIR%%/QtMultimedia/qcamerainfo.h %%QT_INCDIR%%/QtMultimedia/qcamerainfocontrol.h %%QT_INCDIR%%/QtMultimedia/qcameralockscontrol.h +%%QT_INCDIR%%/QtMultimedia/qcameraviewfindersettings.h %%QT_INCDIR%%/QtMultimedia/qcameraviewfindersettingscontrol.h %%QT_INCDIR%%/QtMultimedia/qcamerazoomcontrol.h %%QT_INCDIR%%/QtMultimedia/qimageencodercontrol.h @@ -227,19 +238,19 @@ %%QT_INCDIR%%/QtMultimedia/qvideowindowcontrol.h %%QT_INCDIR%%/QtMultimediaQuick_p/%%FULLVER%%/QtMultimediaQuick_p/private/qdeclarativevideooutput_render_p.h %%QT_INCDIR%%/QtMultimediaQuick_p/%%FULLVER%%/QtMultimediaQuick_p/private/qdeclarativevideooutput_window_p.h -%%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_p -%%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_pDepends -%%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_pVersion -%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNodeFactory_I420 %%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNodeFactory_RGB %%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNodeFactory_Texture -%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNode_I420 +%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNodeFactory_YUV %%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNode_RGB %%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNode_Texture -%%QT_INCDIR%%/QtMultimediaQuick_p/qtmultimediaquick_pversion.h -%%QT_INCDIR%%/QtMultimediaQuick_p/qsgvideonode_i420.h +%%QT_INCDIR%%/QtMultimediaQuick_p/QSGVideoNode_YUV +%%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_p +%%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_pDepends +%%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_pVersion %%QT_INCDIR%%/QtMultimediaQuick_p/qsgvideonode_rgb.h %%QT_INCDIR%%/QtMultimediaQuick_p/qsgvideonode_texture.h +%%QT_INCDIR%%/QtMultimediaQuick_p/qsgvideonode_yuv.h +%%QT_INCDIR%%/QtMultimediaQuick_p/qtmultimediaquick_pversion.h %%QT_INCDIR%%/QtMultimediaWidgets/%%FULLVER%%/QtMultimediaWidgets/private/qeglimagetexturesurface_p.h %%QT_INCDIR%%/QtMultimediaWidgets/%%FULLVER%%/QtMultimediaWidgets/private/qpaintervideosurface_p.h %%QT_INCDIR%%/QtMultimediaWidgets/%%FULLVER%%/QtMultimediaWidgets/private/qvideowidget_p.h diff --git a/net/Makefile b/net/Makefile index cf9df78a376c..63e6c31adc98 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1018,6 +1018,7 @@ SUBDIR += qjsonrpc SUBDIR += qoauth SUBDIR += qt4-network + SUBDIR += qt5-enginio SUBDIR += qt5-network SUBDIR += qtweetlib SUBDIR += quagga diff --git a/net/qt5-enginio/Makefile b/net/qt5-enginio/Makefile new file mode 100644 index 000000000000..9dd4e09e2586 --- /dev/null +++ b/net/qt5-enginio/Makefile @@ -0,0 +1,17 @@ +# $FreeBSD$ + +PORTNAME= enginio +DISTVERSION= ${QT5_VERSION} +CATEGORIES= net +PKGNAMEPREFIX= qt5- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt Enginio module + +USE_QT5= core network qml buildtools_build +QT_DIST= ${PORTNAME} +USES= qmake + +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} + +.include <bsd.port.mk> diff --git a/net/qt5-enginio/pkg-plist b/net/qt5-enginio/pkg-plist new file mode 100644 index 000000000000..5b371015636f --- /dev/null +++ b/net/qt5-enginio/pkg-plist @@ -0,0 +1,38 @@ +%%QT_INCDIR%%/Enginio/1.2.1/Enginio/private/chunkdevice_p.h +%%QT_INCDIR%%/Enginio/1.2.1/Enginio/private/enginiobackendconnection_p.h +%%QT_INCDIR%%/Enginio/1.2.1/Enginio/private/enginiobasemodel_p.h +%%QT_INCDIR%%/Enginio/1.2.1/Enginio/private/enginioclient_p.h +%%QT_INCDIR%%/Enginio/1.2.1/Enginio/private/enginiodummyreply_p.h +%%QT_INCDIR%%/Enginio/1.2.1/Enginio/private/enginiofakereply_p.h +%%QT_INCDIR%%/Enginio/1.2.1/Enginio/private/enginioobjectadaptor_p.h +%%QT_INCDIR%%/Enginio/1.2.1/Enginio/private/enginioreply_p.h +%%QT_INCDIR%%/Enginio/1.2.1/Enginio/private/enginiostring_p.h +%%QT_INCDIR%%/Enginio/Enginio +%%QT_INCDIR%%/Enginio/EnginioDepends +%%QT_INCDIR%%/Enginio/EnginioVersion +%%QT_INCDIR%%/Enginio/enginio.h +%%QT_INCDIR%%/Enginio/enginiobasemodel.h +%%QT_INCDIR%%/Enginio/enginioclient.h +%%QT_INCDIR%%/Enginio/enginioclient_global.h +%%QT_INCDIR%%/Enginio/enginioclientconnection.h +%%QT_INCDIR%%/Enginio/enginioidentity.h +%%QT_INCDIR%%/Enginio/enginiomodel.h +%%QT_INCDIR%%/Enginio/enginiooauth2authentication.h +%%QT_INCDIR%%/Enginio/enginioreply.h +%%QT_INCDIR%%/Enginio/enginioreplystate.h +%%QT_INCDIR%%/Enginio/enginioversion.h +%%QT_LIBDIR%%/cmake/Qt5Enginio/Qt5EnginioConfig.cmake +%%QT_LIBDIR%%/cmake/Qt5Enginio/Qt5EnginioConfigVersion.cmake +%%QT_LIBDIR%%/libEnginio.prl +%%QT_LIBDIR%%/libEnginio.so +%%QT_LIBDIR%%/libEnginio.so.1 +%%QT_LIBDIR%%/libEnginio.so.1.2 +%%QT_LIBDIR%%/libEnginio.so.1.2.1 +%%DEBUG%%%%QT_LIBDIR%%/libEnginio.so.1.2.1.debug +%%QT_MKSPECDIR%%/modules/qt_lib_enginio.pri +%%QT_MKSPECDIR%%/modules/qt_lib_enginio_private.pri +%%QT_QMLDIR%%/Enginio/libenginioplugin.so +%%DEBUG%%%%QT_QMLDIR%%/Enginio/libenginioplugin.so.debug +%%QT_QMLDIR%%/Enginio/plugins.qmltypes +%%QT_QMLDIR%%/Enginio/qmldir +libdata/pkgconfig/Enginio.pc diff --git a/net/qt5-network/Makefile b/net/qt5-network/Makefile index 202dcbc7a3e1..837dfabbb9cb 100644 --- a/net/qt5-network/Makefile +++ b/net/qt5-network/Makefile @@ -8,6 +8,7 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt network module +LIB_DEPENDS= libproxy.so:${PORTSDIR}/net/libproxy RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss USE_OPENSSL= yes @@ -20,8 +21,8 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -QT_DEFINES= OPENSSL SSL -QT_CONFIG= openssl +QT_DEFINES= LIBPROXY OPENSSL SSL +QT_CONFIG= libproxy openssl post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ diff --git a/net/qt5-network/pkg-plist b/net/qt5-network/pkg-plist index ed9cd8c9fc3b..93bea72fe2b7 100644 --- a/net/qt5-network/pkg-plist +++ b/net/qt5-network/pkg-plist @@ -58,10 +58,13 @@ %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslconfiguration_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcontext_openssl_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslkey_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslpresharedkeyauthenticator_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_mac_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_symbols_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_winrt_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtcpserver_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtcpsocket_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qurlinfo_p.h %%QT_INCDIR%%/QtNetwork/QAbstractNetworkCache @@ -100,8 +103,10 @@ %%QT_INCDIR%%/QtNetwork/QSslCertificateExtension %%QT_INCDIR%%/QtNetwork/QSslCipher %%QT_INCDIR%%/QtNetwork/QSslConfiguration +%%QT_INCDIR%%/QtNetwork/QSslEllipticCurve %%QT_INCDIR%%/QtNetwork/QSslError %%QT_INCDIR%%/QtNetwork/QSslKey +%%QT_INCDIR%%/QtNetwork/QSslPreSharedKeyAuthenticator %%QT_INCDIR%%/QtNetwork/QSslSocket %%QT_INCDIR%%/QtNetwork/QTcpServer %%QT_INCDIR%%/QtNetwork/QTcpSocket @@ -136,8 +141,10 @@ %%QT_INCDIR%%/QtNetwork/qsslcertificateextension.h %%QT_INCDIR%%/QtNetwork/qsslcipher.h %%QT_INCDIR%%/QtNetwork/qsslconfiguration.h +%%QT_INCDIR%%/QtNetwork/qsslellipticcurve.h %%QT_INCDIR%%/QtNetwork/qsslerror.h %%QT_INCDIR%%/QtNetwork/qsslkey.h +%%QT_INCDIR%%/QtNetwork/qsslpresharedkeyauthenticator.h %%QT_INCDIR%%/QtNetwork/qsslsocket.h %%QT_INCDIR%%/QtNetwork/qtcpserver.h %%QT_INCDIR%%/QtNetwork/qtcpsocket.h diff --git a/print/qt5-printsupport/Makefile b/print/qt5-printsupport/Makefile index 6f2f82b93e75..9e15e23870a3 100644 --- a/print/qt5-printsupport/Makefile +++ b/print/qt5-printsupport/Makefile @@ -2,7 +2,6 @@ PORTNAME= printsupport DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= print PKGNAMEPREFIX= qt5- diff --git a/textproc/clucene-qt5/files/patch-src__src.pro b/textproc/clucene-qt5/files/patch-src__src.pro index db5a512547ec..cb146d87d743 100644 --- a/textproc/clucene-qt5/files/patch-src__src.pro +++ b/textproc/clucene-qt5/files/patch-src__src.pro @@ -3,7 +3,7 @@ missing dependencies. --- src/src.pro +++ src/src.pro -@@ -1,38 +1,2 @@ +@@ -1,37 +1,2 @@ TEMPLATE = subdirs - -qtHaveModule(widgets) { @@ -14,13 +14,13 @@ missing dependencies. - pixeltool \ - qtestlib \ - designer --# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig - - linguist.depends = designer - } -} - --SUBDIRS += linguist +-SUBDIRS += linguist \ +- qtplugininfo -if(!android|android_app):!ios: SUBDIRS += qtpaths - -mac { @@ -39,7 +39,6 @@ missing dependencies. - -qtNomakeTools( \ - pixeltool \ -- qtconfig \ - macdeployqt \ -) +SUBDIRS = assistant diff --git a/textproc/qt5-xmlpatterns/pkg-plist b/textproc/qt5-xmlpatterns/pkg-plist index e9ebfdcf7e62..66533504ac38 100644 --- a/textproc/qt5-xmlpatterns/pkg-plist +++ b/textproc/qt5-xmlpatterns/pkg-plist @@ -102,7 +102,6 @@ %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qdatetimefns_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qdatetimefns_tpl_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qdaytimeduration_p.h -%%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qdebug_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qdecimal_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qdeduplicateiterator_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qdeepequalfn_p.h @@ -275,6 +274,7 @@ %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtokenizer_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtokenrevealer_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtokensource_p.h +%%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtokenvalue_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtracefn_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtreatas_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtriplecontainer_p.h @@ -303,6 +303,7 @@ %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qvariableloader_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qvariablereference_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qwithparam_p.h +%%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qxmldebug_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qxmlpatternistcli_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qxmlquery_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qxmlresultitems_p.h diff --git a/www/qt5-webchannel/pkg-plist b/www/qt5-webchannel/pkg-plist index 1b0405c5b56d..f6aa4fc925fe 100644 --- a/www/qt5-webchannel/pkg-plist +++ b/www/qt5-webchannel/pkg-plist @@ -25,6 +25,7 @@ %%QT_MKSPECDIR%%/modules/qt_lib_webchannel.pri %%QT_MKSPECDIR%%/modules/qt_lib_webchannel_private.pri %%QT_QMLDIR%%/QtWebChannel/libdeclarative_webchannel.so +%%DEBUG%%%%QT_QMLDIR%%/QtWebChannel/libdeclarative_webchannel.so.debug %%QT_QMLDIR%%/QtWebChannel/plugins.qmltypes %%QT_QMLDIR%%/QtWebChannel/qmldir libdata/pkgconfig/Qt5WebChannel.pc diff --git a/www/qt5-websockets/pkg-plist b/www/qt5-websockets/pkg-plist index cecb86c56473..73a5840bc8c5 100644 --- a/www/qt5-websockets/pkg-plist +++ b/www/qt5-websockets/pkg-plist @@ -32,8 +32,9 @@ %%DEBUG%%%%QT_LIBDIR%%/libQt5WebSockets.so.%%FULLVER%%.debug %%QT_MKSPECDIR%%/modules/qt_lib_websockets.pri %%QT_MKSPECDIR%%/modules/qt_lib_websockets_private.pri -%%QT_QMLDIR%%/Qt/WebSockets/libdeclarative_qmlwebsockets.so -%%DEBUG%%%%QT_QMLDIR%%/Qt/WebSockets/libdeclarative_qmlwebsockets.so.debug -%%QT_QMLDIR%%/Qt/WebSockets/plugins.qmltypes +%%QT_QMLDIR%%/QtWebSockets/libdeclarative_qmlwebsockets.so +%%DEBUG%%%%QT_QMLDIR%%/QtWebSockets/libdeclarative_qmlwebsockets.so.debug +%%QT_QMLDIR%%/QtWebSockets/plugins.qmltypes +%%QT_QMLDIR%%/QtWebSockets/qmldir %%QT_QMLDIR%%/Qt/WebSockets/qmldir libdata/pkgconfig/Qt5WebSockets.pc diff --git a/www/webkit-qt5/Makefile b/www/webkit-qt5/Makefile index ace31bd39870..78a872e7821a 100644 --- a/www/webkit-qt5/Makefile +++ b/www/webkit-qt5/Makefile @@ -2,7 +2,6 @@ PORTNAME= webkit DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -19,7 +18,7 @@ USE_GL= gl USE_GNOME= libxml2 libxslt USE_PERL5= build USE_QT5= core gui network opengl printsupport qml quick sql \ - testlib widgets buildtools_build + widgets buildtools_build QT_DIST= ${PORTNAME} USE_RUBY= yes RUBY_NO_RUN_DEPENDS= yes @@ -39,7 +38,7 @@ QT_CONFIG= accessibility accessibility-atspi-bridge OPTIONS_DEFINE= GSTREAMER OPTIONS_DEFAULT=GSTREAMER -GSTREAMER_USE= GNOME=glib20 GSTREAMER=yes +GSTREAMER_USE= GNOME=glib20 GSTREAMER1=yes .include <bsd.port.pre.mk> diff --git a/www/webkit-qt5/files/patch-Source__WebCore__platform__graphics__gstreamer__WebKitWebSourceGstreamer.cpp b/www/webkit-qt5/files/patch-Source__WebCore__platform__graphics__gstreamer__WebKitWebSourceGstreamer.cpp deleted file mode 100644 index 049d3e3d376e..000000000000 --- a/www/webkit-qt5/files/patch-Source__WebCore__platform__graphics__gstreamer__WebKitWebSourceGstreamer.cpp +++ /dev/null @@ -1,221 +0,0 @@ -GMutexLocker was added to glib in 2.44. Make sure we use the version from -WebCore. - ---- Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig 2015-03-22 17:02:03.015319000 +0100 -+++ Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-03-22 17:04:05.587550000 +0100 -@@ -354,7 +354,7 @@ - - switch (propID) { - case PROP_IRADIO_MODE: { -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - priv->iradioMode = g_value_get_boolean(value); - break; - } -@@ -376,7 +376,7 @@ - WebKitWebSrc* src = WEBKIT_WEB_SRC(object); - WebKitWebSrcPrivate* priv = src->priv; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - switch (propID) { - case PROP_IRADIO_MODE: - g_value_set_boolean(value, priv->iradioMode); -@@ -429,7 +429,7 @@ - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - bool seeking = priv->seekID; - -@@ -493,7 +493,7 @@ - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - priv->startID = 0; - -@@ -584,7 +584,7 @@ - return ret; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - switch (transition) { - case GST_STATE_CHANGE_READY_TO_PAUSED: - GST_DEBUG_OBJECT(src, "READY->PAUSED"); -@@ -615,7 +615,7 @@ - gst_query_parse_duration(query, &format, NULL); - - GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format)); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (format == GST_FORMAT_BYTES && src->priv->size > 0) { - gst_query_set_duration(query, format, src->priv->size); - result = TRUE; -@@ -623,7 +623,7 @@ - break; - } - case GST_QUERY_URI: { -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - gst_query_set_uri(query, src->priv->uri); - result = TRUE; - break; -@@ -668,7 +668,7 @@ - WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); - gchar* ret; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - ret = g_strdup(src->priv->uri); - return ret; - } -@@ -683,7 +683,7 @@ - return FALSE; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - g_free(priv->uri); - priv->uri = 0; -@@ -719,7 +719,7 @@ - WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); - gchar* ret; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - ret = g_strdup(src->priv->uri); - return ret; - } -@@ -734,7 +734,7 @@ - return FALSE; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - g_free(priv->uri); - priv->uri = 0; -@@ -772,7 +772,7 @@ - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->needDataID) - return FALSE; -@@ -793,7 +793,7 @@ - - GST_DEBUG_OBJECT(src, "Need more data: %u", length); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (priv->needDataID || !priv->paused) { - return; - } -@@ -807,7 +807,7 @@ - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->enoughDataID) - return FALSE; -@@ -828,7 +828,7 @@ - - GST_DEBUG_OBJECT(src, "Have enough data"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (priv->enoughDataID || priv->paused) { - return; - } -@@ -842,7 +842,7 @@ - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->seekID) - return FALSE; -@@ -860,7 +860,7 @@ - WebKitWebSrcPrivate* priv = src->priv; - - GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (offset == priv->offset && priv->requestedOffset == priv->offset) - return TRUE; - -@@ -879,7 +879,7 @@ - void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player) - { - ASSERT(player); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - src->priv->player = player; - s_cachedResourceLoader = player->cachedResourceLoader(); - } -@@ -906,7 +906,7 @@ - mapGstBuffer(buffer); - #endif - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - priv->buffer = adoptGRef(buffer); - locker.unlock(); - -@@ -921,7 +921,7 @@ - - GST_DEBUG_OBJECT(src, "Received response: %d", response.httpStatusCode()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - // If we seeked we need 206 == PARTIAL_CONTENT - if (priv->requestedOffset && response.httpStatusCode() != 206) { -@@ -1020,7 +1020,7 @@ - WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get()); - WebKitWebSrcPrivate* priv = src->priv; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - GST_LOG_OBJECT(src, "Have %d bytes of data", priv->buffer ? getGstBufferSize(priv->buffer.get()) : length); - -@@ -1074,7 +1074,7 @@ - - GST_DEBUG_OBJECT(src, "Have EOS"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (!priv->seekID) { - locker.unlock(); - gst_app_src_end_of_stream(priv->appsrc); -@@ -1210,7 +1210,7 @@ - - GST_ERROR_OBJECT(src, "Request was blocked"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - uri.set(g_strdup(src->priv->uri)); - locker.unlock(); - -@@ -1224,7 +1224,7 @@ - - GST_ERROR_OBJECT(src, "Cannot show URL"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - uri.set(g_strdup(src->priv->uri)); - locker.unlock(); - diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index 9325e6cf1ffd..737b74203259 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -216,10 +216,12 @@ SUBDIR += qt4-declarative SUBDIR += qt4-gui SUBDIR += qt4pas + SUBDIR += qt5-canvas3d SUBDIR += qt5-declarative SUBDIR += qt5-gui SUBDIR += qt5-quick SUBDIR += qt5-quickcontrols + SUBDIR += qt5-uiplugin SUBDIR += qt5-widgets SUBDIR += qtada SUBDIR += qwt5 diff --git a/x11-toolkits/qt5-canvas3d/Makefile b/x11-toolkits/qt5-canvas3d/Makefile new file mode 100644 index 000000000000..a2b406837d1b --- /dev/null +++ b/x11-toolkits/qt5-canvas3d/Makefile @@ -0,0 +1,23 @@ +# $FreeBSD$ + +PORTNAME= canvas3d +DISTVERSION= ${QT5_VERSION} +CATEGORIES= x11-toolkits +PKGNAMEPREFIX= qt5- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt canvas3d module + +USE_QT5= core gui network qml quick buildtools_build +QT_DIST= ${PORTNAME} +USES= qmake + +USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} + +post-install: + ${MKDIR} ${STAGEDIR}/usr/local/share/qtcreator/templates/wizards && \ + cd ${WRKSRC}/creatortemplates && \ + ${COPYTREE_SHARE} qtcanvas3d ${STAGEDIR}/usr/local/share/qtcreator/templates/wizards && \ + ${COPYTREE_SHARE} qtcanvas3dthreejs ${STAGEDIR}/usr/local/share/qtcreator/templates/wizards + +.include <bsd.port.mk> diff --git a/x11-toolkits/qt5-canvas3d/pkg-plist b/x11-toolkits/qt5-canvas3d/pkg-plist new file mode 100644 index 000000000000..88621c71a913 --- /dev/null +++ b/x11-toolkits/qt5-canvas3d/pkg-plist @@ -0,0 +1,25 @@ +%%QT_QMLDIR%%/QtCanvas3D/designer/default/Canvas3D.qml +%%QT_QMLDIR%%/QtCanvas3D/designer/images/canvas3d-icon.png +%%QT_QMLDIR%%/QtCanvas3D/designer/images/canvas3d-icon16.png +%%QT_QMLDIR%%/QtCanvas3D/designer/qtcanvas3d.metainfo +%%QT_QMLDIR%%/QtCanvas3D/libqtcanvas3d.so +%%DEBUG%%%%QT_QMLDIR%%/QtCanvas3D/libqtcanvas3d.so.debug +%%QT_QMLDIR%%/QtCanvas3D/plugins.qmltypes +%%QT_QMLDIR%%/QtCanvas3D/qmldir +share/qtcreator/templates/wizards/qtcanvas3d/deployment.pri +share/qtcreator/templates/wizards/qtcanvas3d/glcode.js +share/qtcreator/templates/wizards/qtcanvas3d/main.cpp +share/qtcreator/templates/wizards/qtcanvas3d/main.qml +share/qtcreator/templates/wizards/qtcanvas3d/project.pro +share/qtcreator/templates/wizards/qtcanvas3d/qtcanvas3d.png +share/qtcreator/templates/wizards/qtcanvas3d/qtcanvas3d.qrc +share/qtcreator/templates/wizards/qtcanvas3d/wizard.xml +share/qtcreator/templates/wizards/qtcanvas3dthreejs/3rdparty/three.js +share/qtcreator/templates/wizards/qtcanvas3dthreejs/deployment.pri +share/qtcreator/templates/wizards/qtcanvas3dthreejs/glcode.js +share/qtcreator/templates/wizards/qtcanvas3dthreejs/main.cpp +share/qtcreator/templates/wizards/qtcanvas3dthreejs/main.qml +share/qtcreator/templates/wizards/qtcanvas3dthreejs/project.pro +share/qtcreator/templates/wizards/qtcanvas3dthreejs/qtcanvas3d.png +share/qtcreator/templates/wizards/qtcanvas3dthreejs/qtcanvas3dthreejs.qrc +share/qtcreator/templates/wizards/qtcanvas3dthreejs/wizard.xml diff --git a/x11-toolkits/qt5-declarative/Makefile b/x11-toolkits/qt5-declarative/Makefile index 9eaa60bc1837..7a0065698ca2 100644 --- a/x11-toolkits/qt5-declarative/Makefile +++ b/x11-toolkits/qt5-declarative/Makefile @@ -2,7 +2,6 @@ PORTNAME= declarative DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile index f8d88f717be2..3bf04ae7d853 100644 --- a/x11-toolkits/qt5-gui/Makefile +++ b/x11-toolkits/qt5-gui/Makefile @@ -2,7 +2,6 @@ PORTNAME= gui DISTVERSION= ${QT5_VERSION} -PORTREVISION= 3 CATEGORIES= x11-toolkits graphics PKGNAMEPREFIX= qt5- @@ -23,11 +22,11 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils USES= jpeg -USE_GL= gl +USE_GL= gl egl USE_GNOME= glib20 USE_QT5= core dbus qmake_build buildtools_build QT_DIST= base -USE_XORG= x11 xi xrender +USE_XORG= ice sm x11 xi xrender HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-eglfs \ -no-evdev \ @@ -50,6 +49,9 @@ MORE_WRKSRCS= src/platformsupport \ MORE_WRKSRCS+= src/plugins/imageformats \ src/plugins/platforminputcontexts +# openglextensions is the static library to use for further things like qtcanvas3d +MORE_WRKSRCS+= src/openglextensions + QT_DEFINES= ACCESSIBILITY DBUS FONTCONFIG FREETYPE GLIB \ IMAGEFORMAT_PNG OPENGL SHAPE XCB XKB XKBCOMMON XRENDER QT_CONFIG= accessibility accessibility-atspi-bridge dbus \ diff --git a/x11-toolkits/qt5-gui/files/patch-CVE-2015-0295 b/x11-toolkits/qt5-gui/files/patch-CVE-2015-0295 deleted file mode 100644 index 5a32eb93b026..000000000000 --- a/x11-toolkits/qt5-gui/files/patch-CVE-2015-0295 +++ /dev/null @@ -1,37 +0,0 @@ -commit 661f6bfd032dacc62841037732816a583640e187 -Author: Richard J. Moore <rich@kde.org> -Date: Sat Feb 21 17:43:21 2015 +0000 - - Fix a division by zero when processing malformed BMP files. - - This fixes a division by 0 when processing a maliciously crafted BMP - file. No impact beyond DoS. - - Task-number: QTBUG-44547 - Change-Id: Ifcded2c0aa712e90d23e6b3969af0ec3add53973 - Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> - Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> - ---- src/gui/image/qbmphandler.cpp -+++ src/gui/image/qbmphandler.cpp -@@ -314,12 +314,20 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int - } - } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) { - red_shift = calc_shift(red_mask); -+ if (((red_mask >> red_shift) + 1) == 0) -+ return false; - red_scale = 256 / ((red_mask >> red_shift) + 1); - green_shift = calc_shift(green_mask); -+ if (((green_mask >> green_shift) + 1) == 0) -+ return false; - green_scale = 256 / ((green_mask >> green_shift) + 1); - blue_shift = calc_shift(blue_mask); -+ if (((blue_mask >> blue_shift) + 1) == 0) -+ return false; - blue_scale = 256 / ((blue_mask >> blue_shift) + 1); - alpha_shift = calc_shift(alpha_mask); -+ if (((alpha_mask >> alpha_shift) + 1) == 0) -+ return false; - alpha_scale = 256 / ((alpha_mask >> alpha_shift) + 1); - } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) { - blue_mask = 0x000000ff; diff --git a/x11-toolkits/qt5-gui/files/patch-CVE-2015-1858 b/x11-toolkits/qt5-gui/files/patch-CVE-2015-1858 deleted file mode 100644 index 066c8bba0870..000000000000 --- a/x11-toolkits/qt5-gui/files/patch-CVE-2015-1858 +++ /dev/null @@ -1,23 +0,0 @@ -commit d3048a29797ee2d80d84bbda26bb3c954584f332 -Author: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> -Date: Wed Mar 11 09:00:41 2015 +0100 - - Fixes crash in gif image decoder - - Fuzzing test revealed that for certain malformed gif files, - qgifhandler would segfault. - - Change-Id: I5bb6f60e1c61849e0d8c735edc3869945e5331c1 - Reviewed-by: Richard J. Moore <rich@kde.org> - ---- src/gui/image/qgifhandler.cpp -+++ src/gui/image/qgifhandler.cpp -@@ -936,6 +936,8 @@ void QGIFFormat::fillRect(QImage *image, int col, int row, int w, int h, QRgb co - - void QGIFFormat::nextY(unsigned char *bits, int bpl) - { -+ if (out_of_bounds) -+ return; - int my; - switch (interlace) { - case 0: // Non-interlaced diff --git a/x11-toolkits/qt5-gui/files/patch-CVE-2015-1859 b/x11-toolkits/qt5-gui/files/patch-CVE-2015-1859 deleted file mode 100644 index 78066cba7a8c..000000000000 --- a/x11-toolkits/qt5-gui/files/patch-CVE-2015-1859 +++ /dev/null @@ -1,52 +0,0 @@ -commit 51ec7ebfe5f45d1c0a03d992e97053cac66e25fe -Author: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> -Date: Wed Mar 11 13:34:01 2015 +0100 - - Fixes crash in bmp and ico image decoding - - Fuzzing test revealed that for certain malformed bmp and ico files, - the handler would segfault. - - Change-Id: I19d45145f31e7f808f7f6a1a1610270ea4159cbe - Reviewed-by: Lars Knoll <lars.knoll@digia.com> - ---- src/gui/image/qbmphandler.cpp -+++ src/gui/image/qbmphandler.cpp -@@ -484,12 +484,6 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int - p = data + (h-y-1)*bpl; - break; - case 2: // delta (jump) -- // Protection -- if ((uint)x >= (uint)w) -- x = w-1; -- if ((uint)y >= (uint)h) -- y = h-1; -- - { - quint8 tmp; - d->getChar((char *)&tmp); -@@ -497,6 +491,13 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int - d->getChar((char *)&tmp); - y += tmp; - } -+ -+ // Protection -+ if ((uint)x >= (uint)w) -+ x = w-1; -+ if ((uint)y >= (uint)h) -+ y = h-1; -+ - p = data + (h-y-1)*bpl + x; - break; - default: // absolute mode ---- src/plugins/imageformats/ico/qicohandler.cpp -+++ src/plugins/imageformats/ico/qicohandler.cpp -@@ -567,7 +567,7 @@ QImage ICOReader::iconAt(int index) - QImage::Format format = QImage::Format_ARGB32; - if (icoAttrib.nbits == 24) - format = QImage::Format_RGB32; -- else if (icoAttrib.ncolors == 2) -+ else if (icoAttrib.ncolors == 2 && icoAttrib.depth == 1) - format = QImage::Format_Mono; - else if (icoAttrib.ncolors > 0) - format = QImage::Format_Indexed8; diff --git a/x11-toolkits/qt5-gui/files/patch-src_plugins_platforms_xcb_qxcbwindow.cpp b/x11-toolkits/qt5-gui/files/patch-src_plugins_platforms_xcb_qxcbwindow.cpp deleted file mode 100644 index 6b9e50bc9afe..000000000000 --- a/x11-toolkits/qt5-gui/files/patch-src_plugins_platforms_xcb_qxcbwindow.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- src/plugins/platforms/xcb/qxcbwindow.cpp.orig 2015-01-29 15:05:03.094563565 -0500 -+++ src/plugins/platforms/xcb/qxcbwindow.cpp 2015-01-29 15:08:10.219554046 -0500 -@@ -701,6 +701,9 @@ - if (connection()->time() != XCB_TIME_CURRENT_TIME) - updateNetWmUserTime(connection()->time()); - -+ if (window()->objectName() == QLatin1String("QSystemTrayIconSysWindow")) -+ return; // defer showing until XEMBED_EMBEDDED_NOTIFY -+ - Q_XCB_CALL(xcb_map_window(xcb_connection(), m_window)); - - if (QGuiApplication::modalWindow() == window()) -@@ -2130,7 +2133,10 @@ - switch (event->data.data32[1]) { - case XEMBED_WINDOW_ACTIVATE: - case XEMBED_WINDOW_DEACTIVATE: -+ break; - case XEMBED_EMBEDDED_NOTIFY: -+ Q_XCB_CALL(xcb_map_window(xcb_connection(), m_window)); -+ m_screen->windowShown(this); - break; - case XEMBED_FOCUS_IN: - Qt::FocusReason reason; diff --git a/x11-toolkits/qt5-gui/pkg-plist b/x11-toolkits/qt5-gui/pkg-plist index 26c257fb9e44..3de8fd33e47a 100644 --- a/x11-toolkits/qt5-gui/pkg-plist +++ b/x11-toolkits/qt5-gui/pkg-plist @@ -16,7 +16,6 @@ %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_mips_dsp_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_neon_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_sse_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawhelper_x86_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qdrawingprimitive_sse2_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qemulationpaintengine_p.h @@ -41,6 +40,8 @@ %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimage_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimagepixmapcleanuphooks_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qimagescale_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qinputdevicemanager_p.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qinputdevicemanager_p_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qinputmethod_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qjpeghandler_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qkeymapper_p.h @@ -72,7 +73,6 @@ %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qopenglvertexarrayobject_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qoutlinemapper_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpagedpaintdevice_p.h -%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintbuffer_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintdevicewindow_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintengine_blitter_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/private/qpaintengine_p.h @@ -134,6 +134,8 @@ %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformdialoghelper.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformdrag.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformfontdatabase.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformgraphicsbuffer.h +%%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatformgraphicsbufferhelper.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatforminputcontext.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatforminputcontext_p.h %%QT_INCDIR%%/QtGui/%%FULLVER%%/QtGui/qpa/qplatforminputcontextfactory_p.h @@ -291,6 +293,10 @@ %%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_2_Core %%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_3_Compatibility %%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_3_Core +%%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_4_Compatibility +%%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_4_Core +%%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_5_Compatibility +%%QT_INCDIR%%/QtGui/QOpenGLFunctions_4_5_Core %%QT_INCDIR%%/QtGui/QOpenGLFunctions_ES2 %%QT_INCDIR%%/QtGui/QOpenGLPaintDevice %%QT_INCDIR%%/QtGui/QOpenGLPixelTransferOptions @@ -323,6 +329,7 @@ %%QT_INCDIR%%/QtGui/QPixelFormat %%QT_INCDIR%%/QtGui/QPixmap %%QT_INCDIR%%/QtGui/QPixmapCache +%%QT_INCDIR%%/QtGui/QPlatformSurfaceEvent %%QT_INCDIR%%/QtGui/QPolygon %%QT_INCDIR%%/QtGui/QPolygonF %%QT_INCDIR%%/QtGui/QQuaternion @@ -465,6 +472,10 @@ %%QT_INCDIR%%/QtGui/qopenglfunctions_4_2_core.h %%QT_INCDIR%%/QtGui/qopenglfunctions_4_3_compatibility.h %%QT_INCDIR%%/QtGui/qopenglfunctions_4_3_core.h +%%QT_INCDIR%%/QtGui/qopenglfunctions_4_4_compatibility.h +%%QT_INCDIR%%/QtGui/qopenglfunctions_4_4_core.h +%%QT_INCDIR%%/QtGui/qopenglfunctions_4_5_compatibility.h +%%QT_INCDIR%%/QtGui/qopenglfunctions_4_5_core.h %%QT_INCDIR%%/QtGui/qopenglfunctions_es2.h %%QT_INCDIR%%/QtGui/qopenglpaintdevice.h %%QT_INCDIR%%/QtGui/qopenglpixeltransferoptions.h @@ -524,6 +535,12 @@ %%QT_INCDIR%%/QtGui/qwindow.h %%QT_INCDIR%%/QtGui/qwindowdefs.h %%QT_INCDIR%%/QtGui/qwindowdefs_win.h +%%QT_INCDIR%%/QtOpenGLExtensions/QOpenGLExtensions +%%QT_INCDIR%%/QtOpenGLExtensions/QtOpenGLExtensions +%%QT_INCDIR%%/QtOpenGLExtensions/QtOpenGLExtensionsDepends +%%QT_INCDIR%%/QtOpenGLExtensions/QtOpenGLExtensionsVersion +%%QT_INCDIR%%/QtOpenGLExtensions/qopenglextensions.h +%%QT_INCDIR%%/QtOpenGLExtensions/qtopenglextensionsversion.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/application_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/atspiadaptor_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/bridge_p.h @@ -535,14 +552,18 @@ %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qbasicfontdatabase_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qcfsocketnotifier_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/qdbusmenuconnection_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 +%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdbustraytypes_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdevicediscovery_dummy_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdevicediscovery_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdevicediscovery_static_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qdevicediscovery_udev_p.h -%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglcompositor_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglconvenience_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglpbuffer_p.h -%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformbackingstore_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformcontext_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformcursor_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeglplatformintegration_p.h @@ -554,7 +575,8 @@ %%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/qevdevtouch_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_cf_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qeventdispatcher_glib_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qfbbackingstore_p.h @@ -570,8 +592,17 @@ %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qgenericunixservices_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qgenericunixthemes_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qglxconvenience_p.h +%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qlibinputhandler_p.h +%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qlibinputkeyboard_p.h +%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qlibinputpointer_p.h +%%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qlibinputtouch_p.h %%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/qstatusnotifieritemadaptor_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/qxdgnotificationproxy_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/qxlibeglintegration_p.h %%QT_INCDIR%%/QtPlatformSupport/%%FULLVER%%/QtPlatformSupport/private/struct_marshallers_p.h %%QT_INCDIR%%/QtPlatformSupport/QtPlatformSupport @@ -588,18 +619,33 @@ %%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_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_LIBDIR%%/libQt5Gui.prl %%QT_LIBDIR%%/libQt5Gui.so %%QT_LIBDIR%%/libQt5Gui.so.5 %%QT_LIBDIR%%/libQt5Gui.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt5Gui.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt5Gui.so.%%FULLVER%%.debug +%%QT_LIBDIR%%/libQt5OpenGLExtensions.a +%%QT_LIBDIR%%/libQt5OpenGLExtensions.prl %%QT_LIBDIR%%/libQt5PlatformSupport.a %%QT_LIBDIR%%/libQt5PlatformSupport.prl +%%QT_LIBDIR%%/libQt5XcbQpa.prl +%%QT_LIBDIR%%/libQt5XcbQpa.so +%%QT_LIBDIR%%/libQt5XcbQpa.so.5 +%%QT_LIBDIR%%/libQt5XcbQpa.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt5XcbQpa.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt5XcbQpa.so.%%FULLVER%%.debug %%QT_MKSPECDIR%%/modules/qt_lib_gui.pri %%QT_MKSPECDIR%%/modules/qt_lib_gui_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_openglextensions.pri +%%QT_MKSPECDIR%%/modules/qt_lib_openglextensions_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_platformsupport_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_xcb_qpa_lib_private.pri %%QT_PLUGINDIR%%/imageformats/libqgif.so %%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqgif.so.debug %%QT_PLUGINDIR%%/imageformats/libqico.so @@ -616,5 +662,11 @@ %%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqoffscreen.so.debug %%QT_PLUGINDIR%%/platforms/libqxcb.so %%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqxcb.so.debug +%%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-egl-integration.so +%%DEBUG%%%%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-egl-integration.so.debug +%%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-glx-integration.so +%%DEBUG%%%%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-glx-integration.so.debug libdata/pkgconfig/Qt5Gui.pc +libdata/pkgconfig/Qt5OpenGLExtensions.pc libdata/pkgconfig/Qt5PlatformSupport.pc +libdata/pkgconfig/Qt5XcbQpa.pc diff --git a/x11-toolkits/qt5-quick/Makefile b/x11-toolkits/qt5-quick/Makefile index c0d4b921fdee..8cf1e89e2ad7 100644 --- a/x11-toolkits/qt5-quick/Makefile +++ b/x11-toolkits/qt5-quick/Makefile @@ -8,6 +8,7 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt declarative framework for dynamic user interfaces +USE_GL= gl USE_QT5= core gui network qml sql testlib \ widgets xmlpatterns buildtools_build QT_DIST= declarative diff --git a/x11-toolkits/qt5-quick/pkg-plist b/x11-toolkits/qt5-quick/pkg-plist index 841bf9576199..c95c026228b6 100644 --- a/x11-toolkits/qt5-quick/pkg-plist +++ b/x11-toolkits/qt5-quick/pkg-plist @@ -1,7 +1,6 @@ %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/designerwindowmanager_p.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/qqmlaccessible_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickaccessibleattached_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickaccessiblefactory_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickanchors_p.h @@ -83,6 +82,7 @@ %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickshadereffectmesh_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickshadereffectnode_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickshadereffectsource_p.h +%%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickshortcut_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicksmoothedanimation_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquicksmoothedanimation_p_p.h %%QT_INCDIR%%/QtQuick/%%FULLVER%%/QtQuick/private/qquickspringanimation_p.h @@ -303,7 +303,6 @@ %%QT_LIBDIR%%/libQt5QuickWidgets.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt5QuickWidgets.so.%%FULLVER%%.debug %%QT_BINDIR%%/qml -%%QT_BINDIR%%/qmlbundle %%QT_BINDIR%%/qmleasing %%QT_BINDIR%%/qmlimportscanner %%QT_BINDIR%%/qmllint @@ -333,6 +332,7 @@ %%QT_QMLDIR%%/Qt/labs/settings/qmldir %%QT_QMLDIR%%/QtQml/Models.2/libmodelsplugin.so %%DEBUG%%%%QT_QMLDIR%%/QtQml/Models.2/libmodelsplugin.so.debug +%%QT_QMLDIR%%/QtQml/Models.2/plugins.qmltypes %%QT_QMLDIR%%/QtQml/Models.2/qmldir %%QT_QMLDIR%%/QtQml/StateMachine/libqtqmlstatemachine.so %%DEBUG%%%%QT_QMLDIR%%/QtQml/StateMachine/libqtqmlstatemachine.so.debug diff --git a/x11-toolkits/qt5-quickcontrols/Makefile b/x11-toolkits/qt5-quickcontrols/Makefile index 145fbeb87b08..403080927af3 100644 --- a/x11-toolkits/qt5-quickcontrols/Makefile +++ b/x11-toolkits/qt5-quickcontrols/Makefile @@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Set of controls for building complete interfaces in Qt Quick -USE_QT5= core gui qml quick testlib widgets \ +USE_QT5= core gui qml quick widgets \ buildtools_build QT_DIST= quickcontrols USES= qmake diff --git a/x11-toolkits/qt5-quickcontrols/pkg-plist b/x11-toolkits/qt5-quickcontrols/pkg-plist index 16f53d6929dc..a02b888a64e9 100644 --- a/x11-toolkits/qt5-quickcontrols/pkg-plist +++ b/x11-toolkits/qt5-quickcontrols/pkg-plist @@ -10,6 +10,7 @@ %%QT_QMLDIR%%/QtQuick/Controls/MenuBar.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/AbstractCheckable.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/BasicButton.qml +%%QT_QMLDIR%%/QtQuick/Controls/Private/BasicTableView.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/CalendarHeaderModel.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/CalendarUtils.js %%QT_QMLDIR%%/QtQuick/Controls/Private/ColumnMenuContent.qml @@ -33,11 +34,13 @@ %%QT_QMLDIR%%/QtQuick/Controls/Private/Style.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/SystemPaletteSingleton.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/TabBar.qml +%%QT_QMLDIR%%/QtQuick/Controls/Private/TableViewItemDelegateLoader.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/TableViewSelection.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/TextHandle.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/TextInputWithHandles.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/TextSingleton.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/ToolMenuButton.qml +%%QT_QMLDIR%%/QtQuick/Controls/Private/TreeViewItemDelegateLoader.qml %%QT_QMLDIR%%/QtQuick/Controls/Private/qmldir %%QT_QMLDIR%%/QtQuick/Controls/Private/style.js %%QT_QMLDIR%%/QtQuick/Controls/ProgressBar.qml @@ -51,28 +54,43 @@ %%QT_QMLDIR%%/QtQuick/Controls/StackViewTransition.qml %%QT_QMLDIR%%/QtQuick/Controls/StatusBar.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ApplicationWindowStyle.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/BasicTableViewStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/BusyIndicatorStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ButtonStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CalendarStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CheckBoxStyle.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CircularButtonStyle.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CircularGaugeStyle.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CircularTickmarkLabelStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ComboBoxStyle.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/CommonStyleHelper.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/DelayButtonStyle.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/DialStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/FocusFrameStyle.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/GaugeStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/GroupBoxStyle.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/HandleStyle.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/HandleStyleHelper.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/MenuBarStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/MenuStyle.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/PieMenuStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ProgressBarStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/RadioButtonStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ScrollViewStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/SliderStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/SpinBoxStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/StatusBarStyle.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/StatusIndicatorStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/SwitchStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/TabViewStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/TableViewStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/TextAreaStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/TextFieldStyle.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ToggleButtonStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ToolBarStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/ToolButtonStyle.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/TreeViewStyle.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/TumblerStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/arrow-down.png %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/arrow-down@2x.png %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/arrow-left.png @@ -89,7 +107,9 @@ %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/focusframe.png %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/groupbox.png %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/header.png +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/knob.png %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/leftanglearrow.png +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/needle.png %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/progress-indeterminate.png %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/rightanglearrow.png %%QT_QMLDIR%%/QtQuick/Controls/Styles/Base/images/scrollbar-handle-horizontal.png @@ -126,7 +146,11 @@ %%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/TextFieldStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/ToolBarStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/ToolButtonStyle.qml +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/TreeViewStyle.qml %%QT_QMLDIR%%/QtQuick/Controls/Styles/Desktop/qmldir +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Controls/Styles/Flat/libqtquickextrasflatplugin.so.debug +%%QT_QMLDIR%%/QtQuick/Controls/Styles/Flat/qmldir %%QT_QMLDIR%%/QtQuick/Controls/Styles/qmldir %%QT_QMLDIR%%/QtQuick/Controls/Switch.qml %%QT_QMLDIR%%/QtQuick/Controls/Tab.qml @@ -137,12 +161,11 @@ %%QT_QMLDIR%%/QtQuick/Controls/TextField.qml %%QT_QMLDIR%%/QtQuick/Controls/ToolBar.qml %%QT_QMLDIR%%/QtQuick/Controls/ToolButton.qml +%%QT_QMLDIR%%/QtQuick/Controls/TreeView.qml %%QT_QMLDIR%%/QtQuick/Controls/libqtquickcontrolsplugin.so %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Controls/libqtquickcontrolsplugin.so.debug %%QT_QMLDIR%%/QtQuick/Controls/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/Controls/qmldir -%%QT_QMLDIR%%/QtQuick/Dialogs/libdialogplugin.so -%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/libdialogplugin.so.debug %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultColorDialog.qml %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultDialogWrapper.qml %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/DefaultFileDialog.qml @@ -166,6 +189,8 @@ %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/sunken_frame.png %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/warning.png %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/images/window_border.png +%%QT_QMLDIR%%/QtQuick/Dialogs/libdialogplugin.so +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/libdialogplugin.so.debug %%QT_QMLDIR%%/QtQuick/Dialogs/plugins.qmltypes %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/ColorSlider.qml %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/DefaultWindowDecoration.qml @@ -174,6 +199,37 @@ %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/icons.ttf %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Dialogs/qml/qmldir %%QT_QMLDIR%%/QtQuick/Dialogs/qmldir +%%QT_QMLDIR%%/QtQuick/Extras/designer/CircularGaugeSpecifics.qml +%%QT_QMLDIR%%/QtQuick/Extras/designer/DelayButtonSpecifics.qml +%%QT_QMLDIR%%/QtQuick/Extras/designer/DialSpecifics.qml +%%QT_QMLDIR%%/QtQuick/Extras/designer/GaugeSpecifics.qml +%%QT_QMLDIR%%/QtQuick/Extras/designer/PictureSpecifics.qml +%%QT_QMLDIR%%/QtQuick/Extras/designer/PieMenuSpecifics.qml +%%QT_QMLDIR%%/QtQuick/Extras/designer/StatusIndicatorSpecifics.qml +%%QT_QMLDIR%%/QtQuick/Extras/designer/ToggleButtonSpecifics.qml +%%QT_QMLDIR%%/QtQuick/Extras/designer/images/circulargauge-icon.png +%%QT_QMLDIR%%/QtQuick/Extras/designer/images/circulargauge-icon16.png +%%QT_QMLDIR%%/QtQuick/Extras/designer/images/delaybutton-icon.png +%%QT_QMLDIR%%/QtQuick/Extras/designer/images/delaybutton-icon16.png +%%QT_QMLDIR%%/QtQuick/Extras/designer/images/dial-icon.png +%%QT_QMLDIR%%/QtQuick/Extras/designer/images/dial-icon16.png +%%QT_QMLDIR%%/QtQuick/Extras/designer/images/gauge-icon.png +%%QT_QMLDIR%%/QtQuick/Extras/designer/images/gauge-icon16.png +%%QT_QMLDIR%%/QtQuick/Extras/designer/images/picture-icon.png +%%QT_QMLDIR%%/QtQuick/Extras/designer/images/picture-icon16.png +%%QT_QMLDIR%%/QtQuick/Extras/designer/images/piemenu-icon.png +%%QT_QMLDIR%%/QtQuick/Extras/designer/images/piemenu-icon16.png +%%QT_QMLDIR%%/QtQuick/Extras/designer/images/statusindicator-icon.png +%%QT_QMLDIR%%/QtQuick/Extras/designer/images/statusindicator-icon16.png +%%QT_QMLDIR%%/QtQuick/Extras/designer/images/togglebutton-icon.png +%%QT_QMLDIR%%/QtQuick/Extras/designer/images/togglebutton-icon16.png +%%QT_QMLDIR%%/QtQuick/Extras/designer/images/tumbler-icon.png +%%QT_QMLDIR%%/QtQuick/Extras/designer/images/tumbler-icon16.png +%%QT_QMLDIR%%/QtQuick/Extras/designer/qtquickextras.metainfo +%%QT_QMLDIR%%/QtQuick/Extras/libqtquickextrasplugin.so +%%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 diff --git a/x11-toolkits/qt5-uiplugin/Makefile b/x11-toolkits/qt5-uiplugin/Makefile new file mode 100644 index 000000000000..3c1109b18368 --- /dev/null +++ b/x11-toolkits/qt5-uiplugin/Makefile @@ -0,0 +1,21 @@ +# $FreeBSD$ + +PORTNAME= uiplugin +DISTVERSION= ${QT5_VERSION} +CATEGORIES= x11-toolkits devel +PKGNAMEPREFIX= qt5- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Custom Qt widget plugin interface for Qt Designer + +# This port used to be part of qt5-designer itself before 5.5.0. +CONFLICTS= qt5-designer-5.[0-4].* + +USE_QT5= core gui widgets +QT_DIST= tools +USES= qmake + +BUILD_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME} +INSTALL_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME} + +.include <bsd.port.mk> diff --git a/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro b/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro new file mode 100644 index 000000000000..4a99dd42ed75 --- /dev/null +++ b/x11-toolkits/qt5-uiplugin/files/patch-src__src.pro @@ -0,0 +1,44 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/src.pro.orig 2015-10-13 04:38:15 UTC ++++ src/src.pro +@@ -1,37 +1,2 @@ + TEMPLATE = subdirs +- +-qtHaveModule(widgets) { +- no-png { +- message("Some graphics-related tools are unavailable without PNG support") +- } else { +- SUBDIRS = assistant \ +- pixeltool \ +- qtestlib \ +- designer +- +- linguist.depends = designer +- } +-} +- +-SUBDIRS += linguist \ +- qtplugininfo +-if(!android|android_app):!ios: SUBDIRS += qtpaths +- +-mac { +- SUBDIRS += macdeployqt +-} +- +-android { +- SUBDIRS += androiddeployqt +-} +- +-qtHaveModule(dbus): SUBDIRS += qdbus +- +-win32|winrt:SUBDIRS += windeployqt +-winrt:SUBDIRS += winrtrunner +-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +- +-qtNomakeTools( \ +- pixeltool \ +- macdeployqt \ +-) ++SUBDIRS = designer diff --git a/x11-toolkits/qt5-uiplugin/files/patch-src_designer_src_src.pro b/x11-toolkits/qt5-uiplugin/files/patch-src_designer_src_src.pro new file mode 100644 index 000000000000..e1661f6cc105 --- /dev/null +++ b/x11-toolkits/qt5-uiplugin/files/patch-src_designer_src_src.pro @@ -0,0 +1,30 @@ +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/designer/src/src.pro.orig 2016-01-21 10:39:28 UTC ++++ src/designer/src/src.pro +@@ -1,23 +1,4 @@ + TEMPLATE = subdirs + + SUBDIRS = \ +- uiplugin \ +- uitools \ +- lib \ +- components \ +- designer +- +-contains(QT_CONFIG, shared): SUBDIRS += plugins +- +-uitools.depends = uiplugin +-lib.depends = uiplugin +-components.depends = lib +-designer.depends = components +-plugins.depends = lib +- +-qtNomakeTools( \ +- lib \ +- components \ +- designer \ +- plugins \ +-) ++ uiplugin diff --git a/x11-toolkits/qt5-uiplugin/pkg-plist b/x11-toolkits/qt5-uiplugin/pkg-plist new file mode 100644 index 000000000000..497ebe54e1be --- /dev/null +++ b/x11-toolkits/qt5-uiplugin/pkg-plist @@ -0,0 +1,12 @@ +%%QT_INCDIR%%/QtUiPlugin/QDesignerCustomWidgetCollectionInterface +%%QT_INCDIR%%/QtUiPlugin/QDesignerCustomWidgetInterface +%%QT_INCDIR%%/QtUiPlugin/QDesignerExportWidget +%%QT_INCDIR%%/QtUiPlugin/QtUiPlugin +%%QT_INCDIR%%/QtUiPlugin/QtUiPluginDepends +%%QT_INCDIR%%/QtUiPlugin/QtUiPluginVersion +%%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_MKSPECDIR%%/modules/qt_%%QT_LIBDIR%%_uiplugin.pri diff --git a/x11-toolkits/qt5-widgets/pkg-plist b/x11-toolkits/qt5-widgets/pkg-plist index 17acaf8c9548..16193d66122b 100644 --- a/x11-toolkits/qt5-widgets/pkg-plist +++ b/x11-toolkits/qt5-widgets/pkg-plist @@ -1,9 +1,14 @@ +%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/complexwidgets_p.h +%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/itemviews_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractbutton_p.h +%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractitemdelegate_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractitemview_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractscrollarea_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractslider_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qabstractspinbox_p.h +%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qaccessiblemenu_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qaccessiblewidgetfactory_p.h +%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qaccessiblewidgets_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qaction_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qandroidstyle_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qapplication_p.h @@ -128,6 +133,8 @@ %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwindowsxpstyle_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwindowsxpstyle_p_p.h %%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/qwizard_win_p.h +%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/rangecontrols_p.h +%%QT_INCDIR%%/QtWidgets/%%FULLVER%%/QtWidgets/private/simplewidgets_p.h %%QT_INCDIR%%/QtWidgets/QAbstractButton %%QT_INCDIR%%/QtWidgets/QAbstractGraphicsShapeItem %%QT_INCDIR%%/QtWidgets/QAbstractItemDelegate @@ -135,45 +142,7 @@ %%QT_INCDIR%%/QtWidgets/QAbstractScrollArea %%QT_INCDIR%%/QtWidgets/QAbstractSlider %%QT_INCDIR%%/QtWidgets/QAbstractSpinBox -%%QT_INCDIR%%/QtWidgets/QAccessibleAbstractScrollArea -%%QT_INCDIR%%/QtWidgets/QAccessibleAbstractSlider -%%QT_INCDIR%%/QtWidgets/QAccessibleAbstractSpinBox -%%QT_INCDIR%%/QtWidgets/QAccessibleButton -%%QT_INCDIR%%/QtWidgets/QAccessibleCalendarWidget -%%QT_INCDIR%%/QtWidgets/QAccessibleComboBox -%%QT_INCDIR%%/QtWidgets/QAccessibleDial -%%QT_INCDIR%%/QtWidgets/QAccessibleDialogButtonBox -%%QT_INCDIR%%/QtWidgets/QAccessibleDisplay -%%QT_INCDIR%%/QtWidgets/QAccessibleDockWidget -%%QT_INCDIR%%/QtWidgets/QAccessibleDoubleSpinBox -%%QT_INCDIR%%/QtWidgets/QAccessibleGroupBox -%%QT_INCDIR%%/QtWidgets/QAccessibleLineEdit -%%QT_INCDIR%%/QtWidgets/QAccessibleMainWindow -%%QT_INCDIR%%/QtWidgets/QAccessibleMdiArea -%%QT_INCDIR%%/QtWidgets/QAccessibleMdiSubWindow -%%QT_INCDIR%%/QtWidgets/QAccessibleMenu -%%QT_INCDIR%%/QtWidgets/QAccessibleMenuBar -%%QT_INCDIR%%/QtWidgets/QAccessibleMenuItem -%%QT_INCDIR%%/QtWidgets/QAccessiblePlainTextEdit -%%QT_INCDIR%%/QtWidgets/QAccessibleProgressBar -%%QT_INCDIR%%/QtWidgets/QAccessibleScrollArea -%%QT_INCDIR%%/QtWidgets/QAccessibleScrollBar -%%QT_INCDIR%%/QtWidgets/QAccessibleSlider -%%QT_INCDIR%%/QtWidgets/QAccessibleSpinBox -%%QT_INCDIR%%/QtWidgets/QAccessibleStackedWidget -%%QT_INCDIR%%/QtWidgets/QAccessibleTabBar -%%QT_INCDIR%%/QtWidgets/QAccessibleTable -%%QT_INCDIR%%/QtWidgets/QAccessibleTableCell -%%QT_INCDIR%%/QtWidgets/QAccessibleTableCornerButton -%%QT_INCDIR%%/QtWidgets/QAccessibleTableHeaderCell -%%QT_INCDIR%%/QtWidgets/QAccessibleTextBrowser -%%QT_INCDIR%%/QtWidgets/QAccessibleTextEdit -%%QT_INCDIR%%/QtWidgets/QAccessibleTextWidget -%%QT_INCDIR%%/QtWidgets/QAccessibleToolBox -%%QT_INCDIR%%/QtWidgets/QAccessibleToolButton -%%QT_INCDIR%%/QtWidgets/QAccessibleTree %%QT_INCDIR%%/QtWidgets/QAccessibleWidget -%%QT_INCDIR%%/QtWidgets/QAccessibleWindowContainer %%QT_INCDIR%%/QtWidgets/QAction %%QT_INCDIR%%/QtWidgets/QActionGroup %%QT_INCDIR%%/QtWidgets/QApplication @@ -387,17 +356,13 @@ %%QT_INCDIR%%/QtWidgets/QtWidgets %%QT_INCDIR%%/QtWidgets/QtWidgetsDepends %%QT_INCDIR%%/QtWidgets/QtWidgetsVersion -%%QT_INCDIR%%/QtWidgets/complexwidgets.h -%%QT_INCDIR%%/QtWidgets/itemviews.h %%QT_INCDIR%%/QtWidgets/qabstractbutton.h %%QT_INCDIR%%/QtWidgets/qabstractitemdelegate.h %%QT_INCDIR%%/QtWidgets/qabstractitemview.h %%QT_INCDIR%%/QtWidgets/qabstractscrollarea.h %%QT_INCDIR%%/QtWidgets/qabstractslider.h %%QT_INCDIR%%/QtWidgets/qabstractspinbox.h -%%QT_INCDIR%%/QtWidgets/qaccessiblemenu.h %%QT_INCDIR%%/QtWidgets/qaccessiblewidget.h -%%QT_INCDIR%%/QtWidgets/qaccessiblewidgets.h %%QT_INCDIR%%/QtWidgets/qaction.h %%QT_INCDIR%%/QtWidgets/qactiongroup.h %%QT_INCDIR%%/QtWidgets/qapplication.h @@ -521,8 +486,6 @@ %%QT_INCDIR%%/QtWidgets/qwidgetaction.h %%QT_INCDIR%%/QtWidgets/qwidgetsfunctions_wince.h %%QT_INCDIR%%/QtWidgets/qwizard.h -%%QT_INCDIR%%/QtWidgets/rangecontrols.h -%%QT_INCDIR%%/QtWidgets/simplewidgets.h %%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake %%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfigExtras.cmake %%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfigVersion.cmake diff --git a/x11/qt5-x11extras/Makefile b/x11/qt5-x11extras/Makefile index a333873bb3b7..e8b29fadb3df 100644 --- a/x11/qt5-x11extras/Makefile +++ b/x11/qt5-x11extras/Makefile @@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt platform-specific features for X11-based systems -USE_QT5= core gui widgets +USE_QT5= core gui QT_DIST= x11extras USES= qmake USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/x11/qt5-x11extras/pkg-plist b/x11/qt5-x11extras/pkg-plist index 24163046e596..561f5539ceae 100644 --- a/x11/qt5-x11extras/pkg-plist +++ b/x11/qt5-x11extras/pkg-plist @@ -12,6 +12,7 @@ %%QT_LIBDIR%%/libQt5X11Extras.so.5 %%QT_LIBDIR%%/libQt5X11Extras.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt5X11Extras.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt5X11Extras.so.%%FULLVER%%.debug %%QT_MKSPECDIR%%/modules/qt_lib_x11extras.pri %%QT_MKSPECDIR%%/modules/qt_lib_x11extras_private.pri libdata/pkgconfig/Qt5X11Extras.pc |