diff --git a/MOVED b/MOVED index 4150089baedf..f71a7cf20d88 100644 --- a/MOVED +++ b/MOVED @@ -9839,3 +9839,4 @@ devel/p5-Parse-Pidl44|devel/p5-Parse-Pidl|2018-01-01|Has expired: use devel/p5-P sysutils/DTraceToolkit||2018-01-01|Has expired: Now maintained as part of the base system www/rubygem-jwt2|www/rubygem-jwt|2018-01-02|www/rubygem-jwt has been updated to 2.x misc/py-qt5-doc||2018-01-02|No longer shipped by upstream +x11-toolkits/qt5-declarative-render2d/||2018-01-05|Merged into x11-toolkits/qt5-quick diff --git a/Mk/Uses/qmake.mk b/Mk/Uses/qmake.mk index eddb1695ba27..41b0da9c6d0f 100644 --- a/Mk/Uses/qmake.mk +++ b/Mk/Uses/qmake.mk @@ -16,6 +16,11 @@ # Default: ${CONFIGURE_ENV} # QMAKE_ARGS - Arguments passed to qmake. # Default: see below +# QMAKE_CONFIGURE_ARGS - Extra arguments passed to qmake after everything +# else, such as "-foo -no-bar". The arguments are usually +# set in configure.json. This variable is specific to +# qmake from Qt 5. +# Default: empty # QMAKE_SOURCE_PATH - Path to qmake project files. # Default: ${WRKSRC} if out-of-source build is # requested, empty otherwise. @@ -105,7 +110,9 @@ DESTDIRNAME= INSTALL_ROOT qmake-configure: @${MKDIR} ${_QMAKE_WRKSRC} @cd ${_QMAKE_WRKSRC} && \ - ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH} + ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} \ + ${QMAKE_SOURCE_PATH} \ + ${QMAKE_CONFIGURE_ARGS:?--:} ${QMAKE_CONFIGURE_ARGS} .if !target(do-configure) && ! ${qmake_ARGS:M_env} _USES_configure+= 450:qmake-configure diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index 2b8589f5bfff..85d11ac85694 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.7.1 +QT5_VERSION?= 5.9.3 _QT_RELNAME= qt${_QT_VERSION:R:R} _QT_VERSION= # empty @@ -88,23 +88,19 @@ LDFLAGS+= -Wl,--as-needed # Ensure that the "makesum" target (with its inner "fetch" one) uses # devel/qt*/distinfo for every port. . if ${DISTINFO_FILE:H} == ${.CURDIR:H:H}/devel/${_QT_RELNAME} -QT_DIST= 3d base canvas3d charts connectivity datavis3d declarative \ - declarative-render2d gamepad graphicaleffects imageformats \ - location multimedia quickcontrols quickcontrols2 script scxml \ - sensors serialbus serialport svg tools translations \ - virtualkeyboard wayland webchannel webengine \ - websockets x11extras xmlpatterns +QT_DIST= 3d activeqt androidextras base canvas3d charts connectivity \ + datavis3d declarative doc gamepad graphicaleffects imageformats \ + location macextras multimedia networkauth purchasing \ + quickcontrols2 quickcontrols remoteobjects script scxml sensors \ + serialbus serialport speech svg tools translations \ + virtualkeyboard wayland webchannel webengine websockets webview \ + winextras x11extras xmlpatterns . endif . endif . if ${QT_DIST} == "base" && ${PORTNAME} != "qmake" # Qt configure requires pkg-config to detect dependencies. USES+= pkgconfig - -# Set QMAKESPEC when building qtbase so that qmake (called by the configure -# script) can find the mkspecs we create ourselves in devel/qmake5. -CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" -MAKE_ENV+= QMAKESPEC="${QMAKESPEC}" . endif # -nomake is only used by qtbase's configure script. @@ -117,7 +113,6 @@ EXTRACT_AFTER_ARGS?= ${DISTNAME:S,$,/examples,:S,^,--exclude ,} \ CONFIGURE_ENV+= MAKE="${MAKE:T}" CONFIGURE_ARGS+=-opensource -confirm-license \ - -platform ${QMAKESPEC} \ -no-pch \ -prefix ${PREFIX} \ -bindir ${PREFIX}/${QT_BINDIR_REL} \ @@ -132,6 +127,7 @@ CONFIGURE_ARGS+=-opensource -confirm-license \ . if ${_QT_VERSION:M4*} CONFIGURE_ARGS+=-fast \ + -platform ${QMAKESPEC} \ -system-libjpeg -system-libpng \ -system-libmng -system-libtiff -system-zlib \ -no-phonon-backend \ @@ -139,6 +135,7 @@ CONFIGURE_ARGS+=-fast \ -demosdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/demos . else CONFIGURE_ARGS+=-nomake examples -nomake tests \ + -platform ${QMAKESPEC:T} \ -archdatadir ${PREFIX}/${QT_ARCHDIR_REL} \ -libexecdir ${PREFIX}/${QT_LIBEXECDIR_REL} \ -qmldir ${PREFIX}/${QT_QMLDIR_REL} \ @@ -150,6 +147,9 @@ CONFIGURE_ARGS+=-no-sse2 # Work around a bug in current binutils, where the gold linker creates # duplicate symbols. See pr 218187. Disable the gold-linker for Qt5 ports. CONFIGURE_ARGS+= -no-use-gold-linker +# Pass -recheck-all so that multiple calls to the configure script really +# re-run all checks. +CONFIGURE_ARGS+= -recheck-all . endif . if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG) @@ -174,16 +174,16 @@ CONFIGURE_ARGS+=-verbose . if ${QT_DIST} == "base" || ${_QT_VERSION:M4*} . if ${_QT_VERSION:M4*} _EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h \ - ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool + ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool \ + ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test # Patch in proper name for armv6 architecture: https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html _EXTRA_PATCHES_QT4+= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-armv6 . else _EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \ - ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests_unix_arch.test + ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf . endif EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \ - ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \ ${_EXTRA_PATCHES_QT4} ${_EXTRA_PATCHES_QT5} . endif @@ -287,6 +287,11 @@ PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}" CONFIGURE_ENV+= QT_SELECT=${_QT_RELNAME} MAKE_ENV+= QT_SELECT=${_QT_RELNAME} +# Make sure both the installed mkspecs as well as the ones being built are +# found, with the ones from the port being built having preference. +CONFIGURE_ENV+= QMAKEMODULES="${WRKSRC}/mkspecs/modules:${LOCALBASE}/${QT_MKSPECDIR_REL}/modules" +MAKE_ENV+= QMAKEMODULES="${WRKSRC}/mkspecs/modules:${LOCALBASE}/${QT_MKSPECDIR_REL}/modules" + .endif # !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include) .if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include) @@ -317,10 +322,10 @@ _USE_QT4_ONLY= accessible assistant-adp assistantclient clucene codecs-cn codecs qtestlib qvfb rcc uic uic3 xmlpatterns-tool _USE_QT5_ONLY= 3d buildtools canvas3d charts concurrent connectivity \ - core datavis3d declarative-render2d diag examples gamepad \ + core datavis3d diag examples gamepad \ graphicaleffects location paths phonon4 plugininfo printsupport \ qdbus qdoc qdoc-data qev qml quick quickcontrols \ - quickcontrols2 scxml sensors serialbus serialport \ + quickcontrols2 scxml sensors serialbus serialport speech \ sql-tds uiplugin uitools virtualkeyboard wayland webchannel \ webengine websockets websockets-qml widgets x11extras @@ -384,9 +389,6 @@ dbus_LIB= libQt${_QT_LIBVER}DBus.so declarative_PORT= x11-toolkits/${_QT_RELNAME}-declarative declarative_LIB= libQt${_QT_LIBVER}Declarative.so -declarative-render2d_PORT= x11-toolkits/${_QT_RELNAME}-declarative-render2d -declarative-render2d_PATH= ${LOCALBASE}/${QT_PLUGINDIR_REL}/scenegraph/libsoftwarecontext.so - demo_PORT= misc/${_QT_RELNAME}-qtdemo demo_PATH= ${LOCALBASE}/${QT_BINDIR_REL}/qtdemo @@ -549,6 +551,9 @@ serialbus_LIB= libQt${_QT_LIBVER}SerialBus.so serialport_PORT= comms/${_QT_RELNAME}-serialport serialport_LIB= libQt${_QT_LIBVER}SerialPort.so +speech_PORT= accessibility/${_QT_RELNAME}-speech +speech_LIB= libQt${_QT_LIBVER}TextToSpeech.so + sql_PORT= databases/${_QT_RELNAME}-sql sql_LIB= libQt${_QT_LIBVER}Sql.so @@ -727,8 +732,6 @@ qtbase-post-patch: . if ${PORTNAME} != "qmake" _QMAKE= ${CONFIGURE_WRKSRC}/bin/qmake - -post-configure: qmake-configure . endif . endif # ${QT_DIST} == "base" diff --git a/accessibility/Makefile b/accessibility/Makefile index ba82967c6a84..7ec1ed759d0a 100644 --- a/accessibility/Makefile +++ b/accessibility/Makefile @@ -25,6 +25,7 @@ SUBDIR += py-papi SUBDIR += py-speech-dispatcher SUBDIR += qt4-accessible + SUBDIR += qt5-speech SUBDIR += redshift SUBDIR += rubygem-atk SUBDIR += speech-dispatcher diff --git a/accessibility/qt5-speech/Makefile b/accessibility/qt5-speech/Makefile new file mode 100644 index 000000000000..a3c1f30444c3 --- /dev/null +++ b/accessibility/qt5-speech/Makefile @@ -0,0 +1,17 @@ +# $FreeBSD$ + +PORTNAME= speech +DISTVERSION= ${QT5_VERSION} +CATEGORIES= accessibility +PKGNAMEPREFIX= qt5- + +MAINTAINER= kde@FreeBSD.org +COMMENT= Accessibilty features for Qt5 + +LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher + +USES= pkgconfig qmake:outsource +USE_QT5= core gui buildtools_build qmake_build +QT_DIST= ${PORTNAME} + +.include diff --git a/accessibility/qt5-speech/pkg-plist b/accessibility/qt5-speech/pkg-plist new file mode 100644 index 000000000000..3a024949d0f6 --- /dev/null +++ b/accessibility/qt5-speech/pkg-plist @@ -0,0 +1,28 @@ +%%QT_INCDIR%%/QtTextToSpeech/%%FULLVER%%/QtTextToSpeech/private/qtexttospeech_p.h +%%QT_INCDIR%%/QtTextToSpeech/%%FULLVER%%/QtTextToSpeech/private/qvoice_p.h +%%QT_INCDIR%%/QtTextToSpeech/QTextToSpeech +%%QT_INCDIR%%/QtTextToSpeech/QTextToSpeechEngine +%%QT_INCDIR%%/QtTextToSpeech/QTextToSpeechPlugin +%%QT_INCDIR%%/QtTextToSpeech/QVoice +%%QT_INCDIR%%/QtTextToSpeech/QtTextToSpeech +%%QT_INCDIR%%/QtTextToSpeech/QtTextToSpeechDepends +%%QT_INCDIR%%/QtTextToSpeech/QtTextToSpeechVersion +%%QT_INCDIR%%/QtTextToSpeech/qtexttospeech.h +%%QT_INCDIR%%/QtTextToSpeech/qtexttospeech_global.h +%%QT_INCDIR%%/QtTextToSpeech/qtexttospeechengine.h +%%QT_INCDIR%%/QtTextToSpeech/qtexttospeechplugin.h +%%QT_INCDIR%%/QtTextToSpeech/qttexttospeechversion.h +%%QT_INCDIR%%/QtTextToSpeech/qvoice.h +%%QT_CMAKEDIR%%/Qt5TextToSpeech/Qt5TextToSpeechConfig.cmake +%%QT_CMAKEDIR%%/Qt5TextToSpeech/Qt5TextToSpeechConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5TextToSpeech/Qt5TextToSpeech_QTextToSpeechPluginSpeechd.cmake +%%QT_LIBDIR%%/libQt5TextToSpeech.prl +%%QT_LIBDIR%%/libQt5TextToSpeech.so +%%QT_LIBDIR%%/libQt5TextToSpeech.so.5 +%%QT_LIBDIR%%/libQt5TextToSpeech.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt5TextToSpeech.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt5TextToSpeech.so.%%FULLVER%%.debug +%%QT_MKSPECDIR%%/modules/qt_lib_texttospeech.pri +%%QT_MKSPECDIR%%/modules/qt_lib_texttospeech_private.pri +%%QT_PLUGINDIR%%/texttospeech/libqtexttospeech_speechd.so +libdata/pkgconfig/Qt5TextToSpeech.pc diff --git a/biology/ugene/files/patch-src_plugins__3rdparty_phylip_src_phylip.h b/biology/ugene/files/patch-src_plugins__3rdparty_phylip_src_phylip.h new file mode 100644 index 000000000000..cf733a59a1de --- /dev/null +++ b/biology/ugene/files/patch-src_plugins__3rdparty_phylip_src_phylip.h @@ -0,0 +1,10 @@ +--- src/plugins_3rdparty/phylip/src/phylip.h.orig 2017-12-30 19:54:56 UTC ++++ src/plugins_3rdparty/phylip/src/phylip.h +@@ -271,7 +271,6 @@ MALLOCRETURN *mymalloc(long); + #define MAXNCH 30 /* must be greater than or equal to nmlngth */ + #define maxcategs 9 /* maximum number of site types */ + #define maxcategs2 11 /* maximum number of site types + 2 */ +-#define point "." + #define pointe '.' + #define down 2 + #define MAXSHIMOTREES 100 diff --git a/chinese/gcin-qt5/files/patch-Makefile b/chinese/gcin-qt5/files/patch-Makefile index 3dfcff3fbafb..621d0e7ae495 100644 --- a/chinese/gcin-qt5/files/patch-Makefile +++ b/chinese/gcin-qt5/files/patch-Makefile @@ -15,8 +15,9 @@ +INCS=-I../im-client -I$(prefix)/include -I$(prefix)/include/qt5 `pkg-config Qt5Core Qt5Gui Qt5DBus --cflags` MODVERSION=`pkg-config --modversion Qt5Gui` QTINC=`pkg-config --variable=includedir Qt5Gui` - INCS+=-I$(QTINC)/QtGui/$(MODVERSION)/QtGui +-INCS+=-I$(QTINC)/QtGui/$(MODVERSION)/QtGui -#INCS+=-I/usr/include/i386-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui ++INCS+=-I$(QTINC)/QtGui/$(MODVERSION) -CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -DUNIX=1 -fPIC -DQT5 -DQT_SHARED -DQT_IMMODULE -DPIC -DDEBUG="0$(GCIN_DEBUG)" +CXXFLAGS+=$(INCS) -Wall -D_REENTRANT -DUNIX=1 -fPIC -DQT5 -DQT_SHARED -DQT_IMMODULE -DPIC -DDEBUG="0$(GCIN_DEBUG)" diff --git a/comms/qt5-connectivity/pkg-plist b/comms/qt5-connectivity/pkg-plist index 9dea3ef49f5f..d5b72ff186e0 100644 --- a/comms/qt5-connectivity/pkg-plist +++ b/comms/qt5-connectivity/pkg-plist @@ -2,6 +2,7 @@ %%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/bluetoothmanagement_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/device1_bluez5_p.h @@ -33,6 +34,7 @@ %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtledeviceinquiry_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtnotifier_p.h %%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtobexsession_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/osxbtperipheralmanager_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 @@ -42,7 +44,6 @@ %%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 @@ -61,6 +62,8 @@ %%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/qtbluetooth-config_p.h +%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/remotedevicemanager_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 @@ -118,6 +121,7 @@ %%QT_INCDIR%%/QtBluetooth/qlowenergydescriptordata.h %%QT_INCDIR%%/QtBluetooth/qlowenergyservice.h %%QT_INCDIR%%/QtBluetooth/qlowenergyservicedata.h +%%QT_INCDIR%%/QtBluetooth/qtbluetooth-config.h %%QT_INCDIR%%/QtBluetooth/qtbluetoothversion.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/adapter_p.h %%QT_INCDIR%%/QtNfc/%%FULLVER%%/QtNfc/private/agent_p.h diff --git a/comms/qt5-sensors/Makefile b/comms/qt5-sensors/Makefile index 025fcda4b9fe..9b253262a828 100644 --- a/comms/qt5-sensors/Makefile +++ b/comms/qt5-sensors/Makefile @@ -10,7 +10,7 @@ COMMENT= Qt sensors module USE_QT5= core qml quick buildtools_build QT_DIST= ${PORTNAME} -USES= qmake +USES= qmake:norecursive USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/comms/qt5-sensors/pkg-plist b/comms/qt5-sensors/pkg-plist index 50dadd6cf276..b88ebbfd77cd 100644 --- a/comms/qt5-sensors/pkg-plist +++ b/comms/qt5-sensors/pkg-plist @@ -6,7 +6,9 @@ %%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/qhumiditysensor_p.h %%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qirproximitysensor_p.h +%%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/qlidsensor_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 @@ -19,6 +21,7 @@ %%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/qtsensors-config_p.h %%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/sensorlog_p.h %%QT_INCDIR%%/QtSensors/%%FULLVER%%/QtSensors/private/simulatorgesturescommon_p.h %%QT_INCDIR%%/QtSensors/QAccelerometer @@ -45,9 +48,15 @@ %%QT_INCDIR%%/QtSensors/QHolsterFilter %%QT_INCDIR%%/QtSensors/QHolsterReading %%QT_INCDIR%%/QtSensors/QHolsterSensor +%%QT_INCDIR%%/QtSensors/QHumidityFilter +%%QT_INCDIR%%/QtSensors/QHumidityReading +%%QT_INCDIR%%/QtSensors/QHumiditySensor %%QT_INCDIR%%/QtSensors/QIRProximityFilter %%QT_INCDIR%%/QtSensors/QIRProximityReading %%QT_INCDIR%%/QtSensors/QIRProximitySensor +%%QT_INCDIR%%/QtSensors/QLidFilter +%%QT_INCDIR%%/QtSensors/QLidReading +%%QT_INCDIR%%/QtSensors/QLidSensor %%QT_INCDIR%%/QtSensors/QLightFilter %%QT_INCDIR%%/QtSensors/QLightReading %%QT_INCDIR%%/QtSensors/QLightSensor @@ -95,7 +104,9 @@ %%QT_INCDIR%%/QtSensors/qdistancesensor.h %%QT_INCDIR%%/QtSensors/qgyroscope.h %%QT_INCDIR%%/QtSensors/qholstersensor.h +%%QT_INCDIR%%/QtSensors/qhumiditysensor.h %%QT_INCDIR%%/QtSensors/qirproximitysensor.h +%%QT_INCDIR%%/QtSensors/qlidsensor.h %%QT_INCDIR%%/QtSensors/qlightsensor.h %%QT_INCDIR%%/QtSensors/qmagnetometer.h %%QT_INCDIR%%/QtSensors/qorientationsensor.h @@ -113,6 +124,7 @@ %%QT_INCDIR%%/QtSensors/qsensorsglobal.h %%QT_INCDIR%%/QtSensors/qtapsensor.h %%QT_INCDIR%%/QtSensors/qtiltsensor.h +%%QT_INCDIR%%/QtSensors/qtsensors-config.h %%QT_INCDIR%%/QtSensors/qtsensorsversion.h %%QT_CMAKEDIR%%/Qt5Sensors/Qt5SensorsConfig.cmake %%QT_CMAKEDIR%%/Qt5Sensors/Qt5SensorsConfigVersion.cmake diff --git a/comms/qt5-serialbus/Makefile b/comms/qt5-serialbus/Makefile index 2718ce58c344..7fc107800cc4 100644 --- a/comms/qt5-serialbus/Makefile +++ b/comms/qt5-serialbus/Makefile @@ -2,7 +2,6 @@ PORTNAME= serialbus DISTVERSION= ${QT5_VERSION} -PORTREVISION= 3 CATEGORIES= comms PKGNAMEPREFIX= qt5- diff --git a/comms/qt5-serialbus/pkg-plist b/comms/qt5-serialbus/pkg-plist index be42e226974d..a54e301c3fcf 100644 --- a/comms/qt5-serialbus/pkg-plist +++ b/comms/qt5-serialbus/pkg-plist @@ -1,5 +1,6 @@ %%QT_BINDIR%%/canbusutil %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdevice_p.h +%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdeviceinfo_p.h %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbus_symbols_p.h %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbusadu_p.h %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbusclient_p.h @@ -10,9 +11,12 @@ %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbusserver_p.h %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbustcpclient_p.h %%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbustcpserver_p.h +%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qtserialbus-config_p.h %%QT_INCDIR%%/QtSerialBus/QCanBus %%QT_INCDIR%%/QtSerialBus/QCanBusDevice +%%QT_INCDIR%%/QtSerialBus/QCanBusDeviceInfo %%QT_INCDIR%%/QtSerialBus/QCanBusFactory +%%QT_INCDIR%%/QtSerialBus/QCanBusFactoryV2 %%QT_INCDIR%%/QtSerialBus/QCanBusFrame %%QT_INCDIR%%/QtSerialBus/QModbusClient %%QT_INCDIR%%/QtSerialBus/QModbusDataUnit @@ -34,6 +38,7 @@ %%QT_INCDIR%%/QtSerialBus/QtSerialBusVersion %%QT_INCDIR%%/QtSerialBus/qcanbus.h %%QT_INCDIR%%/QtSerialBus/qcanbusdevice.h +%%QT_INCDIR%%/QtSerialBus/qcanbusdeviceinfo.h %%QT_INCDIR%%/QtSerialBus/qcanbusfactory.h %%QT_INCDIR%%/QtSerialBus/qcanbusframe.h %%QT_INCDIR%%/QtSerialBus/qmodbusclient.h @@ -48,6 +53,7 @@ %%QT_INCDIR%%/QtSerialBus/qmodbustcpclient.h %%QT_INCDIR%%/QtSerialBus/qmodbustcpserver.h %%QT_INCDIR%%/QtSerialBus/qserialbusglobal.h +%%QT_INCDIR%%/QtSerialBus/qtserialbus-config.h %%QT_INCDIR%%/QtSerialBus/qtserialbusversion.h %%QT_CMAKEDIR%%/Qt5SerialBus/Qt5SerialBusConfig.cmake %%QT_CMAKEDIR%%/Qt5SerialBus/Qt5SerialBusConfigVersion.cmake diff --git a/databases/qt5-sql/Makefile b/databases/qt5-sql/Makefile index 06f907b07ff0..cb336ee6270c 100644 --- a/databases/qt5-sql/Makefile +++ b/databases/qt5-sql/Makefile @@ -17,4 +17,10 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} +post-configure: +.for d in src/sql + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} +.endfor + .include diff --git a/databases/qt5-sql/pkg-plist b/databases/qt5-sql/pkg-plist index 18bf8e23f04d..b0287f7b1a25 100644 --- a/databases/qt5-sql/pkg-plist +++ b/databases/qt5-sql/pkg-plist @@ -1,18 +1,10 @@ -%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_db2_p.h -%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_ibase_p.h -%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_mysql_p.h -%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_oci_p.h -%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_odbc_p.h -%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_psql_p.h -%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_sqlite2_p.h -%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_sqlite_p.h -%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsql_tds_p.h %%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqlcachedresult_p.h %%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqldriver_p.h %%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqlnulldriver_p.h %%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqlquerymodel_p.h %%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqlresult_p.h %%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qsqltablemodel_p.h +%%QT_INCDIR%%/QtSql/%%FULLVER%%/QtSql/private/qtsqlglobal_p.h %%QT_INCDIR%%/QtSql/QSql %%QT_INCDIR%%/QtSql/QSqlDatabase %%QT_INCDIR%%/QtSql/QSqlDriver @@ -47,6 +39,7 @@ %%QT_INCDIR%%/QtSql/qsqlrelationaltablemodel.h %%QT_INCDIR%%/QtSql/qsqlresult.h %%QT_INCDIR%%/QtSql/qsqltablemodel.h +%%QT_INCDIR%%/QtSql/qtsqlglobal.h %%QT_INCDIR%%/QtSql/qtsqlversion.h %%QT_CMAKEDIR%%/Qt5Sql/Qt5SqlConfig.cmake %%QT_CMAKEDIR%%/Qt5Sql/Qt5SqlConfigVersion.cmake diff --git a/devel/qt5-assistant/files/patch-src__src.pro b/devel/qt5-assistant/files/patch-src__src.pro index 006794982b31..a5bbc33c00d7 100644 --- a/devel/qt5-assistant/files/patch-src__src.pro +++ b/devel/qt5-assistant/files/patch-src__src.pro @@ -3,16 +3,15 @@ missing dependencies. --- src/src.pro.orig 2016-02-25 20:14:01 UTC +++ src/src.pro -@@ -1,38 +1,3 @@ +@@ -1,52 +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 @@ -21,8 +20,13 @@ missing dependencies. - -SUBDIRS += linguist \ - qdoc \ -- qtplugininfo --if(!android|android_app):!ios: SUBDIRS += qtpaths +- qtattributionsscanner +- +-qtConfig(library) { +- !android|android_app: SUBDIRS += qtplugininfo +-} +- +-if(!android|android_app):!uikit: SUBDIRS += qtpaths - -mac { - SUBDIRS += macdeployqt @@ -36,10 +40,20 @@ missing dependencies. - -win32|winrt:SUBDIRS += windeployqt -winrt:SUBDIRS += winrtrunner --qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag - -qtNomakeTools( \ - pixeltool \ - macdeployqt \ -) +- +-# This is necessary to avoid a race condition between toolchain.prf +-# invocations in a module-by-module cross-build. +-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) { +- androiddeployqt.depends += qtattributionsscanner +- qdoc.depends += qtattributionsscanner +- windeployqt.depends += qtattributionsscanner +- winrtrunner.depends += qtattributionsscanner +- linguist.depends += qtattributionsscanner +-} +SUBDIRS = assistant diff --git a/devel/qt5-buildtools/Makefile b/devel/qt5-buildtools/Makefile index 41582e2c51f6..cd0caf63ebde 100644 --- a/devel/qt5-buildtools/Makefile +++ b/devel/qt5-buildtools/Makefile @@ -21,6 +21,12 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} MORE_WRKSRCS= src/tools/moc \ src/tools/rcc +post-configure: +.for d in src/tools/bootstrap ${MORE_WRKSRCS} + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} +.endfor + post-build: .for d in ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ diff --git a/devel/qt5-concurrent/Makefile b/devel/qt5-concurrent/Makefile index fc5f9fc4e925..9d5a26f792f9 100644 --- a/devel/qt5-concurrent/Makefile +++ b/devel/qt5-concurrent/Makefile @@ -20,4 +20,10 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} QT_DEFINES= CONCURRENT QT_CONFIG= concurrent +post-configure: +.for d in src/concurrent + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} +.endfor + .include diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile index f498469688e2..8fe190588c17 100644 --- a/devel/qt5-core/Makefile +++ b/devel/qt5-core/Makefile @@ -2,7 +2,6 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 4 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -10,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt core non-graphical module LIB_DEPENDS= libicui18n.so:devel/icu \ - libpcre.so:devel/pcre + libpcre2-posix.so:devel/pcre2 USE_GNOME= glib20 USE_QT5= qmake_build buildtools_build @@ -22,10 +21,10 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-accessibility -no-gif -no-libpng -no-libjpeg \ -no-openssl -no-gui -no-widgets -no-cups \ -no-iconv -no-dbus -no-opengl \ - -no-alsa -no-egl -no-evdev -no-feature-concurrent \ + -no-egl -no-evdev \ -no-fontconfig -no-freetype -no-gtk -no-harfbuzz \ - -no-libudev -no-pulseaudio -no-xcb -no-xinput2 -no-xkb -no-xcb-xlib \ - -no-xkbcommon -no-xrender -no-xshape -no-xsync -no-libinput + -no-libudev -no-xcb -no-xinput2 -no-xkb -no-xcb-xlib \ + -no-xkbcommon -no-libinput USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/corelib @@ -36,10 +35,26 @@ QT_CONFIG= glib icu .include +post-configure: +.for d in src/tools/bootstrap src/tools/qfloat16-tables src/corelib + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} +.endfor + +pre-build: +.for d in src/tools/bootstrap src/tools/qfloat16-tables src/corelib + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && \ + ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ + ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} +.endfor + post-install: # Allow qconfig.h to be customized by single ports. ${AWK} 'BEGIN{print "#include "}{print}' \ ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h > ${WRKDIR}/qconfig.h +# Cleanup qconfig.h and remove stray '#define QT_NO_FOO' + ${REINPLACE_CMD} "/#define QT_NO_/d" ${WRKDIR}/qconfig.h ${MV} ${WRKDIR}/qconfig.h ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h .include diff --git a/devel/qt5-core/files/patch-git_ea9a8672 b/devel/qt5-core/files/patch-git_ea9a8672 deleted file mode 100644 index 84a41fb4b33c..000000000000 --- a/devel/qt5-core/files/patch-git_ea9a8672 +++ /dev/null @@ -1,25 +0,0 @@ -From ea9a8672a19588e89c0bda8e0c31424687c1e05f Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Thu, 3 Nov 2016 12:14:56 -0700 -Subject: [PATCH] Fix build with ICC on macOS: is properly supported - -I'm guess I introduced the regression in the commit -18ed6f20ad4327fa2ffbb687ac2f3ca7429c4348, which I wasn't sure about. - -Change-Id: Ic46ff326a6ba46bc877cfffd14839f84fdf796e7 -Reviewed-by: Jake Petroules ---- src/corelib/global/qcompilerdetection.h.orig 2017-02-10 22:14:51 UTC -+++ src/corelib/global/qcompilerdetection.h -@@ -1066,12 +1066,6 @@ - # ifndef _HAS_VARIADIC_TEMPLATES - # undef Q_COMPILER_VARIADIC_TEMPLATES - # endif --# elif defined(_LIBCPP_VERSION) --// libc++ uses __has_feature(cxx_atomic), so disable the feature if the compiler --// doesn't support it. That's required for the Intel compiler 14.x or earlier on OS X, for example. --# if !__has_feature(cxx_atomic) --# undef Q_COMPILER_ATOMICS --# endif - # endif - # if defined(Q_COMPILER_THREADSAFE_STATICS) && defined(Q_OS_MAC) - // Apple's low-level implementation of the C++ support library diff --git a/devel/qt5-core/files/patch-git_fa3940cc b/devel/qt5-core/files/patch-git_fa3940cc deleted file mode 100644 index 30c2fd1b3b7e..000000000000 --- a/devel/qt5-core/files/patch-git_fa3940cc +++ /dev/null @@ -1,37 +0,0 @@ -From fa3940cc4b5580070f465d1f64a23a69bc925367 Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Mon, 29 May 2017 14:00:53 -0700 -Subject: [PATCH] QStorageInfo: Pass MNT_NOWAIT to getmntinfo - -This forces the API not to wait for synchronous I/O from the filesystems -and get the information, but instead just use the cached information -directly. It's a good idea if we have an unresponsive FS, like NFS with -an unreachable server. - -Task-number: QTBUG-61096 -Change-Id: Iddeeffb6f4ad4a2894a2fffd14c32f6e90664a63 -Reviewed-by: Tobias C. Berner -Reviewed-by: Shawn Rutledge -Reviewed-by: Edward Welbourne ---- - src/corelib/io/qstorageinfo_unix.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git src/corelib/io/qstorageinfo_unix.cpp src/corelib/io/qstorageinfo_unix.cpp -index b9c9883609..9072b34f54 100644 ---- src/corelib/io/qstorageinfo_unix.cpp -+++ src/corelib/io/qstorageinfo_unix.cpp -@@ -195,8 +195,12 @@ static bool shouldIncludeFs(const QStorageIterator &it) - - #if defined(Q_OS_BSD4) - -+#ifndef MNT_NOWAIT -+# define MNT_NOWAIT 0 -+#endif -+ - inline QStorageIterator::QStorageIterator() -- : entryCount(::getmntinfo(&stat_buf, 0)), -+ : entryCount(::getmntinfo(&stat_buf, MNT_NOWAIT)), - currentIndex(-1) - { - } diff --git a/devel/qt5-core/files/patch-src_corelib_corelib.pro b/devel/qt5-core/files/patch-src_corelib_corelib.pro index e24d3ff92da9..65aa4b79f8b7 100644 --- a/devel/qt5-core/files/patch-src_corelib_corelib.pro +++ b/devel/qt5-core/files/patch-src_corelib_corelib.pro @@ -12,21 +12,22 @@ to fix up the paths so that cmake files still land in the the "correct" location in /usr/local/lib/cmake -- as this seemed to be the least intrusive method. - ---- src/corelib/corelib.pro.orig 2017-02-04 18:51:27 UTC -+++ src/corelib/corelib.pro -@@ -113,12 +113,12 @@ cmake_extras_mkspec_dir_for_install.inpu - cmake_extras_mkspec_dir_for_install.output = $$DESTDIR/cmake/install/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake - - cmake_qt5_umbrella_module_files.files = $$cmake_umbrella_config_file.output $$cmake_umbrella_config_version_file.output +--- src/corelib/corelib.pro.orig 2017-06-28 11:54:29.000000000 +0200 ++++ src/corelib/corelib.pro 2017-07-20 23:06:37.223900000 +0200 +@@ -130,7 +130,7 @@ + $$cmake_umbrella_config_version_file.output \ + $$cmake_umbrella_config_module_location_for_install.output + -cmake_qt5_umbrella_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5 +cmake_qt5_umbrella_module_files.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5 - - QMAKE_SUBSTITUTES += ctest_macros_file cmake_umbrella_config_file cmake_umbrella_config_version_file cmake_extras_mkspec_dir cmake_extras_mkspec_dir_for_install - + + QMAKE_SUBSTITUTES += \ + ctest_macros_file \ +@@ -143,6 +143,6 @@ + ctest_qt5_module_files.files += $$ctest_macros_file.output $$cmake_extras_mkspec_dir_for_install.output - + -ctest_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5Core +ctest_qt5_module_files.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5Core - + INSTALLS += ctest_qt5_module_files cmake_qt5_umbrella_module_files diff --git a/devel/qt5-core/pkg-plist b/devel/qt5-core/pkg-plist index 56059f83e814..7a1fcadd257c 100644 --- a/devel/qt5-core/pkg-plist +++ b/devel/qt5-core/pkg-plist @@ -12,16 +12,17 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcfsocketnotifier_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcollator_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qconfig_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcore_mac_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcore_unix_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcoreapplication_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcorecmdlineargs_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcoreglobaldata_p.h -%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcrashhandler_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdatastream_p.h %%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/qdeadlinetimer_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/qdoublescanprint_p.h @@ -51,6 +52,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_polling_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_win_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfinalstate_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfloat16_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfreelist_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_iterator_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_p.h @@ -59,6 +61,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfutureinterface_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfuturewatcher_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qgb18030codec_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qglobal_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qharfbuzz_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhistorystate_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qhooks_p.h @@ -100,6 +103,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qnoncontiguousbytedevice_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qnumeric_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qobject_p.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qoperatingsystemversion_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qorderedmutexlocker_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qparallelanimationgroup_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qpodlist_p.h @@ -133,6 +137,7 @@ %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemlibrary_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qsystemsemaphore_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qt_pch.h +%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtcore-config_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtemporaryfile_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtextcodec_p.h %%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qtextstream_p.h @@ -206,6 +211,7 @@ %%QT_INCDIR%%/QtCore/QDataStream %%QT_INCDIR%%/QtCore/QDate %%QT_INCDIR%%/QtCore/QDateTime +%%QT_INCDIR%%/QtCore/QDeadlineTimer %%QT_INCDIR%%/QtCore/QDebug %%QT_INCDIR%%/QtCore/QDebugStateSaver %%QT_INCDIR%%/QtCore/QDeferredDeleteEvent @@ -231,7 +237,7 @@ %%QT_INCDIR%%/QtCore/QFinalState %%QT_INCDIR%%/QtCore/QFlag %%QT_INCDIR%%/QtCore/QFlags -%%QT_INCDIR%%/QtCore/QForeachContainer +%%QT_INCDIR%%/QtCore/QFloat16 %%QT_INCDIR%%/QtCore/QFunctionPointer %%QT_INCDIR%%/QtCore/QFuture %%QT_INCDIR%%/QtCore/QFutureInterface @@ -326,6 +332,7 @@ %%QT_INCDIR%%/QtCore/QObjectData %%QT_INCDIR%%/QtCore/QObjectList %%QT_INCDIR%%/QtCore/QObjectUserData +%%QT_INCDIR%%/QtCore/QOperatingSystemVersion %%QT_INCDIR%%/QtCore/QPair %%QT_INCDIR%%/QtCore/QParallelAnimationGroup %%QT_INCDIR%%/QtCore/QPauseAnimation @@ -382,6 +389,7 @@ %%QT_INCDIR%%/QtCore/QStaticArrayData %%QT_INCDIR%%/QtCore/QStaticAssertFailure %%QT_INCDIR%%/QtCore/QStaticByteArrayData +%%QT_INCDIR%%/QtCore/QStaticByteArrayMatcherBase %%QT_INCDIR%%/QtCore/QStaticPlugin %%QT_INCDIR%%/QtCore/QStaticStringData %%QT_INCDIR%%/QtCore/QStorageInfo @@ -499,12 +507,7 @@ %%QT_INCDIR%%/QtCore/qcommandlineoption.h %%QT_INCDIR%%/QtCore/qcommandlineparser.h %%QT_INCDIR%%/QtCore/qcompilerdetection.h -%%QT_INCDIR%%/QtCore/qconfig-dist.h -%%QT_INCDIR%%/QtCore/qconfig-large.h -%%QT_INCDIR%%/QtCore/qconfig-medium.h -%%QT_INCDIR%%/QtCore/qconfig-minimal.h -%%QT_INCDIR%%/QtCore/qconfig-nacl.h -%%QT_INCDIR%%/QtCore/qconfig-small.h +%%QT_INCDIR%%/QtCore/qconfig-bootstrapped.h %%QT_INCDIR%%/QtCore/qconfig.h %%QT_INCDIR%%/QtCore/qcontainerfwd.h %%QT_INCDIR%%/QtCore/qcontiguouscache.h @@ -513,6 +516,7 @@ %%QT_INCDIR%%/QtCore/qcryptographichash.h %%QT_INCDIR%%/QtCore/qdatastream.h %%QT_INCDIR%%/QtCore/qdatetime.h +%%QT_INCDIR%%/QtCore/qdeadlinetimer.h %%QT_INCDIR%%/QtCore/qdebug.h %%QT_INCDIR%%/QtCore/qdir.h %%QT_INCDIR%%/QtCore/qdiriterator.h @@ -523,7 +527,6 @@ %%QT_INCDIR%%/QtCore/qeventtransition.h %%QT_INCDIR%%/QtCore/qexception.h %%QT_INCDIR%%/QtCore/qfactoryinterface.h -%%QT_INCDIR%%/QtCore/qfeatures.h %%QT_INCDIR%%/QtCore/qfile.h %%QT_INCDIR%%/QtCore/qfiledevice.h %%QT_INCDIR%%/QtCore/qfileinfo.h @@ -531,9 +534,9 @@ %%QT_INCDIR%%/QtCore/qfilesystemwatcher.h %%QT_INCDIR%%/QtCore/qfinalstate.h %%QT_INCDIR%%/QtCore/qflags.h +%%QT_INCDIR%%/QtCore/qfloat16.h %%QT_INCDIR%%/QtCore/qfunctions_nacl.h %%QT_INCDIR%%/QtCore/qfunctions_vxworks.h -%%QT_INCDIR%%/QtCore/qfunctions_wince.h %%QT_INCDIR%%/QtCore/qfunctions_winrt.h %%QT_INCDIR%%/QtCore/qfuture.h %%QT_INCDIR%%/QtCore/qfutureinterface.h @@ -580,6 +583,7 @@ %%QT_INCDIR%%/QtCore/qobjectcleanuphandler.h %%QT_INCDIR%%/QtCore/qobjectdefs.h %%QT_INCDIR%%/QtCore/qobjectdefs_impl.h +%%QT_INCDIR%%/QtCore/qoperatingsystemversion.h %%QT_INCDIR%%/QtCore/qpair.h %%QT_INCDIR%%/QtCore/qparallelanimationgroup.h %%QT_INCDIR%%/QtCore/qpauseanimation.h @@ -629,6 +633,7 @@ %%QT_INCDIR%%/QtCore/qsystemdetection.h %%QT_INCDIR%%/QtCore/qsystemsemaphore.h %%QT_INCDIR%%/QtCore/qt_windows.h +%%QT_INCDIR%%/QtCore/qtcore-config.h %%QT_INCDIR%%/QtCore/qtcoreversion.h %%QT_INCDIR%%/QtCore/qtemporarydir.h %%QT_INCDIR%%/QtCore/qtemporaryfile.h @@ -658,6 +663,7 @@ %%QT_INCDIR%%/QtCore/qxmlstream.h %%QT_CMAKEDIR%%/Qt5/Qt5Config.cmake %%QT_CMAKEDIR%%/Qt5/Qt5ConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5/Qt5ModuleLocation.cmake %%QT_CMAKEDIR%%/Qt5Core/Qt5CTestMacros.cmake %%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfig.cmake %%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfigExtras.cmake diff --git a/devel/qt5-dbus/Makefile b/devel/qt5-dbus/Makefile index 9bc93a64078f..9db2eb3c436e 100644 --- a/devel/qt5-dbus/Makefile +++ b/devel/qt5-dbus/Makefile @@ -24,6 +24,12 @@ TOOLS= qdbuscpp2xml qdbusxml2cpp QT_DEFINES= DBUS QT_CONFIG= dbus +post-configure: +.for d in src/dbus src/tools/qdbuscpp2xml src/tools/qdbusxml2cpp + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} +.endfor + post-build: .for t in ${TOOLS} @cd ${WRKSRC}/src/tools/${t} && \ diff --git a/devel/qt5-dbus/pkg-plist b/devel/qt5-dbus/pkg-plist index babecffebed1..00256c658193 100644 --- a/devel/qt5-dbus/pkg-plist +++ b/devel/qt5-dbus/pkg-plist @@ -16,6 +16,7 @@ %%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusthreaddebug_p.h %%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusutil_p.h %%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qdbusxmlparser_p.h +%%QT_INCDIR%%/QtDBus/%%FULLVER%%/QtDBus/private/qtdbusglobal_p.h %%QT_INCDIR%%/QtDBus/QDBusAbstractAdaptor %%QT_INCDIR%%/QtDBus/QDBusAbstractInterface %%QT_INCDIR%%/QtDBus/QDBusAbstractInterfaceBase @@ -61,6 +62,7 @@ %%QT_INCDIR%%/QtDBus/qdbusservicewatcher.h %%QT_INCDIR%%/QtDBus/qdbusunixfiledescriptor.h %%QT_INCDIR%%/QtDBus/qdbusvirtualobject.h +%%QT_INCDIR%%/QtDBus/qtdbusglobal.h %%QT_INCDIR%%/QtDBus/qtdbusversion.h %%QT_CMAKEDIR%%/Qt5DBus/Qt5DBusConfig.cmake %%QT_CMAKEDIR%%/Qt5DBus/Qt5DBusConfigExtras.cmake diff --git a/devel/qt5-designer/Makefile b/devel/qt5-designer/Makefile index 9f05286abcc6..5b424ea389f3 100644 --- a/devel/qt5-designer/Makefile +++ b/devel/qt5-designer/Makefile @@ -2,7 +2,6 @@ PORTNAME= designer DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-designer/files/patch-src__src.pro b/devel/qt5-designer/files/patch-src__src.pro index 5437aa947ab1..a5d94621a3f4 100644 --- a/devel/qt5-designer/files/patch-src__src.pro +++ b/devel/qt5-designer/files/patch-src__src.pro @@ -3,16 +3,15 @@ missing dependencies. --- src/src.pro.orig 2016-02-25 20:24:46 UTC +++ src/src.pro -@@ -1,38 +1,3 @@ +@@ -1,52 +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 @@ -21,8 +20,13 @@ missing dependencies. - -SUBDIRS += linguist \ - qdoc \ -- qtplugininfo --if(!android|android_app):!ios: SUBDIRS += qtpaths +- qtattributionsscanner +- +-qtConfig(library) { +- !android|android_app: SUBDIRS += qtplugininfo +-} +- +-if(!android|android_app):!uikit: SUBDIRS += qtpaths - -mac { - SUBDIRS += macdeployqt @@ -36,10 +40,20 @@ missing dependencies. - -win32|winrt:SUBDIRS += windeployqt -winrt:SUBDIRS += winrtrunner --qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag - -qtNomakeTools( \ - pixeltool \ - macdeployqt \ -) +- +-# This is necessary to avoid a race condition between toolchain.prf +-# invocations in a module-by-module cross-build. +-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) { +- androiddeployqt.depends += qtattributionsscanner +- qdoc.depends += qtattributionsscanner +- windeployqt.depends += qtattributionsscanner +- winrtrunner.depends += qtattributionsscanner +- linguist.depends += qtattributionsscanner +-} +SUBDIRS = designer diff --git a/devel/qt5-help/files/patch-src__assistant__assistant.pro b/devel/qt5-help/files/patch-src__assistant__assistant.pro index 872697f630ec..ad580b302d17 100644 --- a/devel/qt5-help/files/patch-src__assistant__assistant.pro +++ b/devel/qt5-help/files/patch-src__assistant__assistant.pro @@ -5,16 +5,15 @@ assistant/ is built in devel/qt5-assistant. --- src/assistant/assistant.pro.orig 2016-06-10 14:46:48 UTC +++ src/assistant/assistant.pro -@@ -2,19 +2,16 @@ TEMPLATE = subdirs +@@ -2,18 +2,15 @@ TEMPLATE = subdirs - SUBDIRS += clucene \ + SUBDIRS += \ help \ - assistant \ qhelpgenerator \ qcollectiongenerator \ qhelpconverter - help.depends = clucene -assistant.depends = help qhelpgenerator.depends = help qcollectiongenerator.depends = help diff --git a/devel/qt5-help/files/patch-src__src.pro b/devel/qt5-help/files/patch-src__src.pro index 1fe22afc0443..c409bf9b6be4 100644 --- a/devel/qt5-help/files/patch-src__src.pro +++ b/devel/qt5-help/files/patch-src__src.pro @@ -3,16 +3,15 @@ missing dependencies. --- src/src.pro.orig 2016-02-25 17:34:05 UTC +++ src/src.pro -@@ -1,38 +1,3 @@ +@@ -1,52 +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 @@ -21,8 +20,13 @@ missing dependencies. - -SUBDIRS += linguist \ - qdoc \ -- qtplugininfo --if(!android|android_app):!ios: SUBDIRS += qtpaths +- qtattributionsscanner +- +-qtConfig(library) { +- !android|android_app: SUBDIRS += qtplugininfo +-} +- +-if(!android|android_app):!uikit: SUBDIRS += qtpaths - -mac { - SUBDIRS += macdeployqt @@ -36,10 +40,20 @@ missing dependencies. - -win32|winrt:SUBDIRS += windeployqt -winrt:SUBDIRS += winrtrunner --qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag - -qtNomakeTools( \ - pixeltool \ - macdeployqt \ -) +- +-# This is necessary to avoid a race condition between toolchain.prf +-# invocations in a module-by-module cross-build. +-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) { +- androiddeployqt.depends += qtattributionsscanner +- qdoc.depends += qtattributionsscanner +- windeployqt.depends += qtattributionsscanner +- winrtrunner.depends += qtattributionsscanner +- linguist.depends += qtattributionsscanner +-} +SUBDIRS = assistant diff --git a/devel/qt5-help/pkg-plist b/devel/qt5-help/pkg-plist index 6dd7b0abd93e..0887e508bd6a 100644 --- a/devel/qt5-help/pkg-plist +++ b/devel/qt5-help/pkg-plist @@ -1,37 +1,11 @@ -%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qanalyzer_p.h -%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qclucene-config_p.h -%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qclucene_global_p.h -%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qdocument_p.h -%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qfield_p.h -%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qfilter_p.h -%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qhits_p.h -%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qindexreader_p.h -%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qindexwriter_p.h -%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qquery_p.h -%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qqueryparser_p.h -%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qreader_p.h -%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qsearchable_p.h -%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qsort_p.h -%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qterm_p.h -%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qtoken_p.h -%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qtokenizer_p.h -%%QT_INCDIR%%/QtCLucene/%%FULLVER%%/QtCLucene/private/qtokenstream_p.h -%%QT_INCDIR%%/QtCLucene/QtCLucene -%%QT_INCDIR%%/QtCLucene/QtCLuceneDepends -%%QT_INCDIR%%/QtCLucene/QtCLuceneVersion -%%QT_INCDIR%%/QtCLucene/qtcluceneversion.h -%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qclucenefieldnames_p.h %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpcollectionhandler_p.h %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpdatainterface_p.h %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpdbreader_p.h %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpengine_p.h %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpgenerator_p.h %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpprojectdata_p.h -%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindex_default_p.h -%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_clucene_p.h %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_default_p.h %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_p.h -%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexwriter_clucene_p.h %%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexwriter_default_p.h %%QT_INCDIR%%/QtHelp/QHelpContentItem %%QT_INCDIR%%/QtHelp/QHelpContentModel @@ -44,6 +18,7 @@ %%QT_INCDIR%%/QtHelp/QHelpSearchEngine %%QT_INCDIR%%/QtHelp/QHelpSearchQuery %%QT_INCDIR%%/QtHelp/QHelpSearchQueryWidget +%%QT_INCDIR%%/QtHelp/QHelpSearchResult %%QT_INCDIR%%/QtHelp/QHelpSearchResultWidget %%QT_INCDIR%%/QtHelp/QtHelp %%QT_INCDIR%%/QtHelp/QtHelpDepends @@ -60,13 +35,6 @@ %%QT_CMAKEDIR%%/Qt5Help/Qt5HelpConfig.cmake %%QT_CMAKEDIR%%/Qt5Help/Qt5HelpConfigExtras.cmake %%QT_CMAKEDIR%%/Qt5Help/Qt5HelpConfigVersion.cmake -%%QT_LIBDIR%%/libQt5CLucene.prl -%%QT_LIBDIR%%/libQt5CLucene.so -%%QT_LIBDIR%%/libQt5CLucene.so.5 -%%QT_LIBDIR%%/libQt5CLucene.so.%%SHORTVER%% -%%QT_LIBDIR%%/libQt5CLucene.so.%%FULLVER%% -%%DEBUG%%%%QT_LIBDIR%%/libQt5CLucene.so.%%FULLVER%%.debug -%%QT_MKSPECDIR%%/modules/qt_lib_clucene_private.pri %%QT_LIBDIR%%/libQt5Help.prl %%QT_LIBDIR%%/libQt5Help.so %%QT_LIBDIR%%/libQt5Help.so.5 diff --git a/devel/qt5-linguist/files/patch-src__src.pro b/devel/qt5-linguist/files/patch-src__src.pro index 24011e5c9339..d44c9293fbc8 100644 --- a/devel/qt5-linguist/files/patch-src__src.pro +++ b/devel/qt5-linguist/files/patch-src__src.pro @@ -1,18 +1,17 @@ Only enter the directories we want to build, otherwise we might fail due to missing dependencies. ---- src/src.pro.orig 2016-02-25 20:36:57 UTC +--- src/src.pro.orig 2016-07-23 14:50:14 UTC +++ src/src.pro -@@ -1,38 +1,3 @@ +@@ -1,52 +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 @@ -21,8 +20,13 @@ missing dependencies. - -SUBDIRS += linguist \ - qdoc \ -- qtplugininfo --if(!android|android_app):!ios: SUBDIRS += qtpaths +- qtattributionsscanner +- +-qtConfig(library) { +- !android|android_app: SUBDIRS += qtplugininfo +-} +- +-if(!android|android_app):!uikit: SUBDIRS += qtpaths - -mac { - SUBDIRS += macdeployqt @@ -36,10 +40,20 @@ missing dependencies. - -win32|winrt:SUBDIRS += windeployqt -winrt:SUBDIRS += winrtrunner --qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag - -qtNomakeTools( \ - pixeltool \ - macdeployqt \ -) +- +-# This is necessary to avoid a race condition between toolchain.prf +-# invocations in a module-by-module cross-build. +-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) { +- androiddeployqt.depends += qtattributionsscanner +- qdoc.depends += qtattributionsscanner +- windeployqt.depends += qtattributionsscanner +- winrtrunner.depends += qtattributionsscanner +- linguist.depends += qtattributionsscanner +-} +SUBDIRS = linguist diff --git a/devel/qt5-linguisttools/files/patch-src__src.pro b/devel/qt5-linguisttools/files/patch-src__src.pro index 976ab9f60dfe..4cf6a5e0ef3e 100644 --- a/devel/qt5-linguisttools/files/patch-src__src.pro +++ b/devel/qt5-linguisttools/files/patch-src__src.pro @@ -3,16 +3,15 @@ missing dependencies. --- src/src.pro.orig 2016-02-25 17:37:24 UTC +++ src/src.pro -@@ -1,38 +1,3 @@ +@@ -1,52 +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 @@ -21,8 +20,13 @@ missing dependencies. - -SUBDIRS += linguist \ - qdoc \ -- qtplugininfo --if(!android|android_app):!ios: SUBDIRS += qtpaths +- qtattributionsscanner +- +-qtConfig(library) { +- !android|android_app: SUBDIRS += qtplugininfo +-} +- +-if(!android|android_app):!uikit: SUBDIRS += qtpaths - -mac { - SUBDIRS += macdeployqt @@ -36,10 +40,20 @@ missing dependencies. - -win32|winrt:SUBDIRS += windeployqt -winrt:SUBDIRS += winrtrunner --qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag - -qtNomakeTools( \ - pixeltool \ - macdeployqt \ -) +- +-# This is necessary to avoid a race condition between toolchain.prf +-# invocations in a module-by-module cross-build. +-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) { +- androiddeployqt.depends += qtattributionsscanner +- qdoc.depends += qtattributionsscanner +- windeployqt.depends += qtattributionsscanner +- winrtrunner.depends += qtattributionsscanner +- linguist.depends += qtattributionsscanner +-} +SUBDIRS = linguist diff --git a/devel/qt5-location/Makefile b/devel/qt5-location/Makefile index 767e74df908b..fce2cf053bb2 100644 --- a/devel/qt5-location/Makefile +++ b/devel/qt5-location/Makefile @@ -8,9 +8,9 @@ PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt location module -USE_QT5= core dbus gui network qml quick buildtools_build +USE_QT5= concurrent core dbus gui network qml quick buildtools_build QT_DIST= ${PORTNAME} -USES= qmake +USES= qmake:norecursive USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} diff --git a/devel/qt5-location/files/patch-src_plugins_geoservices_geoservices.pro b/devel/qt5-location/files/patch-src_plugins_geoservices_geoservices.pro new file mode 100644 index 000000000000..446dbf2d94df --- /dev/null +++ b/devel/qt5-location/files/patch-src_plugins_geoservices_geoservices.pro @@ -0,0 +1,32 @@ +Disable the Mapbox code. + +It contains several bundled libraries (including Boost) and the code seems to +contain Linuxisms (as of 5.9.3): + +platform/default/thread.cpp:14:5: error: use of undeclared identifier 'pthread_getname_np' + pthread_getname_np(pthread_self(), name, sizeof(name)); + ^ +platform/default/thread.cpp:21:9: error: use of undeclared identifier 'pthread_setname_np' + pthread_setname_np(pthread_self(), name.substr(0, 15).c_str()); + ^ +platform/default/thread.cpp:23:9: error: use of undeclared identifier 'pthread_setname_np' + pthread_setname_np(pthread_self(), name.c_str()); + ^ +platform/default/thread.cpp:31:31: error: use of undeclared identifier 'SCHED_IDLE' + if (sched_setscheduler(0, SCHED_IDLE, ¶m) != 0) { + ^ +--- src/plugins/geoservices/geoservices.pro.orig 2017-11-10 10:54:34 UTC ++++ src/plugins/geoservices/geoservices.pro +@@ -7,12 +7,3 @@ qtConfig(geoservices_mapbox): SUBDIRS += mapbox + qtConfig(geoservices_esri): SUBDIRS += esri + qtConfig(geoservices_itemsoverlay): SUBDIRS += itemsoverlay + qtConfig(geoservices_osm): SUBDIRS += osm +- +-qtConfig(geoservices_mapboxgl) { +- !exists(../../3rdparty/mapbox-gl-native/mapbox-gl-native.pro) { +- warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.") +- } else { +- SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native +- mapboxgl.depends = ../../3rdparty/mapbox-gl-native +- } +-} diff --git a/devel/qt5-location/pkg-plist b/devel/qt5-location/pkg-plist index 6915c05da48e..87ebb7ce90e6 100644 --- a/devel/qt5-location/pkg-plist +++ b/devel/qt5-location/pkg-plist @@ -1,5 +1,45 @@ +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/error_messages_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/locationvaluetypehelper_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/mapitemviewdelegateincubator_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qabstractgeotilecache_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qcache3q_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecategory_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecirclemapitem_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecontactdetail_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeocodemodel_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomaneuver_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomap_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapcopyrightsnotice_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitembase_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemgroup_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemview_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemview_p_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapparameter_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapquickitem_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomaptype_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeoroute_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeoroutemodel_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeoroutesegment_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeoserviceprovider_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeperiod_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplace_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplaceattribute_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplacecontentmodel_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplaceeditorialmodel_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplaceicon_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplaceimagemodel_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplaceuser_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolygonmapitem_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolylinemapitem_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeratings_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativerectanglemapitem_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativereviewmodel_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeroutemapitem_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativesearchmodelbase_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativesearchresultmodel_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativesearchsuggestionmodel_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativesupplier_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativesupportedcategoriesmodel_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 @@ -10,12 +50,15 @@ %%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/qgeomapitemgeometry_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomapparameter_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/qgeomaptype_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeomaptype_p_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoprojection_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroute_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeorouteparser_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeorouteparser_p_p.h @@ -39,6 +82,7 @@ %%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/qlocationglobal_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 @@ -57,6 +101,8 @@ %%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/qquickgeomapgesturearea_p.h +%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qtlocation-config_p.h %%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/unsupportedreplies_p.h %%QT_INCDIR%%/QtLocation/QGeoCodeReply %%QT_INCDIR%%/QtLocation/QGeoCodingManager @@ -143,29 +189,35 @@ %%QT_INCDIR%%/QtLocation/qplacesearchsuggestionreply.h %%QT_INCDIR%%/QtLocation/qplacesupplier.h %%QT_INCDIR%%/QtLocation/qplaceuser.h +%%QT_INCDIR%%/QtLocation/qtlocation-config.h %%QT_INCDIR%%/QtLocation/qtlocationversion.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qclipperutils_p.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/qdoublematrix4x4_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/qgeopath_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/qlocationdata_simulator_p.h %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationutils_p.h %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qnmeapositioninfosource_p.h %%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qpositioningglobal_p.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qtpositioning-config_p.h +%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qwebmercator_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/QGeoPath %%QT_INCDIR%%/QtPositioning/QGeoPositionInfo %%QT_INCDIR%%/QtPositioning/QGeoPositionInfoSource %%QT_INCDIR%%/QtPositioning/QGeoPositionInfoSourceFactory @@ -183,6 +235,7 @@ %%QT_INCDIR%%/QtPositioning/qgeocircle.h %%QT_INCDIR%%/QtPositioning/qgeocoordinate.h %%QT_INCDIR%%/QtPositioning/qgeolocation.h +%%QT_INCDIR%%/QtPositioning/qgeopath.h %%QT_INCDIR%%/QtPositioning/qgeopositioninfo.h %%QT_INCDIR%%/QtPositioning/qgeopositioninfosource.h %%QT_INCDIR%%/QtPositioning/qgeopositioninfosourcefactory.h @@ -192,9 +245,12 @@ %%QT_INCDIR%%/QtPositioning/qgeoshape.h %%QT_INCDIR%%/QtPositioning/qnmeapositioninfosource.h %%QT_INCDIR%%/QtPositioning/qpositioningglobal.h +%%QT_INCDIR%%/QtPositioning/qtpositioning-config.h %%QT_INCDIR%%/QtPositioning/qtpositioningversion.h %%QT_CMAKEDIR%%/Qt5Location/Qt5LocationConfig.cmake %%QT_CMAKEDIR%%/Qt5Location/Qt5LocationConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5Location/Qt5Location_GeoServiceProviderFactoryEsri.cmake +%%QT_CMAKEDIR%%/Qt5Location/Qt5Location_QGeoServiceProviderFactoryItemsOverlay.cmake %%QT_CMAKEDIR%%/Qt5Location/Qt5Location_QGeoServiceProviderFactoryMapbox.cmake %%QT_CMAKEDIR%%/Qt5Location/Qt5Location_QGeoServiceProviderFactoryNokia.cmake %%QT_CMAKEDIR%%/Qt5Location/Qt5Location_QGeoServiceProviderFactoryOsm.cmake @@ -218,6 +274,10 @@ %%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_esri.so +%%DEBUG%%%%QT_PLUGINDIR%%/geoservices/libqtgeoservices_esri.so.debug +%%QT_PLUGINDIR%%/geoservices/libqtgeoservices_itemsoverlay.so +%%DEBUG%%%%QT_PLUGINDIR%%/geoservices/libqtgeoservices_itemsoverlay.so.debug %%QT_PLUGINDIR%%/geoservices/libqtgeoservices_mapbox.so %%DEBUG%%%%QT_PLUGINDIR%%/geoservices/libqtgeoservices_mapbox.so.debug %%QT_PLUGINDIR%%/geoservices/libqtgeoservices_nokia.so diff --git a/devel/qt5-qdbus/files/patch-src_src.pro b/devel/qt5-qdbus/files/patch-src_src.pro index 4c0f1824b7bf..ea7368e4cbdc 100644 --- a/devel/qt5-qdbus/files/patch-src_src.pro +++ b/devel/qt5-qdbus/files/patch-src_src.pro @@ -1,15 +1,17 @@ ---- src/src.pro.orig 2016-02-25 18:49:47 UTC +Only enter the directories we want to build, otherwise we might fail due to +missing dependencies. + +--- src/src.pro.orig 2016-07-23 14:50:14 UTC +++ src/src.pro -@@ -1,38 +1,3 @@ +@@ -1,52 +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 @@ -18,8 +20,13 @@ - -SUBDIRS += linguist \ - qdoc \ -- qtplugininfo --if(!android|android_app):!ios: SUBDIRS += qtpaths +- qtattributionsscanner +- +-qtConfig(library) { +- !android|android_app: SUBDIRS += qtplugininfo +-} +- +-if(!android|android_app):!uikit: SUBDIRS += qtpaths - -mac { - SUBDIRS += macdeployqt @@ -33,10 +40,20 @@ - -win32|winrt:SUBDIRS += windeployqt -winrt:SUBDIRS += winrtrunner --qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag - -qtNomakeTools( \ - pixeltool \ - macdeployqt \ -) +- +-# This is necessary to avoid a race condition between toolchain.prf +-# invocations in a module-by-module cross-build. +-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) { +- androiddeployqt.depends += qtattributionsscanner +- qdoc.depends += qtattributionsscanner +- windeployqt.depends += qtattributionsscanner +- winrtrunner.depends += qtattributionsscanner +- linguist.depends += qtattributionsscanner +-} +SUBDIRS = qdbus diff --git a/devel/qt5-qdbusviewer/files/patch-src__src.pro b/devel/qt5-qdbusviewer/files/patch-src__src.pro index 5bbefecce376..ea7368e4cbdc 100644 --- a/devel/qt5-qdbusviewer/files/patch-src__src.pro +++ b/devel/qt5-qdbusviewer/files/patch-src__src.pro @@ -1,18 +1,17 @@ Only enter the directories we want to build, otherwise we might fail due to missing dependencies. ---- src/src.pro.orig 2016-02-24 21:41:26 UTC +--- src/src.pro.orig 2016-07-23 14:50:14 UTC +++ src/src.pro -@@ -1,38 +1,3 @@ +@@ -1,52 +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 @@ -21,8 +20,13 @@ missing dependencies. - -SUBDIRS += linguist \ - qdoc \ -- qtplugininfo --if(!android|android_app):!ios: SUBDIRS += qtpaths +- qtattributionsscanner +- +-qtConfig(library) { +- !android|android_app: SUBDIRS += qtplugininfo +-} +- +-if(!android|android_app):!uikit: SUBDIRS += qtpaths - -mac { - SUBDIRS += macdeployqt @@ -36,10 +40,20 @@ missing dependencies. - -win32|winrt:SUBDIRS += windeployqt -winrt:SUBDIRS += winrtrunner --qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag - -qtNomakeTools( \ - pixeltool \ - macdeployqt \ -) -+SUBDIRS += qdbus +- +-# This is necessary to avoid a race condition between toolchain.prf +-# invocations in a module-by-module cross-build. +-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) { +- androiddeployqt.depends += qtattributionsscanner +- qdoc.depends += qtattributionsscanner +- windeployqt.depends += qtattributionsscanner +- winrtrunner.depends += qtattributionsscanner +- linguist.depends += qtattributionsscanner +-} ++SUBDIRS = qdbus diff --git a/devel/qt5-qdoc/files/patch-src_src.pro b/devel/qt5-qdoc/files/patch-src_src.pro index 243c967ab844..9c4f29d33b88 100644 --- a/devel/qt5-qdoc/files/patch-src_src.pro +++ b/devel/qt5-qdoc/files/patch-src_src.pro @@ -3,7 +3,7 @@ missing dependencies. --- src/src.pro.orig 2016-07-23 14:50:14 UTC +++ src/src.pro -@@ -1,38 +1,2 @@ +@@ -1,52 +1,2 @@ TEMPLATE = subdirs - -qtHaveModule(widgets) { @@ -12,7 +12,6 @@ missing dependencies. - } else { - SUBDIRS = assistant \ - pixeltool \ -- qtestlib \ - designer - - linguist.depends = designer @@ -21,8 +20,13 @@ missing dependencies. - -SUBDIRS += linguist \ - qdoc \ -- qtplugininfo --if(!android|android_app):!ios: SUBDIRS += qtpaths +- qtattributionsscanner +- +-qtConfig(library) { +- !android|android_app: SUBDIRS += qtplugininfo +-} +- +-if(!android|android_app):!uikit: SUBDIRS += qtpaths - -mac { - SUBDIRS += macdeployqt @@ -36,10 +40,20 @@ missing dependencies. - -win32|winrt:SUBDIRS += windeployqt -winrt:SUBDIRS += winrtrunner --qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag - -qtNomakeTools( \ - pixeltool \ - macdeployqt \ -) +- +-# This is necessary to avoid a race condition between toolchain.prf +-# invocations in a module-by-module cross-build. +-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) { +- androiddeployqt.depends += qtattributionsscanner +- qdoc.depends += qtattributionsscanner +- windeployqt.depends += qtattributionsscanner +- winrtrunner.depends += qtattributionsscanner +- linguist.depends += qtattributionsscanner +-} +SUBDIRS = qdoc diff --git a/devel/qt5-qmake/Makefile b/devel/qt5-qmake/Makefile index 760e83b5f98c..9f38df7feba0 100644 --- a/devel/qt5-qmake/Makefile +++ b/devel/qt5-qmake/Makefile @@ -2,7 +2,6 @@ PORTNAME= qmake DISTVERSION= ${QT5_VERSION} -PORTREVISION= 5 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -15,22 +14,21 @@ SHEBANG_FILES= util/harfbuzz/update-harfbuzz \ util/unicode/x11/makeencodings \ src/3rdparty/freetype/src/tools/afblue.pl \ mkspecs/features/data/mac/objc_namespace.sh \ - mkspecs/macx-ios-clang/ios_destinations.sh \ - mkspecs/macx-ios-clang/ios_devices.pl + mkspecs/features/uikit/devices.pl \ + mkspecs/features/uikit/device_destinations.sh + QT_DIST= base REINPLACE_ARGS= -i "" HAS_CONFIGURE= yes # Disable everything to install minimal qconfig.pri. CONFIGURE_ARGS= -no-accessibility -no-openssl -no-gui -no-cups \ -no-iconv -no-icu -no-dbus -no-xcb -no-opengl \ - -no-glib -no-audio-backend -no-fontconfig \ - -no-gtk -no-xinput2 -no-xrender \ - -no-evdev -no-xkbcommon -no-alsa \ + -no-glib -no-fontconfig \ + -no-gtk -no-xinput2 \ + -no-evdev -no-xkbcommon \ -no-freetype -no-gif -no-harfbuzz -no-libjpeg \ - -no-libpng -no-pulseaudio -no-widgets -# Features yet to be removed from qconfig.pri. -TBR_CONFIG= concurrent|inotify|xlib -QMAKESPEC= ${WRKSRC}/mkspecs/freebsd-${QMAKE_COMPILER} + -no-libpng -no-widgets +QMAKESPEC= freebsd-${QMAKE_COMPILER} INSTALL_TARGET= sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs BROKEN_powerpc64= fails to compile: error: unrecognized command line option -std=c++11 @@ -38,20 +36,14 @@ BROKEN_powerpc64= fails to compile: error: unrecognized command line option -std BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} post-patch: -# Prevent qconfig.pri from being module dependent. - @${REINPLACE_CMD} -E -e '/"\$$QT_CONFIG +(${TBR_CONFIG})"/ d' \ - ${WRKSRC}/configure # Clean up files created by patching @${RM} ${WRKSRC}/mkspecs/*/*.orig post-build: # Complete configure stage to generate *.pri files. - @cd ${WRKSRC} && \ + cd ${WRKSRC} && \ ${SETENV} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" BUILD_QMAKE=1 \ ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS} -# Cleanup qmodule.pri to make it module agnostic. - @${REINPLACE_CMD} -En -e '/^(CONFIG|QT_BUILD_PARTS|.*_DIR) / p' \ - ${WRKSRC}/mkspecs/qmodule.pri .include diff --git a/devel/qt5-qmake/files/patch-configure b/devel/qt5-qmake/files/patch-configure index ab08286a75a4..d58b45ba95c0 100644 --- a/devel/qt5-qmake/files/patch-configure +++ b/devel/qt5-qmake/files/patch-configure @@ -1,25 +1,13 @@ ---- configure.orig 2016-02-24 19:25:11 UTC +--- configure.orig 2017-11-14 13:26:30 UTC +++ configure -@@ -4108,11 +4108,11 @@ if [ '!' -e "$outpath/bin/qmake" ]; then - echo "QT_MAJOR_VERSION = $QT_MAJOR_VERSION" >> "$mkfile" - echo "QT_MINOR_VERSION = $QT_MINOR_VERSION" >> "$mkfile" - echo "QT_PATCH_VERSION = $QT_PATCH_VERSION" >> "$mkfile" -- echo "EXTRA_CFLAGS = $EXTRA_CFLAGS" >> "$mkfile" -- echo "EXTRA_CXXFLAGS = $EXTRA_CXXFLAGS" >> "$mkfile" -+ echo "EXTRA_CFLAGS = $EXTRA_CFLAGS $CFLAGS" >> "$mkfile" -+ echo "EXTRA_CXXFLAGS = $EXTRA_CXXFLAGS $CXXFLAGS" >> "$mkfile" - echo "QTOBJS =" $EXTRA_OBJS >> "$mkfile" - echo "QTSRCS =" $EXTRA_SRCS >> "$mkfile" -- echo "LFLAGS = $EXTRA_LFLAGS" >> "$mkfile" -+ echo "LFLAGS = $EXTRA_LFLAGS $LDFLAGS" >> "$mkfile" - echo "EXEEXT = $EXEEXT" >> "$mkfile" - echo "RM_F = rm -f" >> "$mkfile" - echo "RM_RF = rm -rf" >> "$mkfile" -@@ -4131,6 +4131,7 @@ if [ '!' -e "$outpath/bin/qmake" ]; then +@@ -799,6 +799,10 @@ if [ '!' -f "$outpath/bin/qmake" ] ; then fi fi - done -+ exit 0 ++ if [ -z "${BUILD_QMAKE}" ]; then ++ exit 0 ++ fi ++ if [ "$OPT_VERBOSE" = yes ]; then # Show the output of make + (cd "$outpath/qmake"; "$MAKE") || exit 2 diff --git a/devel/qt5-qmake/files/patch-mkspecs__common__freebsd.conf b/devel/qt5-qmake/files/patch-mkspecs__common__freebsd.conf deleted file mode 100644 index f3dee42ec3f5..000000000000 --- a/devel/qt5-qmake/files/patch-mkspecs__common__freebsd.conf +++ /dev/null @@ -1,43 +0,0 @@ ---- ./mkspecs/common/freebsd.conf.orig 2013-12-05 17:36:29.064198097 +0000 -+++ ./mkspecs/common/freebsd.conf 2013-12-05 17:38:34.413200492 +0000 -@@ -0,0 +1,40 @@ -+# -+# qmake configuration for FreeBSD -+# -+ -+MAKEFILE_GENERATOR = UNIX -+QMAKE_PLATFORM = freebsd bsd -+ -+QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE -+ -+QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD -+ -+# Addon software goes into /usr/local on the BSDs, by default we will look there -+QMAKE_INCDIR = %%LOCALBASE%%/include -+QMAKE_LIBDIR = %%LOCALBASE%%/lib -+ -+# Required at least by Qt5ConfigExtras.cmake so ports can include GL/gl.h. -+QMAKE_INCDIR_OPENGL = %%LOCALBASE%%/include -+QMAKE_LIBDIR_OPENGL = %%LOCALBASE%%/lib -+ -+QMAKE_LFLAGS_NOUNDEF = -Wl,--no-undefined -+QMAKE_LFLAGS_THREAD = -pthread -+ -+QMAKE_LIBS = -+QMAKE_LIBS_DYNLOAD = -+QMAKE_LIBS_EXECINFO = -lexecinfo -+QMAKE_LIBS_X11 = -lXext -lX11 -lm -+QMAKE_LIBS_OPENGL = -lGL -+QMAKE_LIBS_THREAD = -+ -+QMAKE_AR = ar cqs -+QMAKE_OBJCOPY = objcopy -+QMAKE_NM = nm -P -+QMAKE_RANLIB = -+ -+QMAKE_STRIP = strip -+QMAKE_STRIPFLAGS_LIB += --strip-unneeded -+QMAKE_INSTALL_FILE = install -m 644 -p -+QMAKE_INSTALL_PROGRAM = install -m 755 -p -+ -+include(unix.conf) diff --git a/devel/qt5-qmake/pkg-plist b/devel/qt5-qmake/pkg-plist index 9154e3e52bd1..4718fcd130f5 100644 --- a/devel/qt5-qmake/pkg-plist +++ b/devel/qt5-qmake/pkg-plist @@ -3,10 +3,6 @@ %%QT_MKSPECDIR%%/aix-g++-64/qplatformdefs.h %%QT_MKSPECDIR%%/aix-g++/qmake.conf %%QT_MKSPECDIR%%/aix-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/aix-xlc-64/qmake.conf -%%QT_MKSPECDIR%%/aix-xlc-64/qplatformdefs.h -%%QT_MKSPECDIR%%/aix-xlc/qmake.conf -%%QT_MKSPECDIR%%/aix-xlc/qplatformdefs.h %%QT_MKSPECDIR%%/android-clang/qmake.conf %%QT_MKSPECDIR%%/android-clang/qplatformdefs.h %%QT_MKSPECDIR%%/android-g++/qmake.conf @@ -21,7 +17,6 @@ %%QT_MKSPECDIR%%/common/c89/qplatformdefs.h %%QT_MKSPECDIR%%/common/clang-mac.conf %%QT_MKSPECDIR%%/common/clang.conf -%%QT_MKSPECDIR%%/common/freebsd.conf %%QT_MKSPECDIR%%/common/g++-base.conf %%QT_MKSPECDIR%%/common/g++-macx.conf %%QT_MKSPECDIR%%/common/g++-unix.conf @@ -31,20 +26,17 @@ %%QT_MKSPECDIR%%/common/gcc-base.conf %%QT_MKSPECDIR%%/common/ghs-base.conf %%QT_MKSPECDIR%%/common/ghs-integrity-armv7.conf +%%QT_MKSPECDIR%%/common/ghs-integrity-armv8.conf %%QT_MKSPECDIR%%/common/ghs-integrity-x86.conf %%QT_MKSPECDIR%%/common/integrity/qplatformdefs.h %%QT_MKSPECDIR%%/common/ios.conf -%%QT_MKSPECDIR%%/common/ios/GLES2/gl2.h -%%QT_MKSPECDIR%%/common/ios/clang.conf -%%QT_MKSPECDIR%%/common/ios/qmake.conf -%%QT_MKSPECDIR%%/common/linux-android.conf %%QT_MKSPECDIR%%/common/linux.conf %%QT_MKSPECDIR%%/common/llvm.conf %%QT_MKSPECDIR%%/common/mac.conf %%QT_MKSPECDIR%%/common/mac/qplatformdefs.h %%QT_MKSPECDIR%%/common/macx.conf -%%QT_MKSPECDIR%%/common/msvc-base.conf %%QT_MKSPECDIR%%/common/msvc-desktop.conf +%%QT_MKSPECDIR%%/common/msvc-version.conf %%QT_MKSPECDIR%%/common/nacl/g++-nacl32.conf %%QT_MKSPECDIR%%/common/nacl/g++-nacl64.conf %%QT_MKSPECDIR%%/common/nacl/nacl-base.conf @@ -60,9 +52,14 @@ %%QT_MKSPECDIR%%/common/sanitize.conf %%QT_MKSPECDIR%%/common/shell-unix.conf %%QT_MKSPECDIR%%/common/shell-win32.conf +%%QT_MKSPECDIR%%/common/solaris.conf +%%QT_MKSPECDIR%%/common/tvos.conf +%%QT_MKSPECDIR%%/common/uikit.conf +%%QT_MKSPECDIR%%/common/uikit/GLES2/gl2.h +%%QT_MKSPECDIR%%/common/uikit/clang.conf +%%QT_MKSPECDIR%%/common/uikit/qmake.conf %%QT_MKSPECDIR%%/common/unix.conf -%%QT_MKSPECDIR%%/common/wince/qmake.conf -%%QT_MKSPECDIR%%/common/wince/qplatformdefs.h +%%QT_MKSPECDIR%%/common/watchos.conf %%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 @@ -74,17 +71,23 @@ %%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_71x71.png %%QT_MKSPECDIR%%/common/winrt_winphone/assets/logo_store.png %%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 %%QT_MKSPECDIR%%/common/winrt_winphone/qplatformdefs.h %%QT_MKSPECDIR%%/cygwin-g++/qmake.conf %%QT_MKSPECDIR%%/cygwin-g++/qplatformdefs.h %%QT_MKSPECDIR%%/darwin-g++/qmake.conf %%QT_MKSPECDIR%%/darwin-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/common/freebsd_device_post.conf +%%QT_MKSPECDIR%%/devices/common/freebsd_device_pre.conf %%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 +%%QT_MKSPECDIR%%/devices/freebsd-generic-clang/qmake.conf +%%QT_MKSPECDIR%%/devices/freebsd-generic-clang/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/freebsd-rasp-pi-clang/qmake.conf +%%QT_MKSPECDIR%%/devices/freebsd-rasp-pi-clang/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/integrity-armv8-drive-cx/qmake.conf +%%QT_MKSPECDIR%%/devices/integrity-armv8-drive-cx/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-archos-gen8-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-archos-gen8-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp @@ -98,8 +101,14 @@ %%QT_MKSPECDIR%%/devices/linux-arm-trident-pnx8473-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-beagleboard-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-beagleboard-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-colibri-vf-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-colibri-vf-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-drive-cx-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-drive-cx-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-emu-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-emu-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-generic-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-generic-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++/qmake.conf @@ -110,9 +119,13 @@ %%QT_MKSPECDIR%%/devices/linux-jetson-tk1-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-jetson-tk1-pro-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-jetson-tk1-pro-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-jetson-tx1-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-jetson-tx1-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-mipsel-ci20-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-mipsel-ci20-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-nuc-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-nuc-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-odroid-xu3-g++/qmake.conf @@ -121,10 +134,12 @@ %%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-rpi3-g++/qmake.conf -%%QT_MKSPECDIR%%/devices/linux-rpi3-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/devices/linux-rpi3-vc4-g++/qmake.conf -%%QT_MKSPECDIR%%/devices/linux-rpi3-vc4-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-rasp-pi3-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-rasp-pi3-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-rasp-pi3-vc4-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-rasp-pi3-vc4-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/devices/linux-rcar-h2-g++/qmake.conf +%%QT_MKSPECDIR%%/devices/linux-rcar-h2-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 @@ -133,13 +148,16 @@ %%QT_MKSPECDIR%%/devices/linux-snowball-g++/qplatformdefs.h %%QT_MKSPECDIR%%/devices/linux-tegra2-g++/qmake.conf %%QT_MKSPECDIR%%/devices/linux-tegra2-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/dummy/qmake.conf %%QT_MKSPECDIR%%/features/android/android.prf %%QT_MKSPECDIR%%/features/android/android_deployment_settings.prf +%%QT_MKSPECDIR%%/features/android/resolve_target.prf %%QT_MKSPECDIR%%/features/android/sdk.prf %%QT_MKSPECDIR%%/features/benchmark.prf %%QT_MKSPECDIR%%/features/build_pass.prf %%QT_MKSPECDIR%%/features/cmake_functions.prf %%QT_MKSPECDIR%%/features/configure.prf +%%QT_MKSPECDIR%%/features/configure_base.prf %%QT_MKSPECDIR%%/features/create_cmake.prf %%QT_MKSPECDIR%%/features/ctest_testcase.prf %%QT_MKSPECDIR%%/features/ctest_testcase_common.prf @@ -149,8 +167,10 @@ %%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/configure.json %%QT_MKSPECDIR%%/features/data/dummy.cpp %%QT_MKSPECDIR%%/features/data/mac/objc_namespace.sh +%%QT_MKSPECDIR%%/features/data/macros.cpp %%QT_MKSPECDIR%%/features/data/unix/findclasslist.pl %%QT_MKSPECDIR%%/features/dbusadaptors.prf %%QT_MKSPECDIR%%/features/dbuscommon.pri @@ -186,17 +206,15 @@ %%QT_MKSPECDIR%%/features/no_debug_info.prf %%QT_MKSPECDIR%%/features/plugin_bundle.prf %%QT_MKSPECDIR%%/features/precompile_header.prf -%%QT_MKSPECDIR%%/features/qfeatures.prf %%QT_MKSPECDIR%%/features/qgltf.prf %%QT_MKSPECDIR%%/features/qlalr.prf +%%QT_MKSPECDIR%%/features/qmake_use.prf %%QT_MKSPECDIR%%/features/qml1_module.prf %%QT_MKSPECDIR%%/features/qml1_plugin.prf %%QT_MKSPECDIR%%/features/qml_debug.prf %%QT_MKSPECDIR%%/features/qml_module.prf %%QT_MKSPECDIR%%/features/qml_plugin.prf %%QT_MKSPECDIR%%/features/qmltestcase.prf -%%QT_MKSPECDIR%%/features/qpa/basicunixfontdatabase.prf -%%QT_MKSPECDIR%%/features/qpa/genericunixfontdatabase.prf %%QT_MKSPECDIR%%/features/qt.prf %%QT_MKSPECDIR%%/features/qt_android_deps.prf %%QT_MKSPECDIR%%/features/qt_app.prf @@ -206,6 +224,7 @@ %%QT_MKSPECDIR%%/features/qt_clear_installs.prf %%QT_MKSPECDIR%%/features/qt_common.prf %%QT_MKSPECDIR%%/features/qt_config.prf +%%QT_MKSPECDIR%%/features/qt_configure.prf %%QT_MKSPECDIR%%/features/qt_docs.prf %%QT_MKSPECDIR%%/features/qt_docs_targets.prf %%QT_MKSPECDIR%%/features/qt_example_installs.prf @@ -234,11 +253,25 @@ %%QT_MKSPECDIR%%/features/testlib_defines.prf %%QT_MKSPECDIR%%/features/toolchain.prf %%QT_MKSPECDIR%%/features/uic.prf +%%QT_MKSPECDIR%%/features/uikit/bitcode.prf +%%QT_MKSPECDIR%%/features/uikit/default_post.prf +%%QT_MKSPECDIR%%/features/uikit/default_pre.prf +%%QT_MKSPECDIR%%/features/uikit/device_destinations.sh +%%QT_MKSPECDIR%%/features/uikit/devices.pl +%%QT_MKSPECDIR%%/features/uikit/exclusive_builds_post.prf +%%QT_MKSPECDIR%%/features/uikit/qt.prf +%%QT_MKSPECDIR%%/features/uikit/qt_parts.prf +%%QT_MKSPECDIR%%/features/uikit/resolve_config.prf +%%QT_MKSPECDIR%%/features/uikit/sdk.prf +%%QT_MKSPECDIR%%/features/uikit/testcase.prf +%%QT_MKSPECDIR%%/features/uikit/testcase_targets.prf +%%QT_MKSPECDIR%%/features/uikit/xcodebuild.mk +%%QT_MKSPECDIR%%/features/uikit/xcodebuild.prf %%QT_MKSPECDIR%%/features/unix/bsymbolic_functions.prf +%%QT_MKSPECDIR%%/features/unix/ccache.prf %%QT_MKSPECDIR%%/features/unix/hide_symbols.prf %%QT_MKSPECDIR%%/features/unix/largefile.prf %%QT_MKSPECDIR%%/features/unix/opengl.prf -%%QT_MKSPECDIR%%/features/unix/openvg.prf %%QT_MKSPECDIR%%/features/unix/separate_debug_info.prf %%QT_MKSPECDIR%%/features/unix/thread.prf %%QT_MKSPECDIR%%/features/unix/x11.prf @@ -256,8 +289,6 @@ %%QT_MKSPECDIR%%/features/win32/idcidl.prf %%QT_MKSPECDIR%%/features/win32/msvc_mp.prf %%QT_MKSPECDIR%%/features/win32/opengl.prf -%%QT_MKSPECDIR%%/features/win32/openvg.prf -%%QT_MKSPECDIR%%/features/win32/qt_config.prf %%QT_MKSPECDIR%%/features/win32/qt_dll.prf %%QT_MKSPECDIR%%/features/win32/rtti.prf %%QT_MKSPECDIR%%/features/win32/rtti_off.prf @@ -277,20 +308,6 @@ %%QT_MKSPECDIR%%/freebsd-g++/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 -%%QT_MKSPECDIR%%/hpux-acc-o64/qplatformdefs.h -%%QT_MKSPECDIR%%/hpux-acc/qmake.conf -%%QT_MKSPECDIR%%/hpux-acc/qplatformdefs.h -%%QT_MKSPECDIR%%/hpux-g++-64/qmake.conf -%%QT_MKSPECDIR%%/hpux-g++-64/qplatformdefs.h -%%QT_MKSPECDIR%%/hpux-g++/qmake.conf -%%QT_MKSPECDIR%%/hpux-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/hpuxi-acc-32/qmake.conf -%%QT_MKSPECDIR%%/hpuxi-acc-32/qplatformdefs.h -%%QT_MKSPECDIR%%/hpuxi-acc-64/qmake.conf -%%QT_MKSPECDIR%%/hpuxi-acc-64/qplatformdefs.h %%QT_MKSPECDIR%%/hpuxi-g++-64/qmake.conf %%QT_MKSPECDIR%%/hpuxi-g++-64/qplatformdefs.h %%QT_MKSPECDIR%%/hurd-g++/qmake.conf @@ -301,22 +318,14 @@ %%QT_MKSPECDIR%%/integrity-armv7/qplatformdefs.h %%QT_MKSPECDIR%%/integrity-x86/qmake.conf %%QT_MKSPECDIR%%/integrity-x86/qplatformdefs.h -%%QT_MKSPECDIR%%/irix-cc-64/qmake.conf -%%QT_MKSPECDIR%%/irix-cc-64/qplatformdefs.h -%%QT_MKSPECDIR%%/irix-cc/qmake.conf -%%QT_MKSPECDIR%%/irix-cc/qplatformdefs.h -%%QT_MKSPECDIR%%/irix-g++-64/qmake.conf -%%QT_MKSPECDIR%%/irix-g++-64/qplatformdefs.h -%%QT_MKSPECDIR%%/irix-g++/qmake.conf -%%QT_MKSPECDIR%%/irix-g++/qplatformdefs.h +%%QT_MKSPECDIR%%/linux-aarch64-gnu-g++/qmake.conf +%%QT_MKSPECDIR%%/linux-aarch64-gnu-g++/qplatformdefs.h %%QT_MKSPECDIR%%/linux-arm-gnueabi-g++/qmake.conf %%QT_MKSPECDIR%%/linux-arm-gnueabi-g++/qplatformdefs.h %%QT_MKSPECDIR%%/linux-clang-libc++/qmake.conf %%QT_MKSPECDIR%%/linux-clang-libc++/qplatformdefs.h %%QT_MKSPECDIR%%/linux-clang/qmake.conf %%QT_MKSPECDIR%%/linux-clang/qplatformdefs.h -%%QT_MKSPECDIR%%/linux-cxx/qmake.conf -%%QT_MKSPECDIR%%/linux-cxx/qplatformdefs.h %%QT_MKSPECDIR%%/linux-g++-32/qmake.conf %%QT_MKSPECDIR%%/linux-g++-32/qplatformdefs.h %%QT_MKSPECDIR%%/linux-g++-64/qmake.conf @@ -329,46 +338,22 @@ %%QT_MKSPECDIR%%/linux-icc-64/qplatformdefs.h %%QT_MKSPECDIR%%/linux-icc/qmake.conf %%QT_MKSPECDIR%%/linux-icc/qplatformdefs.h -%%QT_MKSPECDIR%%/linux-kcc/qmake.conf -%%QT_MKSPECDIR%%/linux-kcc/qplatformdefs.h %%QT_MKSPECDIR%%/linux-llvm/qmake.conf %%QT_MKSPECDIR%%/linux-llvm/qplatformdefs.h %%QT_MKSPECDIR%%/linux-lsb-g++/qmake.conf %%QT_MKSPECDIR%%/linux-lsb-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/linux-pgcc/qmake.conf -%%QT_MKSPECDIR%%/linux-pgcc/qplatformdefs.h %%QT_MKSPECDIR%%/lynxos-g++/qmake.conf %%QT_MKSPECDIR%%/lynxos-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/macx-clang-32/Info.plist.app -%%QT_MKSPECDIR%%/macx-clang-32/Info.plist.dSYM.in -%%QT_MKSPECDIR%%/macx-clang-32/Info.plist.lib -%%QT_MKSPECDIR%%/macx-clang-32/qmake.conf -%%QT_MKSPECDIR%%/macx-clang-32/qplatformdefs.h %%QT_MKSPECDIR%%/macx-clang/Info.plist.app %%QT_MKSPECDIR%%/macx-clang/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-clang/Info.plist.lib %%QT_MKSPECDIR%%/macx-clang/qmake.conf %%QT_MKSPECDIR%%/macx-clang/qplatformdefs.h -%%QT_MKSPECDIR%%/macx-g++-32/Info.plist.app -%%QT_MKSPECDIR%%/macx-g++-32/Info.plist.dSYM.in -%%QT_MKSPECDIR%%/macx-g++-32/Info.plist.lib -%%QT_MKSPECDIR%%/macx-g++-32/qmake.conf -%%QT_MKSPECDIR%%/macx-g++-32/qplatformdefs.h %%QT_MKSPECDIR%%/macx-g++/Info.plist.app %%QT_MKSPECDIR%%/macx-g++/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-g++/Info.plist.lib %%QT_MKSPECDIR%%/macx-g++/qmake.conf %%QT_MKSPECDIR%%/macx-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/macx-g++40/Info.plist.app -%%QT_MKSPECDIR%%/macx-g++40/Info.plist.dSYM.in -%%QT_MKSPECDIR%%/macx-g++40/Info.plist.lib -%%QT_MKSPECDIR%%/macx-g++40/qmake.conf -%%QT_MKSPECDIR%%/macx-g++40/qplatformdefs.h -%%QT_MKSPECDIR%%/macx-g++42/Info.plist.app -%%QT_MKSPECDIR%%/macx-g++42/Info.plist.dSYM.in -%%QT_MKSPECDIR%%/macx-g++42/Info.plist.lib -%%QT_MKSPECDIR%%/macx-g++42/qmake.conf -%%QT_MKSPECDIR%%/macx-g++42/qplatformdefs.h %%QT_MKSPECDIR%%/macx-icc/Info.plist.app %%QT_MKSPECDIR%%/macx-icc/Info.plist.dSYM.in %%QT_MKSPECDIR%%/macx-icc/Info.plist.lib @@ -380,26 +365,16 @@ %%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.lib %%QT_MKSPECDIR%%/macx-ios-clang/LaunchScreen.xib %%QT_MKSPECDIR%%/macx-ios-clang/features/default_post.prf -%%QT_MKSPECDIR%%/macx-ios-clang/features/default_pre.prf -%%QT_MKSPECDIR%%/macx-ios-clang/features/exclusive_builds_post.prf -%%QT_MKSPECDIR%%/macx-ios-clang/features/qt.prf -%%QT_MKSPECDIR%%/macx-ios-clang/features/qt_config.prf -%%QT_MKSPECDIR%%/macx-ios-clang/features/qt_parts.prf -%%QT_MKSPECDIR%%/macx-ios-clang/features/resolve_config.prf -%%QT_MKSPECDIR%%/macx-ios-clang/features/sdk.prf -%%QT_MKSPECDIR%%/macx-ios-clang/features/testcase.prf -%%QT_MKSPECDIR%%/macx-ios-clang/features/testcase_targets.prf -%%QT_MKSPECDIR%%/macx-ios-clang/features/xcodebuild.prf -%%QT_MKSPECDIR%%/macx-ios-clang/ios_destinations.sh -%%QT_MKSPECDIR%%/macx-ios-clang/ios_devices.pl %%QT_MKSPECDIR%%/macx-ios-clang/qmake.conf %%QT_MKSPECDIR%%/macx-ios-clang/qplatformdefs.h -%%QT_MKSPECDIR%%/macx-ios-clang/xcodebuild.mk -%%QT_MKSPECDIR%%/macx-llvm/Info.plist.app -%%QT_MKSPECDIR%%/macx-llvm/Info.plist.dSYM.in -%%QT_MKSPECDIR%%/macx-llvm/Info.plist.lib -%%QT_MKSPECDIR%%/macx-llvm/qmake.conf -%%QT_MKSPECDIR%%/macx-llvm/qplatformdefs.h +%%QT_MKSPECDIR%%/macx-tvos-clang/Info.plist.app +%%QT_MKSPECDIR%%/macx-tvos-clang/Info.plist.lib +%%QT_MKSPECDIR%%/macx-tvos-clang/qmake.conf +%%QT_MKSPECDIR%%/macx-tvos-clang/qplatformdefs.h +%%QT_MKSPECDIR%%/macx-watchos-clang/Info.plist.app +%%QT_MKSPECDIR%%/macx-watchos-clang/Info.plist.lib +%%QT_MKSPECDIR%%/macx-watchos-clang/qmake.conf +%%QT_MKSPECDIR%%/macx-watchos-clang/qplatformdefs.h %%QT_MKSPECDIR%%/macx-xcode/QtTest.plist %%QT_MKSPECDIR%%/macx-xcode/WorkspaceSettings.xcsettings %%QT_MKSPECDIR%%/macx-xcode/default.xcscheme @@ -411,8 +386,6 @@ %%QT_MKSPECDIR%%/openbsd-g++/qplatformdefs.h %%QT_MKSPECDIR%%/qconfig.pri %%QT_MKSPECDIR%%/qdevice.pri -%%QT_MKSPECDIR%%/qfeatures.pri -%%QT_MKSPECDIR%%/qhost.pri %%QT_MKSPECDIR%%/qmodule.pri %%QT_MKSPECDIR%%/qnx-aarch64le-qcc/qmake.conf %%QT_MKSPECDIR%%/qnx-aarch64le-qcc/qplatformdefs.h @@ -422,10 +395,6 @@ %%QT_MKSPECDIR%%/qnx-x86-64-qcc/qplatformdefs.h %%QT_MKSPECDIR%%/qnx-x86-qcc/qmake.conf %%QT_MKSPECDIR%%/qnx-x86-qcc/qplatformdefs.h -%%QT_MKSPECDIR%%/sco-cc/qmake.conf -%%QT_MKSPECDIR%%/sco-cc/qplatformdefs.h -%%QT_MKSPECDIR%%/sco-g++/qmake.conf -%%QT_MKSPECDIR%%/sco-g++/qplatformdefs.h %%QT_MKSPECDIR%%/solaris-cc-64-stlport/qmake.conf %%QT_MKSPECDIR%%/solaris-cc-64-stlport/qplatformdefs.h %%QT_MKSPECDIR%%/solaris-cc-64/qmake.conf @@ -438,14 +407,6 @@ %%QT_MKSPECDIR%%/solaris-g++-64/qplatformdefs.h %%QT_MKSPECDIR%%/solaris-g++/qmake.conf %%QT_MKSPECDIR%%/solaris-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/tru64-cxx/qmake.conf -%%QT_MKSPECDIR%%/tru64-cxx/qplatformdefs.h -%%QT_MKSPECDIR%%/tru64-g++/qmake.conf -%%QT_MKSPECDIR%%/tru64-g++/qplatformdefs.h -%%QT_MKSPECDIR%%/unixware-cc/qmake.conf -%%QT_MKSPECDIR%%/unixware-cc/qplatformdefs.h -%%QT_MKSPECDIR%%/unixware-g++/qmake.conf -%%QT_MKSPECDIR%%/unixware-g++/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/linux-host-g++/qmake.conf %%QT_MKSPECDIR%%/unsupported/linux-host-g++/qplatformdefs.h %%QT_MKSPECDIR%%/unsupported/linux-scratchbox2-g++/qmake.conf @@ -464,47 +425,23 @@ %%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%%/win32-clang-msvc2015/qmake.conf -%%QT_MKSPECDIR%%/win32-clang-msvc2015/qplatformdefs.h +%%QT_MKSPECDIR%%/win32-clang-msvc/qmake.conf +%%QT_MKSPECDIR%%/win32-clang-msvc/qplatformdefs.h %%QT_MKSPECDIR%%/win32-g++/qmake.conf %%QT_MKSPECDIR%%/win32-g++/qplatformdefs.h %%QT_MKSPECDIR%%/win32-icc/qmake.conf %%QT_MKSPECDIR%%/win32-icc/qplatformdefs.h -%%QT_MKSPECDIR%%/win32-msvc2005/qmake.conf -%%QT_MKSPECDIR%%/win32-msvc2005/qplatformdefs.h -%%QT_MKSPECDIR%%/win32-msvc2008/qmake.conf -%%QT_MKSPECDIR%%/win32-msvc2008/qplatformdefs.h -%%QT_MKSPECDIR%%/win32-msvc2010/qmake.conf -%%QT_MKSPECDIR%%/win32-msvc2010/qplatformdefs.h -%%QT_MKSPECDIR%%/win32-msvc2012/qmake.conf -%%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 -%%QT_MKSPECDIR%%/wince60standard-x86-msvc2005/qplatformdefs.h -%%QT_MKSPECDIR%%/wince70embedded-armv4i-msvc2008/qmake.conf -%%QT_MKSPECDIR%%/wince70embedded-armv4i-msvc2008/qplatformdefs.h -%%QT_MKSPECDIR%%/wince70embedded-x86-msvc2008/qmake.conf -%%QT_MKSPECDIR%%/wince70embedded-x86-msvc2008/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-msvc2013/qmake.conf -%%QT_MKSPECDIR%%/winphone-x86-msvc2013/qplatformdefs.h -%%QT_MKSPECDIR%%/winrt-arm-msvc2013/qmake.conf -%%QT_MKSPECDIR%%/winrt-arm-msvc2013/qplatformdefs.h +%%QT_MKSPECDIR%%/win32-msvc/qmake.conf +%%QT_MKSPECDIR%%/win32-msvc/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-arm-msvc2017/qmake.conf +%%QT_MKSPECDIR%%/winrt-arm-msvc2017/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-x64-msvc2017/qmake.conf +%%QT_MKSPECDIR%%/winrt-x64-msvc2017/qplatformdefs.h %%QT_MKSPECDIR%%/winrt-x86-msvc2015/qmake.conf %%QT_MKSPECDIR%%/winrt-x86-msvc2015/qplatformdefs.h +%%QT_MKSPECDIR%%/winrt-x86-msvc2017/qmake.conf +%%QT_MKSPECDIR%%/winrt-x86-msvc2017/qplatformdefs.h diff --git a/devel/qt5-script/Makefile b/devel/qt5-script/Makefile index 07de7cb203ab..75f45afe9b34 100644 --- a/devel/qt5-script/Makefile +++ b/devel/qt5-script/Makefile @@ -2,7 +2,6 @@ PORTNAME= script DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-scxml/pkg-plist b/devel/qt5-scxml/pkg-plist index 0001d9e87913..f33197fcbcb4 100644 --- a/devel/qt5-scxml/pkg-plist +++ b/devel/qt5-scxml/pkg-plist @@ -1,35 +1,31 @@ +%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlcompiler_p.h %%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlcppdatamodel_p.h %%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmldatamodel_p.h %%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlecmascriptplatformproperties_p.h %%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlevent_p.h %%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlexecutablecontent_p.h %%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlglobals_p.h -%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlparser_p.h -%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlqstates_p.h +%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlinvokableservice_p.h %%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlstatemachine_p.h -%%QT_INCDIR%%/QtScxml/QScxmlBaseTransition +%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmlstatemachineinfo_p.h +%%QT_INCDIR%%/QtScxml/%%FULLVER%%/QtScxml/private/qscxmltabledata_p.h +%%QT_INCDIR%%/QtScxml/QScxmlCompiler %%QT_INCDIR%%/QtScxml/QScxmlCppDataModel %%QT_INCDIR%%/QtScxml/QScxmlDataModel +%%QT_INCDIR%%/QtScxml/QScxmlDynamicScxmlServiceFactory %%QT_INCDIR%%/QtScxml/QScxmlEcmaScriptDataModel %%QT_INCDIR%%/QtScxml/QScxmlError %%QT_INCDIR%%/QtScxml/QScxmlEvent -%%QT_INCDIR%%/QtScxml/QScxmlEventFilter -%%QT_INCDIR%%/QtScxml/QScxmlFinalState -%%QT_INCDIR%%/QtScxml/QScxmlHistoryState -%%QT_INCDIR%%/QtScxml/QScxmlInvokableScxml -%%QT_INCDIR%%/QtScxml/QScxmlInvokableScxmlServiceFactory %%QT_INCDIR%%/QtScxml/QScxmlInvokableService %%QT_INCDIR%%/QtScxml/QScxmlInvokableServiceFactory -%%QT_INCDIR%%/QtScxml/QScxmlInvokeScxmlFactory %%QT_INCDIR%%/QtScxml/QScxmlNullDataModel -%%QT_INCDIR%%/QtScxml/QScxmlParser -%%QT_INCDIR%%/QtScxml/QScxmlState %%QT_INCDIR%%/QtScxml/QScxmlStateMachine +%%QT_INCDIR%%/QtScxml/QScxmlStaticScxmlServiceFactory %%QT_INCDIR%%/QtScxml/QScxmlTableData -%%QT_INCDIR%%/QtScxml/QScxmlTransition %%QT_INCDIR%%/QtScxml/QtScxml %%QT_INCDIR%%/QtScxml/QtScxmlDepends %%QT_INCDIR%%/QtScxml/QtScxmlVersion +%%QT_INCDIR%%/QtScxml/qscxmlcompiler.h %%QT_INCDIR%%/QtScxml/qscxmlcppdatamodel.h %%QT_INCDIR%%/QtScxml/qscxmldatamodel.h %%QT_INCDIR%%/QtScxml/qscxmlecmascriptdatamodel.h @@ -39,13 +35,13 @@ %%QT_INCDIR%%/QtScxml/qscxmlglobals.h %%QT_INCDIR%%/QtScxml/qscxmlinvokableservice.h %%QT_INCDIR%%/QtScxml/qscxmlnulldatamodel.h -%%QT_INCDIR%%/QtScxml/qscxmlparser.h -%%QT_INCDIR%%/QtScxml/qscxmlqstates.h %%QT_INCDIR%%/QtScxml/qscxmlstatemachine.h %%QT_INCDIR%%/QtScxml/qscxmltabledata.h %%QT_INCDIR%%/QtScxml/qtscxmlversion.h %%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlConfig.cmake +%%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlConfigExtras.cmake %%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlMacros.cmake %%QT_BINDIR%%/qscxmlc %%QT_LIBDIR%%/libQt5Scxml.prl %%QT_LIBDIR%%/libQt5Scxml.so diff --git a/devel/qt5-testlib/Makefile b/devel/qt5-testlib/Makefile index 466983665a55..e818285a89b9 100644 --- a/devel/qt5-testlib/Makefile +++ b/devel/qt5-testlib/Makefile @@ -17,4 +17,10 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} +post-configure: +.for d in src/testlib + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} +.endfor + .include diff --git a/devel/qt5-testlib/pkg-plist b/devel/qt5-testlib/pkg-plist index c912eddd7884..fbaf17cadca5 100644 --- a/devel/qt5-testlib/pkg-plist +++ b/devel/qt5-testlib/pkg-plist @@ -7,6 +7,7 @@ %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkmeasurement_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkmetric_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkperfevents_p.h +%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarktimemeasurers_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkvalgrind_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qcsvbenchmarklogger_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qplaintestlogger_p.h @@ -17,6 +18,7 @@ %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcorelist_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestelement_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestelementattribute_p.h +%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesthelpers_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestlog_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestresult_p.h %%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesttable_p.h @@ -42,6 +44,7 @@ %%QT_INCDIR%%/QtTest/QtTest %%QT_INCDIR%%/QtTest/QtTestDepends %%QT_INCDIR%%/QtTest/QtTestGui +%%QT_INCDIR%%/QtTest/QtTestNetwork %%QT_INCDIR%%/QtTest/QtTestVersion %%QT_INCDIR%%/QtTest/QtTestWidgets %%QT_INCDIR%%/QtTest/qbenchmark.h @@ -50,6 +53,7 @@ %%QT_INCDIR%%/QtTest/qtest.h %%QT_INCDIR%%/QtTest/qtest_global.h %%QT_INCDIR%%/QtTest/qtest_gui.h +%%QT_INCDIR%%/QtTest/qtest_network.h %%QT_INCDIR%%/QtTest/qtest_widgets.h %%QT_INCDIR%%/QtTest/qtestaccessible.h %%QT_INCDIR%%/QtTest/qtestassert.h diff --git a/devel/qt5-uitools/files/patch-src__src.pro b/devel/qt5-uitools/files/patch-src__src.pro index fa932b913ebd..de13919b1544 100644 --- a/devel/qt5-uitools/files/patch-src__src.pro +++ b/devel/qt5-uitools/files/patch-src__src.pro @@ -1,18 +1,17 @@ Only enter the directories we want to build, otherwise we might fail due to missing dependencies. ---- src/src.pro.orig 2016-02-24 21:32:05 UTC +--- src/src.pro.orig 2016-07-23 14:50:14 UTC +++ src/src.pro -@@ -1,38 +1,3 @@ +@@ -1,52 +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 @@ -21,8 +20,13 @@ missing dependencies. - -SUBDIRS += linguist \ - qdoc \ -- qtplugininfo --if(!android|android_app):!ios: SUBDIRS += qtpaths +- qtattributionsscanner +- +-qtConfig(library) { +- !android|android_app: SUBDIRS += qtplugininfo +-} +- +-if(!android|android_app):!uikit: SUBDIRS += qtpaths - -mac { - SUBDIRS += macdeployqt @@ -36,10 +40,20 @@ missing dependencies. - -win32|winrt:SUBDIRS += windeployqt -winrt:SUBDIRS += winrtrunner --qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag - -qtNomakeTools( \ - pixeltool \ - macdeployqt \ -) +- +-# This is necessary to avoid a race condition between toolchain.prf +-# invocations in a module-by-module cross-build. +-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) { +- androiddeployqt.depends += qtattributionsscanner +- qdoc.depends += qtattributionsscanner +- windeployqt.depends += qtattributionsscanner +- winrtrunner.depends += qtattributionsscanner +- linguist.depends += qtattributionsscanner +-} +SUBDIRS = designer diff --git a/devel/qt5/Makefile.sqldrivers b/devel/qt5/Makefile.sqldrivers index ecb1c2b07c78..251359626589 100644 --- a/devel/qt5/Makefile.sqldrivers +++ b/devel/qt5/Makefile.sqldrivers @@ -20,4 +20,10 @@ PLIST_FILES+= ${QT_CMAKEDIR_REL}/Qt5Sql/Qt5Sql_Q${DB}DriverPlugin.cmake \ ${QT_PLUGINDIR_REL}/sqldrivers/libqsql${DB:tl:C/^sql//}.so \ %%DEBUG%%${QT_PLUGINDIR_REL}/sqldrivers/libqsql${DB:tl:C/^sql//}.so.debug +post-configure: +.for d in src/plugins/sqldrivers/${DB:tl} + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} +.endfor + .include diff --git a/devel/qt5/distinfo b/devel/qt5/distinfo index b15552722b75..9b85bbc19f42 100644 --- a/devel/qt5/distinfo +++ b/devel/qt5/distinfo @@ -1,61 +1,79 @@ -TIMESTAMP = 1498945420 -SHA256 (KDE/Qt/5.7.1/qt3d-opensource-src-5.7.1.tar.xz) = 1d74cf431777b8086d771ab0d4d2c01f9c28eb14cc2d73d7f838a665d1f707ea -SIZE (KDE/Qt/5.7.1/qt3d-opensource-src-5.7.1.tar.xz) = 19474848 -SHA256 (KDE/Qt/5.7.1/qtbase-opensource-src-5.7.1.tar.xz) = edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e -SIZE (KDE/Qt/5.7.1/qtbase-opensource-src-5.7.1.tar.xz) = 44992616 -SHA256 (KDE/Qt/5.7.1/qtcanvas3d-opensource-src-5.7.1.tar.xz) = a887083817b77710f6b5401cec4713a03147ed16fa5cf5fb8de4495807bebdb4 -SIZE (KDE/Qt/5.7.1/qtcanvas3d-opensource-src-5.7.1.tar.xz) = 10851540 -SHA256 (KDE/Qt/5.7.1/qtcharts-opensource-src-5.7.1.tar.xz) = 85feee6992cdef1ab42947a83cbf806a29224d704ee5dc97ee5038c75b633fe3 -SIZE (KDE/Qt/5.7.1/qtcharts-opensource-src-5.7.1.tar.xz) = 4086256 -SHA256 (KDE/Qt/5.7.1/qtconnectivity-opensource-src-5.7.1.tar.xz) = b3e8b9068304dc5605a8fdf0695102032fd1a216f2c2d4d53a7e4d4dda3ab966 -SIZE (KDE/Qt/5.7.1/qtconnectivity-opensource-src-5.7.1.tar.xz) = 2690688 -SHA256 (KDE/Qt/5.7.1/qtdatavis3d-opensource-src-5.7.1.tar.xz) = 1bff85dcdeed98ad8f0e191f77e7c0e9d57af719c51791044b9c15e939b800f8 -SIZE (KDE/Qt/5.7.1/qtdatavis3d-opensource-src-5.7.1.tar.xz) = 5155740 -SHA256 (KDE/Qt/5.7.1/qtdeclarative-opensource-src-5.7.1.tar.xz) = fd13dd3059d20694a857ed30ee56a2ade908c0cb93246f9804a65f7a2d775d56 -SIZE (KDE/Qt/5.7.1/qtdeclarative-opensource-src-5.7.1.tar.xz) = 18976920 -SHA256 (KDE/Qt/5.7.1/qtdeclarative-render2d-opensource-src-5.7.1.tar.xz) = 831913488bb887993ae8701e5966f53875667a774c0230fc5dc39d6077828c7f -SIZE (KDE/Qt/5.7.1/qtdeclarative-render2d-opensource-src-5.7.1.tar.xz) = 74340 -SHA256 (KDE/Qt/5.7.1/qtgamepad-opensource-src-5.7.1.tar.xz) = bb2b2165e3bcbf37a7e03c3e1cac4fe9771b087dad7ab9566ba5f7f4f4929182 -SIZE (KDE/Qt/5.7.1/qtgamepad-opensource-src-5.7.1.tar.xz) = 360940 -SHA256 (KDE/Qt/5.7.1/qtgraphicaleffects-opensource-src-5.7.1.tar.xz) = 2c68fabe599fa2f318562dc22003df6797e91d00761dbf1f337cdc7fbacd4dc8 -SIZE (KDE/Qt/5.7.1/qtgraphicaleffects-opensource-src-5.7.1.tar.xz) = 14486948 -SHA256 (KDE/Qt/5.7.1/qtimageformats-opensource-src-5.7.1.tar.xz) = 4f97a2a2b269f8a45576256ad9f452320c9c9de6d9c7cc1751fdeac36b0f77f4 -SIZE (KDE/Qt/5.7.1/qtimageformats-opensource-src-5.7.1.tar.xz) = 2004376 -SHA256 (KDE/Qt/5.7.1/qtlocation-opensource-src-5.7.1.tar.xz) = f9e9e64e757008c2341504a1916a219ee0cf2b1b42bfa72156e62dfe9dfbf39f -SIZE (KDE/Qt/5.7.1/qtlocation-opensource-src-5.7.1.tar.xz) = 3194112 -SHA256 (KDE/Qt/5.7.1/qtmultimedia-opensource-src-5.7.1.tar.xz) = a52b177fbf02600a0c8bd995ce7c2041c673bc1332c02b60e0e95bb9ebab7def -SIZE (KDE/Qt/5.7.1/qtmultimedia-opensource-src-5.7.1.tar.xz) = 3563676 -SHA256 (KDE/Qt/5.7.1/qtquickcontrols-opensource-src-5.7.1.tar.xz) = 6feb1a736bf93af98c40d04cde6b36c113e4cdf84ccb9b306ca92ef9b1779e9d -SIZE (KDE/Qt/5.7.1/qtquickcontrols-opensource-src-5.7.1.tar.xz) = 5943024 -SHA256 (KDE/Qt/5.7.1/qtquickcontrols2-opensource-src-5.7.1.tar.xz) = f2e8acd0badbf604f28258b063c94ba71e28147c53c435ae9eb484497cf3e7ec -SIZE (KDE/Qt/5.7.1/qtquickcontrols2-opensource-src-5.7.1.tar.xz) = 2212812 -SHA256 (KDE/Qt/5.7.1/qtscript-opensource-src-5.7.1.tar.xz) = 5bf91a1c53020d91d454d4bb0f930ada98c5fc008fda78f2d7171152920da426 -SIZE (KDE/Qt/5.7.1/qtscript-opensource-src-5.7.1.tar.xz) = 2608180 -SHA256 (KDE/Qt/5.7.1/qtscxml-opensource-src-5.7.1.tar.xz) = 9dad4ab220a715b6a63df1d4a196bfa963a1ce7e6e57e7b36462c5dab09db38c -SIZE (KDE/Qt/5.7.1/qtscxml-opensource-src-5.7.1.tar.xz) = 346948 -SHA256 (KDE/Qt/5.7.1/qtsensors-opensource-src-5.7.1.tar.xz) = ccb3942edb5e615e9a43c147d87a09f19690eafbc56be0cdf4f73b7e510f3b10 -SIZE (KDE/Qt/5.7.1/qtsensors-opensource-src-5.7.1.tar.xz) = 1987144 -SHA256 (KDE/Qt/5.7.1/qtserialbus-opensource-src-5.7.1.tar.xz) = 727edbe0f29659119cfcfbc9ce7c7063af319ec441bc9a5156ebda28e820b157 -SIZE (KDE/Qt/5.7.1/qtserialbus-opensource-src-5.7.1.tar.xz) = 239676 -SHA256 (KDE/Qt/5.7.1/qtserialport-opensource-src-5.7.1.tar.xz) = 76d5e19bd392b72602ba3bfe3c0d03c10962674604cf814efa2c910f98cf5a26 -SIZE (KDE/Qt/5.7.1/qtserialport-opensource-src-5.7.1.tar.xz) = 265616 -SHA256 (KDE/Qt/5.7.1/qtsvg-opensource-src-5.7.1.tar.xz) = b0f017db8cf18e655e8a6635bc4ddbdbad6f8ef839857451b78942630a4c3947 -SIZE (KDE/Qt/5.7.1/qtsvg-opensource-src-5.7.1.tar.xz) = 1751536 -SHA256 (KDE/Qt/5.7.1/qttools-opensource-src-5.7.1.tar.xz) = 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac -SIZE (KDE/Qt/5.7.1/qttools-opensource-src-5.7.1.tar.xz) = 10011108 -SHA256 (KDE/Qt/5.7.1/qttranslations-opensource-src-5.7.1.tar.xz) = 16ecdb09532724e80fa6202e5604d80877923b652b771b6020cea36bee0258e7 -SIZE (KDE/Qt/5.7.1/qttranslations-opensource-src-5.7.1.tar.xz) = 1206116 -SHA256 (KDE/Qt/5.7.1/qtvirtualkeyboard-opensource-src-5.7.1.tar.xz) = b28b8b937ed15d794c5ebc93e9556d08a0c9761a434864ebf2b454554e652add -SIZE (KDE/Qt/5.7.1/qtvirtualkeyboard-opensource-src-5.7.1.tar.xz) = 10014088 -SHA256 (KDE/Qt/5.7.1/qtwayland-opensource-src-5.7.1.tar.xz) = f23fc5e180c8af5b38419d84e44f1f342904a197c2382a7b03f83de2136201c7 -SIZE (KDE/Qt/5.7.1/qtwayland-opensource-src-5.7.1.tar.xz) = 291776 -SHA256 (KDE/Qt/5.7.1/qtwebchannel-opensource-src-5.7.1.tar.xz) = 63ab3ac76ff993009cfa978162a764e05b763cacb70d1a862893f8de4492319b -SIZE (KDE/Qt/5.7.1/qtwebchannel-opensource-src-5.7.1.tar.xz) = 122436 -SHA256 (KDE/Qt/5.7.1/qtwebengine-opensource-src-5.7.1.tar.xz) = 2101883e3d632b50133a14e3bbdc1d4d649e405c9618f2eef1b72a7b821ccc2b -SIZE (KDE/Qt/5.7.1/qtwebengine-opensource-src-5.7.1.tar.xz) = 163782564 -SHA256 (KDE/Qt/5.7.1/qtwebsockets-opensource-src-5.7.1.tar.xz) = 5c2a75b68e7f2e98530659b33bb08edee83013832dbf99cc5b40afc8a90652d1 -SIZE (KDE/Qt/5.7.1/qtwebsockets-opensource-src-5.7.1.tar.xz) = 193204 -SHA256 (KDE/Qt/5.7.1/qtx11extras-opensource-src-5.7.1.tar.xz) = 5f5a0c2cc66ec01c2f2f31eff32fea26bd0bc03741a5dfd803b13870aa4ce427 -SIZE (KDE/Qt/5.7.1/qtx11extras-opensource-src-5.7.1.tar.xz) = 59656 -SHA256 (KDE/Qt/5.7.1/qtxmlpatterns-opensource-src-5.7.1.tar.xz) = a805938c2ab1379d7dc83dcec606edd7950b5155c073b9eb53c53e62deb5f8e5 -SIZE (KDE/Qt/5.7.1/qtxmlpatterns-opensource-src-5.7.1.tar.xz) = 1352472 +TIMESTAMP = 1513282977 +SHA256 (KDE/Qt/5.9.3/qt3d-opensource-src-5.9.3.tar.xz) = 97925132f0583ccd76f5e104c849341df3abba73dd4d9b647622a23bdae6273f +SIZE (KDE/Qt/5.9.3/qt3d-opensource-src-5.9.3.tar.xz) = 28000420 +SHA256 (KDE/Qt/5.9.3/qtactiveqt-opensource-src-5.9.3.tar.xz) = 59ece2126e36321509a0506c32ab8b02ae5736c26b9fea3cd0b01a75fc505399 +SIZE (KDE/Qt/5.9.3/qtactiveqt-opensource-src-5.9.3.tar.xz) = 256928 +SHA256 (KDE/Qt/5.9.3/qtandroidextras-opensource-src-5.9.3.tar.xz) = 365d7c5f6a422383de917b9115be5a2e615eeeee6cc91b9f9479e4fd2b1ec538 +SIZE (KDE/Qt/5.9.3/qtandroidextras-opensource-src-5.9.3.tar.xz) = 75844 +SHA256 (KDE/Qt/5.9.3/qtbase-opensource-src-5.9.3.tar.xz) = 9e7c44005e7691dc7c85165bd4510282c47f0163521f4973eab71dbdb39a9982 +SIZE (KDE/Qt/5.9.3/qtbase-opensource-src-5.9.3.tar.xz) = 45160080 +SHA256 (KDE/Qt/5.9.3/qtcanvas3d-opensource-src-5.9.3.tar.xz) = 5e38b17844af801be57844da0379cc6882750b9019034f4fe884aae70c300abc +SIZE (KDE/Qt/5.9.3/qtcanvas3d-opensource-src-5.9.3.tar.xz) = 10852456 +SHA256 (KDE/Qt/5.9.3/qtcharts-opensource-src-5.9.3.tar.xz) = ec1783a81d5715fc48a3276e67b90a66cac3e283ac14fc3bf88b2058994d69e9 +SIZE (KDE/Qt/5.9.3/qtcharts-opensource-src-5.9.3.tar.xz) = 4157772 +SHA256 (KDE/Qt/5.9.3/qtconnectivity-opensource-src-5.9.3.tar.xz) = e2891e6e8d91e82e3c4d5667f3146062458067c0b706d65ac0fc7562afce0649 +SIZE (KDE/Qt/5.9.3/qtconnectivity-opensource-src-5.9.3.tar.xz) = 2723456 +SHA256 (KDE/Qt/5.9.3/qtdatavis3d-opensource-src-5.9.3.tar.xz) = 709f69487dea9a8b44764c0dc92d65080bc0949038ed774897792a427a34c368 +SIZE (KDE/Qt/5.9.3/qtdatavis3d-opensource-src-5.9.3.tar.xz) = 5163104 +SHA256 (KDE/Qt/5.9.3/qtdeclarative-opensource-src-5.9.3.tar.xz) = 505f66d2062c1d84ce743a0b4969531e1cf94e30970dc64efffe10f74f989407 +SIZE (KDE/Qt/5.9.3/qtdeclarative-opensource-src-5.9.3.tar.xz) = 21443328 +SHA256 (KDE/Qt/5.9.3/qtdoc-opensource-src-5.9.3.tar.xz) = e569aa76c2a682618d2088307dfadbf3ff74e5300861963c0279d4ac442a712a +SIZE (KDE/Qt/5.9.3/qtdoc-opensource-src-5.9.3.tar.xz) = 2893496 +SHA256 (KDE/Qt/5.9.3/qtgamepad-opensource-src-5.9.3.tar.xz) = c69fcacdc81338e1eba43138ecedf3e7a1b34315349522c0070a04cc4acc6a93 +SIZE (KDE/Qt/5.9.3/qtgamepad-opensource-src-5.9.3.tar.xz) = 364652 +SHA256 (KDE/Qt/5.9.3/qtgraphicaleffects-opensource-src-5.9.3.tar.xz) = 790b029bc8bdbb5c9548ecad2ff6e73b7da3deabbdba6bacac4a6aacd3a0f0d9 +SIZE (KDE/Qt/5.9.3/qtgraphicaleffects-opensource-src-5.9.3.tar.xz) = 14480348 +SHA256 (KDE/Qt/5.9.3/qtimageformats-opensource-src-5.9.3.tar.xz) = d4b309ddbac2275cafadffc62047a26ed8f169bde015925761894843eae725dd +SIZE (KDE/Qt/5.9.3/qtimageformats-opensource-src-5.9.3.tar.xz) = 2102504 +SHA256 (KDE/Qt/5.9.3/qtlocation-opensource-src-5.9.3.tar.xz) = 80fd425cde8747c1fc79aa90994a9caf921d7c79ff41babec692fe43cdc74ce1 +SIZE (KDE/Qt/5.9.3/qtlocation-opensource-src-5.9.3.tar.xz) = 5374552 +SHA256 (KDE/Qt/5.9.3/qtmacextras-opensource-src-5.9.3.tar.xz) = 3e36b8695e3c7410d53e6341b73c8089543502673fb2d89ceaf2c29d081e3b5e +SIZE (KDE/Qt/5.9.3/qtmacextras-opensource-src-5.9.3.tar.xz) = 48536 +SHA256 (KDE/Qt/5.9.3/qtmultimedia-opensource-src-5.9.3.tar.xz) = e79558d24ace9b4444d91d807b85778b6a0a592e7d1500ffadf45f7d3b8238a6 +SIZE (KDE/Qt/5.9.3/qtmultimedia-opensource-src-5.9.3.tar.xz) = 3598216 +SHA256 (KDE/Qt/5.9.3/qtnetworkauth-opensource-src-5.9.3.tar.xz) = df22376e35e837e5d9f633ed245275e94a826fdff0d312eb9031ae7e082ebf39 +SIZE (KDE/Qt/5.9.3/qtnetworkauth-opensource-src-5.9.3.tar.xz) = 112280 +SHA256 (KDE/Qt/5.9.3/qtpurchasing-opensource-src-5.9.3.tar.xz) = 1268781935d6f8a1eb9fcfe5d2e8eb4b116658b07e039db43bee6507406bce03 +SIZE (KDE/Qt/5.9.3/qtpurchasing-opensource-src-5.9.3.tar.xz) = 187608 +SHA256 (KDE/Qt/5.9.3/qtquickcontrols2-opensource-src-5.9.3.tar.xz) = 21aaa26956ad0ccc3ce86ced7925ceae4b4cef25c6c5ef2f7ded608431420843 +SIZE (KDE/Qt/5.9.3/qtquickcontrols2-opensource-src-5.9.3.tar.xz) = 4123332 +SHA256 (KDE/Qt/5.9.3/qtquickcontrols-opensource-src-5.9.3.tar.xz) = 300eeebd7d2c243c0123bc2324b5643b3f967c0816aead0ba7b993aeeac0e226 +SIZE (KDE/Qt/5.9.3/qtquickcontrols-opensource-src-5.9.3.tar.xz) = 5946216 +SHA256 (KDE/Qt/5.9.3/qtremoteobjects-opensource-src-5.9.3.tar.xz) = b31167c64846b96aeadbd94d4040c4add684e19a93daa9737b47991cd068d87c +SIZE (KDE/Qt/5.9.3/qtremoteobjects-opensource-src-5.9.3.tar.xz) = 282200 +SHA256 (KDE/Qt/5.9.3/qtscript-opensource-src-5.9.3.tar.xz) = b80bfaaf58f154b68101e438a1881f669cb9974026926be7755adb00af355566 +SIZE (KDE/Qt/5.9.3/qtscript-opensource-src-5.9.3.tar.xz) = 2612056 +SHA256 (KDE/Qt/5.9.3/qtscxml-opensource-src-5.9.3.tar.xz) = d8f51fa8eddd09fef29d8fad6e570e9ca9403469543ab10cb5cfad738786a81b +SIZE (KDE/Qt/5.9.3/qtscxml-opensource-src-5.9.3.tar.xz) = 414128 +SHA256 (KDE/Qt/5.9.3/qtsensors-opensource-src-5.9.3.tar.xz) = b95ea20b3d616655435357671558631da6fe6970500b7e6d35d1111f0b8cdac1 +SIZE (KDE/Qt/5.9.3/qtsensors-opensource-src-5.9.3.tar.xz) = 1994812 +SHA256 (KDE/Qt/5.9.3/qtserialbus-opensource-src-5.9.3.tar.xz) = ef62745e1793515e03fa586171de13eb17ee7699c9eb626f76a4dc5a00c46938 +SIZE (KDE/Qt/5.9.3/qtserialbus-opensource-src-5.9.3.tar.xz) = 279060 +SHA256 (KDE/Qt/5.9.3/qtserialport-opensource-src-5.9.3.tar.xz) = 4cdd3e9157ec3e91078f993cd28651989fa2429a409e19d398fb9cced231abdf +SIZE (KDE/Qt/5.9.3/qtserialport-opensource-src-5.9.3.tar.xz) = 273152 +SHA256 (KDE/Qt/5.9.3/qtspeech-opensource-src-5.9.3.tar.xz) = 01526024437dfc1e4f652e0b883fc3333260321aacee4c51774018bf86bb99b0 +SIZE (KDE/Qt/5.9.3/qtspeech-opensource-src-5.9.3.tar.xz) = 80832 +SHA256 (KDE/Qt/5.9.3/qtsvg-opensource-src-5.9.3.tar.xz) = df6628a60c8fbbcff99e6a24955c29494268d741509a3367a2294031ab4f5df2 +SIZE (KDE/Qt/5.9.3/qtsvg-opensource-src-5.9.3.tar.xz) = 1778224 +SHA256 (KDE/Qt/5.9.3/qttools-opensource-src-5.9.3.tar.xz) = 442c38de3e35f9dcc355dadff35436e23a5a7abd7dd1167a3bf6325e3d9284ff +SIZE (KDE/Qt/5.9.3/qttools-opensource-src-5.9.3.tar.xz) = 9777804 +SHA256 (KDE/Qt/5.9.3/qttranslations-opensource-src-5.9.3.tar.xz) = 40ac57ec79dd4fd27dff7a9d8abe8ebe2106c19a4b60daf007353f4671909bd9 +SIZE (KDE/Qt/5.9.3/qttranslations-opensource-src-5.9.3.tar.xz) = 1414192 +SHA256 (KDE/Qt/5.9.3/qtvirtualkeyboard-opensource-src-5.9.3.tar.xz) = b9313f744026f0dcf6e1008212880cd34851499d8b6bc9fc9fbaa1e4e52532ff +SIZE (KDE/Qt/5.9.3/qtvirtualkeyboard-opensource-src-5.9.3.tar.xz) = 10030260 +SHA256 (KDE/Qt/5.9.3/qtwayland-opensource-src-5.9.3.tar.xz) = 308e8c44b0ad13520868365d72786d3e3f0b384da99ee72ba543cd866f655f6d +SIZE (KDE/Qt/5.9.3/qtwayland-opensource-src-5.9.3.tar.xz) = 314652 +SHA256 (KDE/Qt/5.9.3/qtwebchannel-opensource-src-5.9.3.tar.xz) = 632795b293f1318e9aaa1e124b6a39b1625c8c1e35b0a9f05a02ea0066458358 +SIZE (KDE/Qt/5.9.3/qtwebchannel-opensource-src-5.9.3.tar.xz) = 147404 +SHA256 (KDE/Qt/5.9.3/qtwebengine-opensource-src-5.9.3.tar.xz) = 45ae1142fd87271c100f4d7889427738e774e86db5d8f6bcf9ceb99d18571d37 +SIZE (KDE/Qt/5.9.3/qtwebengine-opensource-src-5.9.3.tar.xz) = 217344496 +SHA256 (KDE/Qt/5.9.3/qtwebsockets-opensource-src-5.9.3.tar.xz) = ce069dff5b552bc6039bcf17e211d2c8837757e2194773bb54054105866111de +SIZE (KDE/Qt/5.9.3/qtwebsockets-opensource-src-5.9.3.tar.xz) = 199420 +SHA256 (KDE/Qt/5.9.3/qtwebview-opensource-src-5.9.3.tar.xz) = ee5663e4294c09e7c762c6cc8ed7cf8e7bd9776ac557c29c76b7f967907729c5 +SIZE (KDE/Qt/5.9.3/qtwebview-opensource-src-5.9.3.tar.xz) = 108092 +SHA256 (KDE/Qt/5.9.3/qtwinextras-opensource-src-5.9.3.tar.xz) = 145e6325ad8207dccdddb4680be34c63063b9671dddcb6c0dc17561f8ac244d2 +SIZE (KDE/Qt/5.9.3/qtwinextras-opensource-src-5.9.3.tar.xz) = 745136 +SHA256 (KDE/Qt/5.9.3/qtx11extras-opensource-src-5.9.3.tar.xz) = e4e0bf8cbb629758ab85b72d240d7424642482f602ce414e06deef4e147bf2be +SIZE (KDE/Qt/5.9.3/qtx11extras-opensource-src-5.9.3.tar.xz) = 76612 +SHA256 (KDE/Qt/5.9.3/qtxmlpatterns-opensource-src-5.9.3.tar.xz) = cf9c66a612a963382f7b4b51ac8ee5e920bd035b26ecb5c5957f8f3d3286f0ba +SIZE (KDE/Qt/5.9.3/qtxmlpatterns-opensource-src-5.9.3.tar.xz) = 1360880 diff --git a/devel/qt5/files/extrapatch-config.tests-unix-compile.test b/devel/qt5/files/extrapatch-config.tests-unix-compile.test deleted file mode 100644 index 42917502119d..000000000000 --- a/devel/qt5/files/extrapatch-config.tests-unix-compile.test +++ /dev/null @@ -1,11 +0,0 @@ ---- config.tests/unix/compile.test.orig 2016-05-12 13:16:04.782542000 +0200 -+++ config.tests/unix/compile.test 2016-05-12 13:16:17.510837000 +0200 -@@ -14,7 +14,7 @@ - LFLAGS="$SYSROOT_FLAG" - INCLUDEPATH="" - CFLAGS="$SYSROOT_FLAG" --CXXFLAGS="$SYSROOT_FLAG" -+CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG" - MAC_ARCH_CXXFLAGS="" - MAC_ARCH_LFLAGS="" - while [ "$#" -gt 0 ]; do diff --git a/devel/qt5/files/extrapatch-config.tests_unix_arch.test b/devel/qt5/files/extrapatch-config.tests_unix_arch.test deleted file mode 100644 index 039e3cb55fb0..000000000000 --- a/devel/qt5/files/extrapatch-config.tests_unix_arch.test +++ /dev/null @@ -1,15 +0,0 @@ -For many architectures (armv6, aarch64), is -mcpu is essential for proper -detection of CPU features. Follow compile.test case and reuse CXXFLAGS -from make environment also in arch.test. - ---- config.tests/unix/arch.test.orig 2017-02-05 07:43:57 UTC -+++ config.tests/unix/arch.test -@@ -17,7 +17,7 @@ else - fi - - LFLAGS="$SYSROOT_FLAG" --CXXFLAGS="$SYSROOT_FLAG" -+CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG" - - while [ "$#" -gt 0 ]; do - PARAM=$1 diff --git a/devel/qt5/files/extrapatch-configure b/devel/qt5/files/extrapatch-configure index 46515d852348..6bde9adf7213 100644 --- a/devel/qt5/files/extrapatch-configure +++ b/devel/qt5/files/extrapatch-configure @@ -1,177 +1,18 @@ -* The "build qmake" chunk is required for qtbase ports other than devel/qmake5 - to use the already built qmake instead of always building their own copy. - -* All the other chunks are part of the changes required to avoid ports/194088. - - We want to avoid passing -I${LOCALBASE}/include and -L${LOCALBASE}/lib to the - compiler since in Qt5 at least for the Qt ports themselves those parameters - will be passed before the build directories, and consequently an older - installed version will be used when building a new Qt port and cause - problems. See QTBUG-40825 for a discussion we have started upstream. - - This part of the solution comprises both filtering the output of the - pkg-config calls so it does not contain those parameters as well as - changing the default value of DEFAULT_LIBDIRS in bsd.qt.mk (in the - qtbase-post-patch target). It is used in the pkg-config filtering as well - 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.orig 2015-03-16 17:16:10.000000000 +0100 -+++ configure 2016-04-18 12:35:38.595937000 +0200 -@@ -3878,7 +3878,7 @@ +--- configure.orig 2017-07-14 14:53:54.062844000 +0200 ++++ configure 2017-07-14 14:55:47.269845000 +0200 +@@ -713,6 +713,7 @@ } - + # build qmake --if true; then ###[ '!' -f "$outpath/bin/qmake" ]; -+if [ '!' -e "$outpath/bin/qmake" ]; then ++if [ '!' -f "$outpath/bin/qmake" ] ; then echo "Creating qmake..." - mkdir -p "$outpath/qmake" || exit -@@ -5045,8 +5045,8 @@ - SQLITE_AUTODETECT_FAILED="no" - if [ "$CFG_SQLITE" = "system" ]; then - if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists sqlite3 2>/dev/null; then -- QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null` -- QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null` -+ QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null | filterIncludeOptions` -+ QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null | filterLibraryOptions` - else - QT_CFLAGS_SQLITE= - QT_LFLAGS_SQLITE="-lsqlite3 -lz" -@@ -5149,8 +5149,8 @@ - # runtime: no detection (cannot fail), load libdbus-1 at runtime - if [ "$CFG_DBUS" = "auto" ] || [ "$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` -- QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null` -+ QT_CFLAGS_DBUS=`$PKG_CONFIG --cflags dbus-1 2>/dev/null | filterIncludeOptions` -+ QT_LIBS_DBUS=`$PKG_CONFIG --libs dbus-1 2>/dev/null | filterLibraryOptions` - else - QT_LIBS_DBUS="-ldbus-1" + +@@ -814,6 +815,7 @@ + fi + echo "Done." fi -@@ -5201,8 +5201,8 @@ - # auto-detect Glib support - if [ "$CFG_GLIB" != "no" ]; then - if [ -n "$PKG_CONFIG" ]; then -- QT_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null` -- QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null` -+ QT_CFLAGS_GLIB=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0 2>/dev/null | filterIncludeOptions` -+ QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null | filterLibraryOptions` - fi - if compileTest unix/glib "Glib" $QT_CFLAGS_GLIB $QT_LIBS_GLIB; then - CFG_GLIB=yes -@@ -5225,9 +5225,9 @@ - # auto-detect GTK style support - if [ "$CFG_GLIB" = "yes" -a "$CFG_GTK" != "no" ]; then - if [ -n "$PKG_CONFIG" ]; then -- QT_CFLAGS_QGTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null` -- QT_LIBS_QGTK3=`$PKG_CONFIG --libs gtk+-3.0 2>/dev/null` -- QT_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null` -+ QT_CFLAGS_QGTK3=`$PKG_CONFIG --cflags gtk+-3.0 2>/dev/null | filterIncludeOptions` -+ QT_LIBS_QGTK3=`$PKG_CONFIG --libs gtk+-3.0 2>/dev/null | filterLibraryOptions` -+ QT_LIBS_QGOBJECT=`$PKG_CONFIG --libs gobject-2.0 2>/dev/null | filterLibraryOptions` - fi - if [ -n "$QT_CFLAGS_QGTK3" ] ; then - CFG_GTK=yes -@@ -5272,8 +5272,8 @@ - # Auto-detect PulseAudio support - if [ "$CFG_PULSEAUDIO" != "no" ]; then - if [ -n "$PKG_CONFIG" ]; then -- QT_CFLAGS_PULSEAUDIO=`$PKG_CONFIG --cflags libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null` -- QT_LIBS_PULSEAUDIO=`$PKG_CONFIG --libs libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null` -+ QT_CFLAGS_PULSEAUDIO=`$PKG_CONFIG --cflags libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null | filterIncludeOptions` -+ QT_LIBS_PULSEAUDIO=`$PKG_CONFIG --libs libpulse '>=' 0.9.10 libpulse-mainloop-glib 2>/dev/null | filterLibraryOptions` - fi - if compileTest unix/pulseaudio "PulseAudio" $QT_CFLAGS_PULSEAUDIO $QT_LIBS_PULSEAUDIO; then - CFG_PULSEAUDIO=yes -@@ -5436,8 +5436,8 @@ - # auto-detect FontConfig support - if [ "$CFG_FONTCONFIG" != "no" ]; then - if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig --exists freetype2 2>/dev/null; then -- QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null` -- QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null` -+ QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null | filterIncludeOptions` -+ QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null | filterLibraryOptions` - else - QT_CFLAGS_FONTCONFIG= - QT_LIBS_FONTCONFIG="-lfreetype -lfontconfig" -@@ -5192,9 +5192,9 @@ - - if [ "$CFG_LIBUDEV" != "no" ]; then - if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists libudev 2>/dev/null; then -- QMAKE_INCDIR_LIBUDEV=`$PKG_CONFIG --cflags-only-I libudev 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'` -- QMAKE_LIBS_LIBUDEV=`$PKG_CONFIG --libs libudev 2>/dev/null` -- QMAKE_CFLAGS_LIBUDEV=`$PKG_CONFIG --cflags libudev 2>/dev/null` -+ QMAKE_INCDIR_LIBUDEV=`$PKG_CONFIG --cflags-only-I libudev 2>/dev/null | filterIncludeOptions | sed -e 's,^-I,,g' -e 's, -I, ,g'` -+ QMAKE_LIBS_LIBUDEV=`$PKG_CONFIG --libs libudev 2>/dev/null | filterLibraryOptions` -+ QMAKE_CFLAGS_LIBUDEV=`$PKG_CONFIG --cflags libudev 2>/dev/null | filterIncludeOptions` - QMakeVar set QMAKE_INCDIR_LIBUDEV "$QMAKE_INCDIR_LIBUDEV" - QMakeVar set QMAKE_LIBS_LIBUDEV "$QMAKE_LIBS_LIBUDEV" - fi -@@ -5333,8 +5333,8 @@ - - if [ "$CFG_XCB" != "no" ]; then - if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then -- QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb 2>/dev/null`" -- QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb 2>/dev/null`" -+ QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb 2>/dev/null | filterIncludeOptions`" -+ QMAKE_LIBS_XCB="`$PKG_CONFIG --libs xcb 2>/dev/null | filterLibraryOptions`" - fi - if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "x11" 2> /dev/null; then - QMAKE_X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`" -@@ -5631,16 +5631,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" -- QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null`" -- QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null`" -+ QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null | filterIncludeOptions`" -+ QMAKE_LIBS_XCB="`$PKG_CONFIG --libs $XCB_PACKAGES 2>/dev/null | filterLibraryOptions`" - fi - - # libxcb version 1.10 was the first version that enables xcb-xkb by default, - # therefore the minimal xcb-xkb version we support is 1.10 - CFG_XKB=no - if $PKG_CONFIG --exists "xcb-xkb >= 1.10" 2>/dev/null; then -- QMAKE_CFLAGS_XKB="`$PKG_CONFIG --cflags xcb xcb-xkb 2>/dev/null`" -- QMAKE_LIBS_XKB="`$PKG_CONFIG --libs xcb xcb-xkb 2>/dev/null`" -+ QMAKE_CFLAGS_XKB="`$PKG_CONFIG --cflags xcb xcb-xkb 2>/dev/null | filterIncludeOptions`" -+ QMAKE_LIBS_XKB="`$PKG_CONFIG --libs xcb xcb-xkb 2>/dev/null | filterLibraryOptions`" - if compileTest qpa/xcb-xkb "xcb-xkb" $QMAKE_CFLAGS_XKB $QMAKE_LIBS_XKB; then - CFG_XKB=yes - fi -@@ -5416,8 +5416,8 @@ - - if [ "$CFG_DIRECTFB" != "no" ]; then - if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists directfb 2>/dev/null; then -- QMAKE_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null` -- QMAKE_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null` -+ QMAKE_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null | filterIncludeOptions` -+ QMAKE_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null | filterLibraryOptions` - 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 -@@ -5776,8 +5776,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 -- QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon xkbcommon-x11 2>/dev/null`" -- QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon xkbcommon-x11 2>/dev/null`" -+ QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon xkbcommon-x11 2>/dev/null | filterIncludeOptions`" -+ QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon xkbcommon-x11 2>/dev/null | filterLibraryOptions`" - - QMakeVar set QMAKE_CFLAGS_XKBCOMMON "$QMAKE_CFLAGS_XKBCOMMON" - QMakeVar set QMAKE_LIBS_XKBCOMMON "$QMAKE_LIBS_XKBCOMMON" -@@ -5830,9 +5830,9 @@ - fi - - if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then -- QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'` -- QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null` -- QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null` -+ QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | filterIncludeOptions | sed -e 's,^-I,,g' -e 's, -I, ,g'` -+ QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null | filterLibraryOptions` -+ QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null | filterIncludeOptions` - QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL" - QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL" - QMakeVar set QMAKE_CFLAGS_EGL "`echo " $QMAKE_CFLAGS_EGL " | sed -e 's, -I[^ ]* , ,g;s,^ ,,;s, $,,'`" ++fi # Creating qmake + + #------------------------------------------------------------------------------- + # create a qt.conf for the Qt build tree itself diff --git a/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf b/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf new file mode 100644 index 000000000000..e1ff44b3de69 --- /dev/null +++ b/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf @@ -0,0 +1,30 @@ +--- mkspecs/common/bsd/bsd.conf.orig 2017-07-23 16:27:40 UTC ++++ mkspecs/common/bsd/bsd.conf +@@ -21,6 +21,27 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm + QMAKE_LIBS_OPENGL = -lGL + QMAKE_LIBS_THREAD = + ++QMAKE_INCDIR_X11 = $$PREFIX/include ++QMAKE_LIBDIR_X11 = $$PREFIX/lib ++QMAKE_INCDIR_OPENGL = $$PREFIX/include ++QMAKE_LIBDIR_OPENGL = $$PREFIX/lib ++QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL ++QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL ++QMAKE_INCDIR_EGL = $$PREFIX/include ++QMAKE_LIBDIR_EGL = $$PREFIX/lib ++ ++QMAKE_LIBS_EGL = -lEGL ++QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 ++QMAKE_LIBS_LIBUDEV = -ludev ++ ++QMAKE_CFLAGS_WAYLAND = ++QMAKE_INCDIR_WAYLAND = $$PREFIX/include ++QMAKE_LIBS_WAYLAND_CLIENT = -lwayland-client ++QMAKE_LIBS_WAYLAND_SERVER = -lwayland-server ++QMAKE_LIBDIR_WAYLAND = $$PREFIX/lib ++QMAKE_DEFINES_WAYLAND = ++QMAKE_WAYLAND_SCANNER = wayland-scanner ++ + QMAKE_AR = ar cqs + QMAKE_OBJCOPY = objcopy + QMAKE_NM = nm -P diff --git a/devel/qt5/files/extrapatch-mkspecs_features_create__cmake.prf b/devel/qt5/files/extrapatch-mkspecs_features_create__cmake.prf index 2723284c5083..e15da7df862a 100644 --- a/devel/qt5/files/extrapatch-mkspecs_features_create__cmake.prf +++ b/devel/qt5/files/extrapatch-mkspecs_features_create__cmake.prf @@ -12,66 +12,57 @@ to fix up the paths so that cmake files still land in the the "correct" location in /usr/local/lib/cmake -- as this seemed to be the least intrusive method. - ---- mkspecs/features/create_cmake.prf.orig 2016-05-11 09:21:02.000000000 +0200 -+++ mkspecs/features/create_cmake.prf 2016-06-03 18:21:42.389363000 +0200 -@@ -48,7 +52,7 @@ +--- mkspecs/features/create_cmake.prf.orig 2017-06-28 11:54:29.000000000 +0200 ++++ mkspecs/features/create_cmake.prf 2017-07-14 15:04:51.254262000 +0200 +@@ -48,7 +48,7 @@ } - + CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX]) -contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { +contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*")|freebsd { CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/ CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True } -@@ -56,7 +60,7 @@ +@@ -56,7 +56,7 @@ !exists($$first(QT.$${MODULE}_private.includes)): CMAKE_NO_PRIVATE_INCLUDES = true - + CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) -contains(CMAKE_LIB_DIR,"^\\.\\./.*") { +contains(CMAKE_LIB_DIR,"^\\.\\./.*")|freebsd { CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ CMAKE_LIB_DIR_IS_ABSOLUTE = True } else { -@@ -67,20 +71,20 @@ +@@ -67,13 +67,13 @@ } - + CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) -contains(CMAKE_BIN_DIR, "^\\.\\./.*") { +contains(CMAKE_BIN_DIR, "^\\.\\./.*")|freebsd { CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ CMAKE_BIN_DIR_IS_ABSOLUTE = True } - + CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]) -contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") { +contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*")|freebsd { CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/ CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True } - - win32:!wince:!static:!staticlib { - CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX]) -- contains(CMAKE_DLL_DIR, "^\\.\\./.*") { -+ contains(CMAKE_DLL_DIR, "^\\.\\./.*")|freebsd { - CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ - CMAKE_DLL_DIR_IS_ABSOLUTE = True - } -@@ -167,7 +171,7 @@ +@@ -167,7 +167,7 @@ cmake_target_file - + cmake_qt5_plugin_file.files = $$cmake_target_file.output - cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} + cmake_qt5_plugin_file.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5$${CMAKE_MODULE_NAME} INSTALLS += cmake_qt5_plugin_file - + return() -@@ -314,7 +318,7 @@ +@@ -314,7 +314,7 @@ cmake_qt5_module_files.files += $$cmake_macros_file.output } - + -cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} +cmake_qt5_module_files.path = $$[QT_INSTALL_PREFIX]/lib/cmake/Qt5$${CMAKE_MODULE_NAME} - + # We are generating cmake files. Most developers of Qt are not aware of cmake, # so we require automatic tests to be available. The only module which should diff --git a/graphics/qt5-3d/Makefile b/graphics/qt5-3d/Makefile index 59d0cb887b41..fb6833f5749a 100644 --- a/graphics/qt5-3d/Makefile +++ b/graphics/qt5-3d/Makefile @@ -2,7 +2,6 @@ PORTNAME= 3d DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- @@ -11,7 +10,7 @@ COMMENT= Qt3D module LIB_DEPENDS= libassimp.so:multimedia/assimp -USES= pkgconfig qmake +USES= pkgconfig qmake:norecursive USE_QT5= concurrent core gui qml quick buildtools_build QT_DIST= ${PORTNAME} diff --git a/graphics/qt5-3d/pkg-plist b/graphics/qt5-3d/pkg-plist index d9bbcba21540..6ee3cac899fb 100644 --- a/graphics/qt5-3d/pkg-plist +++ b/graphics/qt5-3d/pkg-plist @@ -1,6 +1,111 @@ +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/additiveclipblend_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/animationclip_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/animationlogging_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/animationutils_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/backendnode_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/bezierevaluator_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/blendedclipanimator_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/buildblendtreesjob_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/channelmapper_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/channelmapping_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/clipanimator_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/clipblendnode_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/clipblendnodevisitor_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/clipblendvalue_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/evaluateblendclipanimatorjob_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/evaluateclipanimatorjob_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/fcurve_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/findrunningclipanimatorsjob_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/functionrangefinder_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/handle_types_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/handler_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/job_common_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/keyframe_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/lerpclipblend_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/loadanimationclipjob_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/managers_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/nodefunctor_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qabstractanimation_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qabstractanimationclip_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qabstractclipanimator_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qabstractclipblendnode_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qadditiveclipblend_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qanimationaspect_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qanimationclip_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qanimationcliploader_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qanimationcontroller_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qanimationgroup_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qblendedclipanimator_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qchannelmapper_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qchannelmapping_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qclipanimator_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qclipblendnodecreatedchange_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qclipblendvalue_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qkeyframeanimation_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qlerpclipblend_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qmorphinganimation_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qmorphtarget_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qt3danimation_global_p.h +%%QT_INCDIR%%/Qt3DAnimation/%%FULLVER%%/Qt3DAnimation/private/qvertexblendanimation_p.h +%%QT_INCDIR%%/Qt3DAnimation/QAbstractAnimation +%%QT_INCDIR%%/Qt3DAnimation/QAbstractAnimationClip +%%QT_INCDIR%%/Qt3DAnimation/QAbstractClipAnimator +%%QT_INCDIR%%/Qt3DAnimation/QAbstractClipBlendNode +%%QT_INCDIR%%/Qt3DAnimation/QAdditiveClipBlend +%%QT_INCDIR%%/Qt3DAnimation/QAnimationAspect +%%QT_INCDIR%%/Qt3DAnimation/QAnimationClip +%%QT_INCDIR%%/Qt3DAnimation/QAnimationClipData +%%QT_INCDIR%%/Qt3DAnimation/QAnimationClipLoader +%%QT_INCDIR%%/Qt3DAnimation/QAnimationController +%%QT_INCDIR%%/Qt3DAnimation/QAnimationGroup +%%QT_INCDIR%%/Qt3DAnimation/QBlendedClipAnimator +%%QT_INCDIR%%/Qt3DAnimation/QChannel +%%QT_INCDIR%%/Qt3DAnimation/QChannelComponent +%%QT_INCDIR%%/Qt3DAnimation/QChannelMapper +%%QT_INCDIR%%/Qt3DAnimation/QChannelMapping +%%QT_INCDIR%%/Qt3DAnimation/QClipAnimator +%%QT_INCDIR%%/Qt3DAnimation/QClipBlendNodeCreatedChange +%%QT_INCDIR%%/Qt3DAnimation/QClipBlendNodeCreatedChangeBase +%%QT_INCDIR%%/Qt3DAnimation/QClipBlendNodeCreatedChangeBasePtr +%%QT_INCDIR%%/Qt3DAnimation/QClipBlendValue +%%QT_INCDIR%%/Qt3DAnimation/QKeyFrame +%%QT_INCDIR%%/Qt3DAnimation/QKeyframeAnimation +%%QT_INCDIR%%/Qt3DAnimation/QLerpClipBlend +%%QT_INCDIR%%/Qt3DAnimation/QMorphTarget +%%QT_INCDIR%%/Qt3DAnimation/QMorphingAnimation +%%QT_INCDIR%%/Qt3DAnimation/QVertexBlendAnimation +%%QT_INCDIR%%/Qt3DAnimation/Qt3DAnimation +%%QT_INCDIR%%/Qt3DAnimation/Qt3DAnimationDepends +%%QT_INCDIR%%/Qt3DAnimation/Qt3DAnimationVersion +%%QT_INCDIR%%/Qt3DAnimation/qabstractanimation.h +%%QT_INCDIR%%/Qt3DAnimation/qabstractanimationclip.h +%%QT_INCDIR%%/Qt3DAnimation/qabstractclipanimator.h +%%QT_INCDIR%%/Qt3DAnimation/qabstractclipblendnode.h +%%QT_INCDIR%%/Qt3DAnimation/qadditiveclipblend.h +%%QT_INCDIR%%/Qt3DAnimation/qanimationaspect.h +%%QT_INCDIR%%/Qt3DAnimation/qanimationclip.h +%%QT_INCDIR%%/Qt3DAnimation/qanimationclipdata.h +%%QT_INCDIR%%/Qt3DAnimation/qanimationcliploader.h +%%QT_INCDIR%%/Qt3DAnimation/qanimationcontroller.h +%%QT_INCDIR%%/Qt3DAnimation/qanimationgroup.h +%%QT_INCDIR%%/Qt3DAnimation/qblendedclipanimator.h +%%QT_INCDIR%%/Qt3DAnimation/qchannel.h +%%QT_INCDIR%%/Qt3DAnimation/qchannelcomponent.h +%%QT_INCDIR%%/Qt3DAnimation/qchannelmapper.h +%%QT_INCDIR%%/Qt3DAnimation/qchannelmapping.h +%%QT_INCDIR%%/Qt3DAnimation/qclipanimator.h +%%QT_INCDIR%%/Qt3DAnimation/qclipblendnodecreatedchange.h +%%QT_INCDIR%%/Qt3DAnimation/qclipblendvalue.h +%%QT_INCDIR%%/Qt3DAnimation/qkeyframe.h +%%QT_INCDIR%%/Qt3DAnimation/qkeyframeanimation.h +%%QT_INCDIR%%/Qt3DAnimation/qlerpclipblend.h +%%QT_INCDIR%%/Qt3DAnimation/qmorphinganimation.h +%%QT_INCDIR%%/Qt3DAnimation/qmorphtarget.h +%%QT_INCDIR%%/Qt3DAnimation/qt3danimation_global.h +%%QT_INCDIR%%/Qt3DAnimation/qt3danimationversion.h +%%QT_INCDIR%%/Qt3DAnimation/qvertexblendanimation.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/aspectcommanddebugger_p.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 @@ -31,7 +136,6 @@ %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qframeallocator_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qframeallocator_p_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qhandle_p.h -%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qhandlemanager_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qlockableobserverinterface_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qmath3d_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qnode_p.h @@ -44,6 +148,7 @@ %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qopenglinformationservice_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qopenglinformationservice_p_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qpostman_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qpostman_p_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qpropertynodeaddedchange_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qpropertynoderemovedchange_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qpropertyupdatedchange_p.h @@ -63,6 +168,7 @@ %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qstaticpropertyvalueremovedchangebase_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qsysteminformationservice_p.h %%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qsysteminformationservice_p_p.h +%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qt3dcore-config_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 @@ -148,17 +254,25 @@ %%QT_INCDIR%%/Qt3DCore/qstaticpropertyupdatedchangebase.h %%QT_INCDIR%%/Qt3DCore/qstaticpropertyvalueaddedchangebase.h %%QT_INCDIR%%/Qt3DCore/qstaticpropertyvalueremovedchangebase.h +%%QT_INCDIR%%/Qt3DCore/qt3dcore-config.h %%QT_INCDIR%%/Qt3DCore/qt3dcore_global.h %%QT_INCDIR%%/Qt3DCore/qt3dcoreversion.h %%QT_INCDIR%%/Qt3DCore/qtransform.h +%%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/areaallocator_p.h +%%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/distancefieldtextrenderer_p.h +%%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/distancefieldtextrenderer_p_p.h %%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qconegeometry_p.h %%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qcuboidgeometry_p.h %%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qcylindergeometry_p.h %%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qdiffusemapmaterial_p.h %%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qdiffusespecularmapmaterial_p.h +%%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qdistancefieldglyphcache_p.h +%%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qextrudedtextgeometry_p.h %%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qfirstpersoncameracontroller_p.h %%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qforwardrenderer_p.h %%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qgoochmaterial_p.h +%%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qmetalroughmaterial_p.h +%%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qmorphphongmaterial_p.h %%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qnormaldiffusemapalphamaterial_p.h %%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qnormaldiffusemapmaterial_p.h %%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qnormaldiffusespecularmapmaterial_p.h @@ -169,6 +283,14 @@ %%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qplanegeometry_p.h %%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qskyboxentity_p.h %%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qspheregeometry_p.h +%%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qt3dwindow_p.h +%%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qtext2dentity_p.h +%%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qtext2dmaterial_p.h +%%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qtext2dmaterial_p_p.h +%%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qtextureatlas_p.h +%%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qtextureatlas_p_p.h +%%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qtexturedmetalroughmaterial_p.h +%%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qtexturematerial_p.h %%QT_INCDIR%%/Qt3DExtras/%%FULLVER%%/Qt3DExtras/private/qtorusgeometry_p.h %%QT_INCDIR%%/Qt3DExtras/QConeGeometry %%QT_INCDIR%%/Qt3DExtras/QConeMesh @@ -178,9 +300,13 @@ %%QT_INCDIR%%/Qt3DExtras/QCylinderMesh %%QT_INCDIR%%/Qt3DExtras/QDiffuseMapMaterial %%QT_INCDIR%%/Qt3DExtras/QDiffuseSpecularMapMaterial +%%QT_INCDIR%%/Qt3DExtras/QExtrudedTextGeometry +%%QT_INCDIR%%/Qt3DExtras/QExtrudedTextMesh %%QT_INCDIR%%/Qt3DExtras/QFirstPersonCameraController %%QT_INCDIR%%/Qt3DExtras/QForwardRenderer %%QT_INCDIR%%/Qt3DExtras/QGoochMaterial +%%QT_INCDIR%%/Qt3DExtras/QMetalRoughMaterial +%%QT_INCDIR%%/Qt3DExtras/QMorphPhongMaterial %%QT_INCDIR%%/Qt3DExtras/QNormalDiffuseMapAlphaMaterial %%QT_INCDIR%%/Qt3DExtras/QNormalDiffuseMapMaterial %%QT_INCDIR%%/Qt3DExtras/QNormalDiffuseSpecularMapMaterial @@ -193,6 +319,9 @@ %%QT_INCDIR%%/Qt3DExtras/QSkyboxEntity %%QT_INCDIR%%/Qt3DExtras/QSphereGeometry %%QT_INCDIR%%/Qt3DExtras/QSphereMesh +%%QT_INCDIR%%/Qt3DExtras/QText2DEntity +%%QT_INCDIR%%/Qt3DExtras/QTextureMaterial +%%QT_INCDIR%%/Qt3DExtras/QTexturedMetalRoughMaterial %%QT_INCDIR%%/Qt3DExtras/QTorusGeometry %%QT_INCDIR%%/Qt3DExtras/QTorusMesh %%QT_INCDIR%%/Qt3DExtras/Qt3DExtras @@ -207,9 +336,13 @@ %%QT_INCDIR%%/Qt3DExtras/qcylindermesh.h %%QT_INCDIR%%/Qt3DExtras/qdiffusemapmaterial.h %%QT_INCDIR%%/Qt3DExtras/qdiffusespecularmapmaterial.h +%%QT_INCDIR%%/Qt3DExtras/qextrudedtextgeometry.h +%%QT_INCDIR%%/Qt3DExtras/qextrudedtextmesh.h %%QT_INCDIR%%/Qt3DExtras/qfirstpersoncameracontroller.h %%QT_INCDIR%%/Qt3DExtras/qforwardrenderer.h %%QT_INCDIR%%/Qt3DExtras/qgoochmaterial.h +%%QT_INCDIR%%/Qt3DExtras/qmetalroughmaterial.h +%%QT_INCDIR%%/Qt3DExtras/qmorphphongmaterial.h %%QT_INCDIR%%/Qt3DExtras/qnormaldiffusemapalphamaterial.h %%QT_INCDIR%%/Qt3DExtras/qnormaldiffusemapmaterial.h %%QT_INCDIR%%/Qt3DExtras/qnormaldiffusespecularmapmaterial.h @@ -225,14 +358,20 @@ %%QT_INCDIR%%/Qt3DExtras/qt3dextras_global.h %%QT_INCDIR%%/Qt3DExtras/qt3dextrasversion.h %%QT_INCDIR%%/Qt3DExtras/qt3dwindow.h +%%QT_INCDIR%%/Qt3DExtras/qtext2dentity.h +%%QT_INCDIR%%/Qt3DExtras/qtexturedmetalroughmaterial.h +%%QT_INCDIR%%/Qt3DExtras/qtexturematerial.h %%QT_INCDIR%%/Qt3DExtras/qtorusgeometry.h %%QT_INCDIR%%/Qt3DExtras/qtorusmesh.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/abstractactioninput_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/abstractaxisinput_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/action_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/actioninput_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/analogaxisinput_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/assignkeyboardfocusjob_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/axis_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/axisaccumulator_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/axisaccumulatorjob_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/axissetting_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/buttonaxisinput_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/eventsourcesetterhelper_p.h @@ -244,26 +383,32 @@ %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/inputmanagers_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/inputsequence_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/inputsettings_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/job_common_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/keyboarddevice_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/keyboardeventfilter_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/keyboardhandler_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/keyboardmousegenericdeviceintegration_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/keyeventdispatcherjob_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/loadproxydevicejob_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/logicaldevice_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/mousedevice_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/mouseeventdispatcherjob_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/mouseeventfilter_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/mousehandler_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/movingaverage_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/physicaldeviceproxy_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qabstractactioninput_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qabstractaxisinput_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qabstractphysicaldevice_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qabstractphysicaldevicebackendnode_p_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qabstractphysicaldeviceproxy_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qabstractphysicaldeviceproxy_p_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qaction_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qactioninput_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qanalogaxisinput_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qaxis_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qaxisaccumulator_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qaxissetting_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qbuttonaxisinput_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qgamepadinput_p.h @@ -284,6 +429,7 @@ %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qphysicaldevicecreatedchange_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/qt3dinput_global_p.h %%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/updateaxisactionjob_p.h +%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/utils_p.h %%QT_INCDIR%%/Qt3DInput/QAbstractActionInput %%QT_INCDIR%%/Qt3DInput/QAbstractAxisInput %%QT_INCDIR%%/Qt3DInput/QAbstractPhysicalDevice @@ -291,6 +437,7 @@ %%QT_INCDIR%%/Qt3DInput/QActionInput %%QT_INCDIR%%/Qt3DInput/QAnalogAxisInput %%QT_INCDIR%%/Qt3DInput/QAxis +%%QT_INCDIR%%/Qt3DInput/QAxisAccumulator %%QT_INCDIR%%/Qt3DInput/QAxisSetting %%QT_INCDIR%%/Qt3DInput/QButtonAxisInput %%QT_INCDIR%%/Qt3DInput/QInputAspect @@ -321,6 +468,7 @@ %%QT_INCDIR%%/Qt3DInput/qactioninput.h %%QT_INCDIR%%/Qt3DInput/qanalogaxisinput.h %%QT_INCDIR%%/Qt3DInput/qaxis.h +%%QT_INCDIR%%/Qt3DInput/qaxisaccumulator.h %%QT_INCDIR%%/Qt3DInput/qaxissetting.h %%QT_INCDIR%%/Qt3DInput/qbuttonaxisinput.h %%QT_INCDIR%%/Qt3DInput/qinputaspect.h @@ -341,6 +489,7 @@ %%QT_INCDIR%%/Qt3DLogic/%%FULLVER%%/Qt3DLogic/private/executor_p.h %%QT_INCDIR%%/Qt3DLogic/%%FULLVER%%/Qt3DLogic/private/handle_types_p.h %%QT_INCDIR%%/Qt3DLogic/%%FULLVER%%/Qt3DLogic/private/handler_p.h +%%QT_INCDIR%%/Qt3DLogic/%%FULLVER%%/Qt3DLogic/private/job_common_p.h %%QT_INCDIR%%/Qt3DLogic/%%FULLVER%%/Qt3DLogic/private/manager_p.h %%QT_INCDIR%%/Qt3DLogic/%%FULLVER%%/Qt3DLogic/private/managers_p.h %%QT_INCDIR%%/Qt3DLogic/%%FULLVER%%/Qt3DLogic/private/qframeaction_p.h @@ -354,9 +503,6 @@ %%QT_INCDIR%%/Qt3DLogic/qlogicaspect.h %%QT_INCDIR%%/Qt3DLogic/qt3dlogic_global.h %%QT_INCDIR%%/Qt3DLogic/qt3dlogicversion.h -%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/abstractactioninput_p.h -%%QT_INCDIR%%/Qt3DInput/%%FULLVER%%/Qt3DInput/private/job_common_p.h -%%QT_INCDIR%%/Qt3DLogic/%%FULLVER%%/Qt3DLogic/private/job_common_p.h %%QT_INCDIR%%/Qt3DQuick/%%FULLVER%%/Qt3DQuick/private/qqmlaspectengine_p.h %%QT_INCDIR%%/Qt3DQuick/%%FULLVER%%/Qt3DQuick/private/qquaternionanimation_p.h %%QT_INCDIR%%/Qt3DQuick/%%FULLVER%%/Qt3DQuick/private/qt3dquick_global_p.h @@ -367,6 +513,7 @@ %%QT_INCDIR%%/Qt3DQuick/%%FULLVER%%/Qt3DQuick/private/quick3dentityloader_p_p.h %%QT_INCDIR%%/Qt3DQuick/%%FULLVER%%/Qt3DQuick/private/quick3dnode_p.h %%QT_INCDIR%%/Qt3DQuick/%%FULLVER%%/Qt3DQuick/private/quick3dnodeinstantiator_p.h +%%QT_INCDIR%%/Qt3DQuick/%%FULLVER%%/Qt3DQuick/private/quick3dnodev9_p.h %%QT_INCDIR%%/Qt3DQuick/QQmlAspectEngine %%QT_INCDIR%%/Qt3DQuick/Qt3DQuick %%QT_INCDIR%%/Qt3DQuick/Qt3DQuickDepends @@ -374,6 +521,25 @@ %%QT_INCDIR%%/Qt3DQuick/qqmlaspectengine.h %%QT_INCDIR%%/Qt3DQuick/qt3dquick_global.h %%QT_INCDIR%%/Qt3DQuick/qt3dquickversion.h +%%QT_INCDIR%%/Qt3DQuickAnimation/%%FULLVER%%/Qt3DQuickAnimation/private/qt3dquickanimation_global_p.h +%%QT_INCDIR%%/Qt3DQuickAnimation/%%FULLVER%%/Qt3DQuickAnimation/private/qt3dquickanimationnodefactory_p.h +%%QT_INCDIR%%/Qt3DQuickAnimation/%%FULLVER%%/Qt3DQuickAnimation/private/quick3danimationcontroller_p.h +%%QT_INCDIR%%/Qt3DQuickAnimation/%%FULLVER%%/Qt3DQuickAnimation/private/quick3danimationgroup_p.h +%%QT_INCDIR%%/Qt3DQuickAnimation/%%FULLVER%%/Qt3DQuickAnimation/private/quick3dchannelmapper_p.h +%%QT_INCDIR%%/Qt3DQuickAnimation/%%FULLVER%%/Qt3DQuickAnimation/private/quick3dkeyframeanimation_p.h +%%QT_INCDIR%%/Qt3DQuickAnimation/%%FULLVER%%/Qt3DQuickAnimation/private/quick3dmorphinganimation_p.h +%%QT_INCDIR%%/Qt3DQuickAnimation/%%FULLVER%%/Qt3DQuickAnimation/private/quick3dmorphtarget_p.h +%%QT_INCDIR%%/Qt3DQuickAnimation/%%FULLVER%%/Qt3DQuickAnimation/private/quick3dvertexblendanimation_p.h +%%QT_INCDIR%%/Qt3DQuickAnimation/Qt3DQuickAnimation +%%QT_INCDIR%%/Qt3DQuickAnimation/Qt3DQuickAnimationDepends +%%QT_INCDIR%%/Qt3DQuickAnimation/Qt3DQuickAnimationVersion +%%QT_INCDIR%%/Qt3DQuickAnimation/qt3dquickanimation_global.h +%%QT_INCDIR%%/Qt3DQuickAnimation/qt3dquickanimationversion.h +%%QT_INCDIR%%/Qt3DQuickExtras/%%FULLVER%%/Qt3DQuickExtras/private/qt3dquickextras_global_p.h +%%QT_INCDIR%%/Qt3DQuickExtras/%%FULLVER%%/Qt3DQuickExtras/private/qt3dquickwindow_p.h +%%QT_INCDIR%%/Qt3DQuickExtras/%%FULLVER%%/Qt3DQuickExtras/private/qt3dquickwindowlogging_p.h +%%QT_INCDIR%%/Qt3DQuickExtras/%%FULLVER%%/Qt3DQuickExtras/private/quick3dlevelofdetailloader_p.h +%%QT_INCDIR%%/Qt3DQuickExtras/%%FULLVER%%/Qt3DQuickExtras/private/quick3dlevelofdetailloader_p_p.h %%QT_INCDIR%%/Qt3DQuickExtras/Qt3DQuickExtras %%QT_INCDIR%%/Qt3DQuickExtras/Qt3DQuickExtrasDepends %%QT_INCDIR%%/Qt3DQuickExtras/Qt3DQuickExtrasVersion @@ -401,6 +567,7 @@ %%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3dgeometry_p.h %%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3dlayerfilter_p.h %%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3dmaterial_p.h +%%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3dmemorybarrier_p.h %%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3dparameter_p.h %%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3dparameter_p_p.h %%QT_INCDIR%%/Qt3DQuickRender/%%FULLVER%%/Qt3DQuickRender/private/quick3drenderpass_p.h @@ -420,31 +587,55 @@ %%QT_INCDIR%%/Qt3DQuickRender/Qt3DQuickRenderVersion %%QT_INCDIR%%/Qt3DQuickRender/qt3dquickrender_global.h %%QT_INCDIR%%/Qt3DQuickRender/qt3dquickrenderversion.h +%%QT_INCDIR%%/Qt3DQuickScene2D/%%FULLVER%%/Qt3DQuickScene2D/private/qscene2d_p.h +%%QT_INCDIR%%/Qt3DQuickScene2D/%%FULLVER%%/Qt3DQuickScene2D/private/qt3dquick3dscene2d_p.h +%%QT_INCDIR%%/Qt3DQuickScene2D/%%FULLVER%%/Qt3DQuickScene2D/private/qt3dquickscene2d_global_p.h +%%QT_INCDIR%%/Qt3DQuickScene2D/%%FULLVER%%/Qt3DQuickScene2D/private/qt3dquickscene2d_logging_p.h +%%QT_INCDIR%%/Qt3DQuickScene2D/%%FULLVER%%/Qt3DQuickScene2D/private/qt3dquickscene2dnodefactory_p.h +%%QT_INCDIR%%/Qt3DQuickScene2D/%%FULLVER%%/Qt3DQuickScene2D/private/scene2d_p.h +%%QT_INCDIR%%/Qt3DQuickScene2D/%%FULLVER%%/Qt3DQuickScene2D/private/scene2devent_p.h +%%QT_INCDIR%%/Qt3DQuickScene2D/%%FULLVER%%/Qt3DQuickScene2D/private/scene2dmanager_p.h +%%QT_INCDIR%%/Qt3DQuickScene2D/%%FULLVER%%/Qt3DQuickScene2D/private/scene2dsharedobject_p.h +%%QT_INCDIR%%/Qt3DQuickScene2D/QScene2D +%%QT_INCDIR%%/Qt3DQuickScene2D/Qt3DQuickScene2D +%%QT_INCDIR%%/Qt3DQuickScene2D/Qt3DQuickScene2DDepends +%%QT_INCDIR%%/Qt3DQuickScene2D/Qt3DQuickScene2DVersion +%%QT_INCDIR%%/Qt3DQuickScene2D/qscene2d.h +%%QT_INCDIR%%/Qt3DQuickScene2D/qt3dquickscene2d_global.h +%%QT_INCDIR%%/Qt3DQuickScene2D/qt3dquickscene2dversion.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/abstractrenderer_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/apitexturemanager_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/attachmentpack_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/attribute_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/backendnode_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/boundingsphere_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/boundingvolumedebug_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/buffer_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/buffercapture_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/buffermanager_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/bufferutils_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/buffervisitor_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/calcboundingvolumejob_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/calcgeometrytrianglevolumes_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/cameralens_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/cameraselectornode_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/clearbuffers_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/commandexecuter_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/commandthread_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/computecommand_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/dispatchcompute_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/effect_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/entity_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/environmentlight_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/expandboundingvolumejob_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filtercompatibletechniquejob_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filterentitybycomponentjob_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filterkey_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filterlayerentityjob_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/framecleanupjob_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/framegraphnode_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/framegraphvisitor_p.h -%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/framepreparationjob_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/frameprofiler_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/frustumculling_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/frustumcullingjob_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/genericlambdajob_p.h @@ -453,18 +644,21 @@ %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/geometryrenderer_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/geometryrenderermanager_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/glbuffer_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/gltexture_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/gltexturemanager_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicscontext_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperes2_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperes3_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelpergl2_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelpergl3_2_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelpergl3_3_p.h -%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelpergl3_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelpergl4_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperinterface_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/handle_types_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/job_common_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/layer_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/layerfilternode_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/levelofdetail_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/light_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/lightgatherer_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/lightsource_p.h @@ -475,15 +669,17 @@ %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/managers_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/material_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/materialparametergathererjob_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/memorybarrier_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/nodefunctor_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/nodemanagers_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/nodraw_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/objectpicker_p.h -%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/objloader_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/offscreensurfacehelper_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/openglvertexarrayobject_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/parameter_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/parameterpack_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/pickboundingvolumejob_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/pickboundingvolumeutils_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/pickeventfilter_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/platformsurfacefilter_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qabstractcollisionqueryservice_p.h @@ -495,10 +691,10 @@ %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qaxisalignedboundingbox_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qblendequation_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qblendequationarguments_p.h -%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qboundingsphere_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qboundingvolume_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qboundingvolumeprovider_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qbuffer_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qbuffercapture_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qcamera_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qcameralens_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qcameraselector_p.h @@ -512,19 +708,26 @@ %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qdirectionallight_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qdispatchcompute_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qeffect_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qenvironmentlight_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qfilterkey_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qframegraphnode_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qframegraphnodecreatedchange_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qfrontface_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgeometry_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgeometryloaderfactory_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgeometryloaderinterface_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgeometryrenderer_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgraphicsapifilter_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgraphicsutils_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qitemmodelbuffer_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qlayer_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qlayerfilter_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qlevelofdetail_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qmaterial_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qmemorybarrier_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qmesh_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qobjectpicker_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qpaintedtextureimage_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qparameter_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qpickevent_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qpickingsettings_p.h @@ -534,8 +737,12 @@ %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qray3d_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qraycastingservice_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderaspect_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrendercapture_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderpass_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderpassfilter_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderplugin_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderpluginfactory_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderpluginfactoryif_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrendersettings_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderstate_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderstatecreatedchange_p.h @@ -544,9 +751,12 @@ %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrendertarget_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrendertargetoutput_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrendertargetselector_p.h -%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsceneiofactory_p.h -%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsceneiohandler_p.h -%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsceneioplugin_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsceneexporter_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsceneexportfactory_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsceneexportplugin_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsceneimporter_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsceneimportfactory_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsceneimportplugin_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsceneloader_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qscissortest_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderdata_p.h @@ -564,9 +774,9 @@ %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qtexture_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qtextureimage_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qtextureimagedata_p.h -%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/quniformvalue_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qurlhelper_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qviewport_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendercapture_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendercommand_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderconfiguration_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderer_p.h @@ -584,14 +794,19 @@ %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendertargetselectornode_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderthread_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderview_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewbuilder_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewbuilderjob_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewinitializerjob_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewjobutils_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/resourceaccessor_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/scene_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/scenemanager_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/sendbuffercapturejob_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/sendrendercapturejob_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shader_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shadercache_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shaderdata_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shaderparameterpack_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shadervariables_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/sortpolicy_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/sphere_p.h @@ -601,6 +816,7 @@ %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/stringtoint_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/technique_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/techniquefilternode_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/techniquemanager_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/texture_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/texturedatamanager_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/textureimage_p.h @@ -608,6 +824,11 @@ %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/triangleboundingvolume_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/trianglesextractor_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/trianglesvisitor_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/uniform_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/updatelevelofdetailjob_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/updatemeshtrianglelistjob_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/updateshaderdatatransformjob_p.h +%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/updatetreeenabledjob_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/updateworldboundingvolumejob_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/updateworldtransformjob_p.h %%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/viewportnode_p.h @@ -626,6 +847,7 @@ %%QT_INCDIR%%/Qt3DRender/QBlendEquation %%QT_INCDIR%%/Qt3DRender/QBlendEquationArguments %%QT_INCDIR%%/Qt3DRender/QBuffer +%%QT_INCDIR%%/Qt3DRender/QBufferCapture %%QT_INCDIR%%/Qt3DRender/QBufferDataGenerator %%QT_INCDIR%%/Qt3DRender/QBufferDataGeneratorPtr %%QT_INCDIR%%/Qt3DRender/QBufferPtr @@ -642,8 +864,12 @@ %%QT_INCDIR%%/Qt3DRender/QDispatchCompute %%QT_INCDIR%%/Qt3DRender/QDithering %%QT_INCDIR%%/Qt3DRender/QEffect +%%QT_INCDIR%%/Qt3DRender/QEnvironmentLight %%QT_INCDIR%%/Qt3DRender/QFilterKey %%QT_INCDIR%%/Qt3DRender/QFrameGraphNode +%%QT_INCDIR%%/Qt3DRender/QFrameGraphNodeCreatedChange +%%QT_INCDIR%%/Qt3DRender/QFrameGraphNodeCreatedChangeBase +%%QT_INCDIR%%/Qt3DRender/QFrameGraphNodeCreatedChangeBasePtr %%QT_INCDIR%%/Qt3DRender/QFrontFace %%QT_INCDIR%%/Qt3DRender/QFrustumCulling %%QT_INCDIR%%/Qt3DRender/QGeometry @@ -653,12 +879,17 @@ %%QT_INCDIR%%/Qt3DRender/QGraphicsApiFilter %%QT_INCDIR%%/Qt3DRender/QLayer %%QT_INCDIR%%/Qt3DRender/QLayerFilter +%%QT_INCDIR%%/Qt3DRender/QLevelOfDetail +%%QT_INCDIR%%/Qt3DRender/QLevelOfDetailBoundingSphere +%%QT_INCDIR%%/Qt3DRender/QLevelOfDetailSwitch %%QT_INCDIR%%/Qt3DRender/QMaterial +%%QT_INCDIR%%/Qt3DRender/QMemoryBarrier %%QT_INCDIR%%/Qt3DRender/QMesh %%QT_INCDIR%%/Qt3DRender/QMultiSampleAntiAliasing %%QT_INCDIR%%/Qt3DRender/QNoDepthMask %%QT_INCDIR%%/Qt3DRender/QNoDraw %%QT_INCDIR%%/Qt3DRender/QObjectPicker +%%QT_INCDIR%%/Qt3DRender/QPaintedTextureImage %%QT_INCDIR%%/Qt3DRender/QParameter %%QT_INCDIR%%/Qt3DRender/QPickEvent %%QT_INCDIR%%/Qt3DRender/QPickEventPtr @@ -668,6 +899,8 @@ %%QT_INCDIR%%/Qt3DRender/QPointSize %%QT_INCDIR%%/Qt3DRender/QPolygonOffset %%QT_INCDIR%%/Qt3DRender/QRenderAspect +%%QT_INCDIR%%/Qt3DRender/QRenderCapture +%%QT_INCDIR%%/Qt3DRender/QRenderCaptureReply %%QT_INCDIR%%/Qt3DRender/QRenderPass %%QT_INCDIR%%/Qt3DRender/QRenderPassFilter %%QT_INCDIR%%/Qt3DRender/QRenderSettings @@ -682,7 +915,6 @@ %%QT_INCDIR%%/Qt3DRender/QSeamlessCubemap %%QT_INCDIR%%/Qt3DRender/QShaderData %%QT_INCDIR%%/Qt3DRender/QShaderProgram -%%QT_INCDIR%%/Qt3DRender/QSortCriterion %%QT_INCDIR%%/Qt3DRender/QSortPolicy %%QT_INCDIR%%/Qt3DRender/QSpotLight %%QT_INCDIR%%/Qt3DRender/QStencilMask @@ -717,6 +949,7 @@ %%QT_INCDIR%%/Qt3DRender/qblendequation.h %%QT_INCDIR%%/Qt3DRender/qblendequationarguments.h %%QT_INCDIR%%/Qt3DRender/qbuffer.h +%%QT_INCDIR%%/Qt3DRender/qbuffercapture.h %%QT_INCDIR%%/Qt3DRender/qbufferdatagenerator.h %%QT_INCDIR%%/Qt3DRender/qcamera.h %%QT_INCDIR%%/Qt3DRender/qcameralens.h @@ -731,8 +964,10 @@ %%QT_INCDIR%%/Qt3DRender/qdispatchcompute.h %%QT_INCDIR%%/Qt3DRender/qdithering.h %%QT_INCDIR%%/Qt3DRender/qeffect.h +%%QT_INCDIR%%/Qt3DRender/qenvironmentlight.h %%QT_INCDIR%%/Qt3DRender/qfilterkey.h %%QT_INCDIR%%/Qt3DRender/qframegraphnode.h +%%QT_INCDIR%%/Qt3DRender/qframegraphnodecreatedchange.h %%QT_INCDIR%%/Qt3DRender/qfrontface.h %%QT_INCDIR%%/Qt3DRender/qfrustumculling.h %%QT_INCDIR%%/Qt3DRender/qgeometry.h @@ -741,12 +976,17 @@ %%QT_INCDIR%%/Qt3DRender/qgraphicsapifilter.h %%QT_INCDIR%%/Qt3DRender/qlayer.h %%QT_INCDIR%%/Qt3DRender/qlayerfilter.h +%%QT_INCDIR%%/Qt3DRender/qlevelofdetail.h +%%QT_INCDIR%%/Qt3DRender/qlevelofdetailboundingsphere.h +%%QT_INCDIR%%/Qt3DRender/qlevelofdetailswitch.h %%QT_INCDIR%%/Qt3DRender/qmaterial.h +%%QT_INCDIR%%/Qt3DRender/qmemorybarrier.h %%QT_INCDIR%%/Qt3DRender/qmesh.h %%QT_INCDIR%%/Qt3DRender/qmultisampleantialiasing.h %%QT_INCDIR%%/Qt3DRender/qnodepthmask.h %%QT_INCDIR%%/Qt3DRender/qnodraw.h %%QT_INCDIR%%/Qt3DRender/qobjectpicker.h +%%QT_INCDIR%%/Qt3DRender/qpaintedtextureimage.h %%QT_INCDIR%%/Qt3DRender/qparameter.h %%QT_INCDIR%%/Qt3DRender/qpickevent.h %%QT_INCDIR%%/Qt3DRender/qpickingsettings.h @@ -755,6 +995,7 @@ %%QT_INCDIR%%/Qt3DRender/qpointsize.h %%QT_INCDIR%%/Qt3DRender/qpolygonoffset.h %%QT_INCDIR%%/Qt3DRender/qrenderaspect.h +%%QT_INCDIR%%/Qt3DRender/qrendercapture.h %%QT_INCDIR%%/Qt3DRender/qrenderpass.h %%QT_INCDIR%%/Qt3DRender/qrenderpassfilter.h %%QT_INCDIR%%/Qt3DRender/qrendersettings.h @@ -769,7 +1010,6 @@ %%QT_INCDIR%%/Qt3DRender/qseamlesscubemap.h %%QT_INCDIR%%/Qt3DRender/qshaderdata.h %%QT_INCDIR%%/Qt3DRender/qshaderprogram.h -%%QT_INCDIR%%/Qt3DRender/qsortcriterion.h %%QT_INCDIR%%/Qt3DRender/qsortpolicy.h %%QT_INCDIR%%/Qt3DRender/qspotlight.h %%QT_INCDIR%%/Qt3DRender/qstencilmask.h @@ -789,6 +1029,8 @@ %%QT_INCDIR%%/Qt3DRender/qtextureimagedatagenerator.h %%QT_INCDIR%%/Qt3DRender/qtexturewrapmode.h %%QT_INCDIR%%/Qt3DRender/qviewport.h +%%QT_CMAKEDIR%%/Qt53DAnimation/Qt53DAnimationConfig.cmake +%%QT_CMAKEDIR%%/Qt53DAnimation/Qt53DAnimationConfigVersion.cmake %%QT_CMAKEDIR%%/Qt53DCore/Qt53DCoreConfig.cmake %%QT_CMAKEDIR%%/Qt53DCore/Qt53DCoreConfigVersion.cmake %%QT_CMAKEDIR%%/Qt53DExtras/Qt53DExtrasConfig.cmake @@ -799,17 +1041,31 @@ %%QT_CMAKEDIR%%/Qt53DLogic/Qt53DLogicConfigVersion.cmake %%QT_CMAKEDIR%%/Qt53DQuick/Qt53DQuickConfig.cmake %%QT_CMAKEDIR%%/Qt53DQuick/Qt53DQuickConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt53DQuickAnimation/Qt53DQuickAnimationConfig.cmake +%%QT_CMAKEDIR%%/Qt53DQuickAnimation/Qt53DQuickAnimationConfigVersion.cmake %%QT_CMAKEDIR%%/Qt53DQuickExtras/Qt53DQuickExtrasConfig.cmake %%QT_CMAKEDIR%%/Qt53DQuickExtras/Qt53DQuickExtrasConfigVersion.cmake %%QT_CMAKEDIR%%/Qt53DQuickInput/Qt53DQuickInputConfig.cmake %%QT_CMAKEDIR%%/Qt53DQuickInput/Qt53DQuickInputConfigVersion.cmake %%QT_CMAKEDIR%%/Qt53DQuickRender/Qt53DQuickRenderConfig.cmake %%QT_CMAKEDIR%%/Qt53DQuickRender/Qt53DQuickRenderConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt53DQuickScene2D/Qt53DQuickScene2DConfig.cmake +%%QT_CMAKEDIR%%/Qt53DQuickScene2D/Qt53DQuickScene2DConfigVersion.cmake %%QT_CMAKEDIR%%/Qt53DRender/Qt53DRenderConfig.cmake %%QT_CMAKEDIR%%/Qt53DRender/Qt53DRenderConfigVersion.cmake -%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_AssimpSceneIOPlugin.cmake -%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFSceneIOPlugin.cmake +%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_AssimpSceneImportPlugin.cmake +%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_DefaultGeometryLoaderPlugin.cmake +%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFGeometryLoaderPlugin.cmake +%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFSceneExportPlugin.cmake +%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFSceneImportPlugin.cmake +%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_Scene2DPlugin.cmake %%QT_BINDIR%%/qgltf +%%QT_LIBDIR%%/libQt53DAnimation.prl +%%QT_LIBDIR%%/libQt53DAnimation.so +%%QT_LIBDIR%%/libQt53DAnimation.so.5 +%%QT_LIBDIR%%/libQt53DAnimation.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt53DAnimation.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt53DAnimation.so.%%FULLVER%%.debug %%QT_LIBDIR%%/libQt53DCore.prl %%QT_LIBDIR%%/libQt53DCore.so %%QT_LIBDIR%%/libQt53DCore.so.5 @@ -840,6 +1096,12 @@ %%QT_LIBDIR%%/libQt53DQuick.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt53DQuick.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt53DQuick.so.%%FULLVER%%.debug +%%QT_LIBDIR%%/libQt53DQuickAnimation.prl +%%QT_LIBDIR%%/libQt53DQuickAnimation.so +%%QT_LIBDIR%%/libQt53DQuickAnimation.so.5 +%%QT_LIBDIR%%/libQt53DQuickAnimation.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt53DQuickAnimation.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt53DQuickAnimation.so.%%FULLVER%%.debug %%QT_LIBDIR%%/libQt53DQuickExtras.prl %%QT_LIBDIR%%/libQt53DQuickExtras.so %%QT_LIBDIR%%/libQt53DQuickExtras.so.5 @@ -858,12 +1120,20 @@ %%QT_LIBDIR%%/libQt53DQuickRender.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt53DQuickRender.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt53DQuickRender.so.%%FULLVER%%.debug +%%QT_LIBDIR%%/libQt53DQuickScene2D.prl +%%QT_LIBDIR%%/libQt53DQuickScene2D.so +%%QT_LIBDIR%%/libQt53DQuickScene2D.so.5 +%%QT_LIBDIR%%/libQt53DQuickScene2D.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt53DQuickScene2D.so.%%FULLVER%% +%%DEBUG%%%%QT_LIBDIR%%/libQt53DQuickScene2D.so.%%FULLVER%%.debug %%QT_LIBDIR%%/libQt53DRender.prl %%QT_LIBDIR%%/libQt53DRender.so %%QT_LIBDIR%%/libQt53DRender.so.5 %%QT_LIBDIR%%/libQt53DRender.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt53DRender.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt53DRender.so.%%FULLVER%%.debug +%%QT_MKSPECDIR%%/modules/qt_lib_3danimation.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3danimation_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_3dcore.pri %%QT_MKSPECDIR%%/modules/qt_lib_3dcore_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_3dextras.pri @@ -874,18 +1144,34 @@ %%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_3dquickanimation.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3dquickanimation_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_3dquickextras.pri %%QT_MKSPECDIR%%/modules/qt_lib_3dquickextras_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_3dquickinput.pri %%QT_MKSPECDIR%%/modules/qt_lib_3dquickinput_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_3dquickrender.pri %%QT_MKSPECDIR%%/modules/qt_lib_3dquickrender_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3dquickscene2d.pri +%%QT_MKSPECDIR%%/modules/qt_lib_3dquickscene2d_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_3drender.pri %%QT_MKSPECDIR%%/modules/qt_lib_3drender_private.pri -%%QT_PLUGINDIR%%/sceneparsers/libassimpsceneio.so -%%DEBUG%%%%QT_PLUGINDIR%%/sceneparsers/libassimpsceneio.so.debug -%%QT_PLUGINDIR%%/sceneparsers/libgltfsceneio.so -%%DEBUG%%%%QT_PLUGINDIR%%/sceneparsers/libgltfsceneio.so.debug +%%QT_PLUGINDIR%%/geometryloaders/libdefaultgeometryloader.so +%%DEBUG%%%%QT_PLUGINDIR%%/geometryloaders/libdefaultgeometryloader.so.debug +%%QT_PLUGINDIR%%/geometryloaders/libgltfgeometryloader.so +%%DEBUG%%%%QT_PLUGINDIR%%/geometryloaders/libgltfgeometryloader.so.debug +%%QT_PLUGINDIR%%/renderplugins/libscene2d.so +%%DEBUG%%%%QT_PLUGINDIR%%/renderplugins/libscene2d.so.debug +%%QT_PLUGINDIR%%/sceneparsers/libassimpsceneimport.so +%%DEBUG%%%%QT_PLUGINDIR%%/sceneparsers/libassimpsceneimport.so.debug +%%QT_PLUGINDIR%%/sceneparsers/libgltfsceneexport.so +%%DEBUG%%%%QT_PLUGINDIR%%/sceneparsers/libgltfsceneexport.so.debug +%%QT_PLUGINDIR%%/sceneparsers/libgltfsceneimport.so +%%DEBUG%%%%QT_PLUGINDIR%%/sceneparsers/libgltfsceneimport.so.debug +%%QT_QMLDIR%%/Qt3D/Animation/libquick3danimationplugin.so +%%DEBUG%%%%QT_QMLDIR%%/Qt3D/Animation/libquick3danimationplugin.so.debug +%%QT_QMLDIR%%/Qt3D/Animation/plugins.qmltypes +%%QT_QMLDIR%%/Qt3D/Animation/qmldir %%QT_QMLDIR%%/Qt3D/Core/libquick3dcoreplugin.so %%DEBUG%%%%QT_QMLDIR%%/Qt3D/Core/libquick3dcoreplugin.so.debug %%QT_QMLDIR%%/Qt3D/Core/plugins.qmltypes @@ -906,16 +1192,23 @@ %%DEBUG%%%%QT_QMLDIR%%/Qt3D/Render/libquick3drenderplugin.so.debug %%QT_QMLDIR%%/Qt3D/Render/plugins.qmltypes %%QT_QMLDIR%%/Qt3D/Render/qmldir +%%QT_QMLDIR%%/QtQuick/Scene2D/libqtquickscene2dplugin.so +%%DEBUG%%%%QT_QMLDIR%%/QtQuick/Scene2D/libqtquickscene2dplugin.so.debug +%%QT_QMLDIR%%/QtQuick/Scene2D/plugins.qmltypes +%%QT_QMLDIR%%/QtQuick/Scene2D/qmldir %%QT_QMLDIR%%/QtQuick/Scene3D/libqtquickscene3dplugin.so %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Scene3D/libqtquickscene3dplugin.so.debug %%QT_QMLDIR%%/QtQuick/Scene3D/plugins.qmltypes %%QT_QMLDIR%%/QtQuick/Scene3D/qmldir +libdata/pkgconfig/Qt53DAnimation.pc libdata/pkgconfig/Qt53DCore.pc libdata/pkgconfig/Qt53DExtras.pc libdata/pkgconfig/Qt53DInput.pc libdata/pkgconfig/Qt53DLogic.pc libdata/pkgconfig/Qt53DQuick.pc +libdata/pkgconfig/Qt53DQuickAnimation.pc libdata/pkgconfig/Qt53DQuickExtras.pc libdata/pkgconfig/Qt53DQuickInput.pc libdata/pkgconfig/Qt53DQuickRender.pc +libdata/pkgconfig/Qt53DQuickScene2D.pc libdata/pkgconfig/Qt53DRender.pc diff --git a/graphics/qt5-graphicaleffects/pkg-plist b/graphics/qt5-graphicaleffects/pkg-plist index f6fbf0cd3282..ab60eaab15df 100644 --- a/graphics/qt5-graphicaleffects/pkg-plist +++ b/graphics/qt5-graphicaleffects/pkg-plist @@ -1,38 +1,72 @@ %%QT_QMLDIR%%/QtGraphicalEffects/Blend.qml +%%QT_QMLDIR%%/QtGraphicalEffects/Blend.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/BrightnessContrast.qml +%%QT_QMLDIR%%/QtGraphicalEffects/BrightnessContrast.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/ColorOverlay.qml +%%QT_QMLDIR%%/QtGraphicalEffects/ColorOverlay.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/Colorize.qml +%%QT_QMLDIR%%/QtGraphicalEffects/Colorize.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/ConicalGradient.qml +%%QT_QMLDIR%%/QtGraphicalEffects/ConicalGradient.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/Desaturate.qml +%%QT_QMLDIR%%/QtGraphicalEffects/Desaturate.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/DirectionalBlur.qml +%%QT_QMLDIR%%/QtGraphicalEffects/DirectionalBlur.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/Displace.qml +%%QT_QMLDIR%%/QtGraphicalEffects/Displace.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/DropShadow.qml +%%QT_QMLDIR%%/QtGraphicalEffects/DropShadow.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/FastBlur.qml +%%QT_QMLDIR%%/QtGraphicalEffects/FastBlur.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/GammaAdjust.qml +%%QT_QMLDIR%%/QtGraphicalEffects/GammaAdjust.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/GaussianBlur.qml +%%QT_QMLDIR%%/QtGraphicalEffects/GaussianBlur.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/Glow.qml +%%QT_QMLDIR%%/QtGraphicalEffects/Glow.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/HueSaturation.qml +%%QT_QMLDIR%%/QtGraphicalEffects/HueSaturation.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/InnerShadow.qml +%%QT_QMLDIR%%/QtGraphicalEffects/InnerShadow.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/LevelAdjust.qml +%%QT_QMLDIR%%/QtGraphicalEffects/LevelAdjust.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/LinearGradient.qml +%%QT_QMLDIR%%/QtGraphicalEffects/LinearGradient.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/MaskedBlur.qml +%%QT_QMLDIR%%/QtGraphicalEffects/MaskedBlur.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/OpacityMask.qml +%%QT_QMLDIR%%/QtGraphicalEffects/OpacityMask.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/RadialBlur.qml +%%QT_QMLDIR%%/QtGraphicalEffects/RadialBlur.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/RadialGradient.qml +%%QT_QMLDIR%%/QtGraphicalEffects/RadialGradient.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/RectangularGlow.qml +%%QT_QMLDIR%%/QtGraphicalEffects/RectangularGlow.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/RecursiveBlur.qml +%%QT_QMLDIR%%/QtGraphicalEffects/RecursiveBlur.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/ThresholdMask.qml +%%QT_QMLDIR%%/QtGraphicalEffects/ThresholdMask.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/ZoomBlur.qml +%%QT_QMLDIR%%/QtGraphicalEffects/ZoomBlur.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/libqtgraphicaleffectsplugin.so %%DEBUG%%%%QT_QMLDIR%%/QtGraphicalEffects/libqtgraphicaleffectsplugin.so.debug +%%QT_QMLDIR%%/QtGraphicalEffects/plugins.qmltypes %%QT_QMLDIR%%/QtGraphicalEffects/private/DropShadowBase.qml +%%QT_QMLDIR%%/QtGraphicalEffects/private/DropShadowBase.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/private/FastGlow.qml +%%QT_QMLDIR%%/QtGraphicalEffects/private/FastGlow.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/private/FastInnerShadow.qml +%%QT_QMLDIR%%/QtGraphicalEffects/private/FastInnerShadow.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/private/FastMaskedBlur.qml +%%QT_QMLDIR%%/QtGraphicalEffects/private/FastMaskedBlur.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/private/GaussianDirectionalBlur.qml +%%QT_QMLDIR%%/QtGraphicalEffects/private/GaussianDirectionalBlur.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/private/GaussianGlow.qml +%%QT_QMLDIR%%/QtGraphicalEffects/private/GaussianGlow.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/private/GaussianInnerShadow.qml +%%QT_QMLDIR%%/QtGraphicalEffects/private/GaussianInnerShadow.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/private/GaussianMaskedBlur.qml +%%QT_QMLDIR%%/QtGraphicalEffects/private/GaussianMaskedBlur.qmlc %%QT_QMLDIR%%/QtGraphicalEffects/private/libqtgraphicaleffectsprivate.so %%DEBUG%%%%QT_QMLDIR%%/QtGraphicalEffects/private/libqtgraphicaleffectsprivate.so.debug %%QT_QMLDIR%%/QtGraphicalEffects/private/qmldir diff --git a/graphics/qt5-imageformats/Makefile b/graphics/qt5-imageformats/Makefile index cc70ac9bf153..6cff4e0b199b 100644 --- a/graphics/qt5-imageformats/Makefile +++ b/graphics/qt5-imageformats/Makefile @@ -2,7 +2,6 @@ PORTNAME= imageformats DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-imageformats/pkg-plist b/graphics/qt5-imageformats/pkg-plist index 623005444c27..66c9ba45da14 100644 --- a/graphics/qt5-imageformats/pkg-plist +++ b/graphics/qt5-imageformats/pkg-plist @@ -1,4 +1,3 @@ -%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QDDSPlugin.cmake %%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QICNSPlugin.cmake %%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QJp2Plugin.cmake %%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QMngPlugin.cmake @@ -6,8 +5,6 @@ %%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QTiffPlugin.cmake %%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QWbmpPlugin.cmake %%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QWebpPlugin.cmake -%%QT_PLUGINDIR%%/imageformats/libqdds.so -%%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqdds.so.debug %%QT_PLUGINDIR%%/imageformats/libqicns.so %%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqicns.so.debug %%QT_PLUGINDIR%%/imageformats/libqjp2.so diff --git a/graphics/qt5-opengl/Makefile b/graphics/qt5-opengl/Makefile index f9f2873a7b12..1ae328cc5b50 100644 --- a/graphics/qt5-opengl/Makefile +++ b/graphics/qt5-opengl/Makefile @@ -2,7 +2,6 @@ PORTNAME= opengl DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- @@ -21,4 +20,10 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} QT_DEFINES= OPENGL QT_CONFIG= opengl +post-configure: +.for d in src/opengl + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} +.endfor + .include diff --git a/graphics/qt5-opengl/pkg-plist b/graphics/qt5-opengl/pkg-plist index 27e16083a3c9..c49677e75a09 100644 --- a/graphics/qt5-opengl/pkg-plist +++ b/graphics/qt5-opengl/pkg-plist @@ -7,7 +7,6 @@ %%QT_INCDIR%%/QtOpenGL/%%FULLVER%%/QtOpenGL/private/qglgradientcache_p.h %%QT_INCDIR%%/QtOpenGL/%%FULLVER%%/QtOpenGL/private/qglpaintdevice_p.h %%QT_INCDIR%%/QtOpenGL/%%FULLVER%%/QtOpenGL/private/qglpixelbuffer_p.h -%%QT_INCDIR%%/QtOpenGL/%%FULLVER%%/QtOpenGL/private/qglshadercache_meego_p.h %%QT_INCDIR%%/QtOpenGL/%%FULLVER%%/QtOpenGL/private/qglshadercache_p.h %%QT_INCDIR%%/QtOpenGL/%%FULLVER%%/QtOpenGL/private/qgraphicsshadereffect_p.h %%QT_INCDIR%%/QtOpenGL/%%FULLVER%%/QtOpenGL/private/qpaintengineex_opengl2_p.h diff --git a/graphics/qt5-pixeltool/files/patch-src__src.pro b/graphics/qt5-pixeltool/files/patch-src__src.pro index 97ee904830ab..6aa1c300bab0 100644 --- a/graphics/qt5-pixeltool/files/patch-src__src.pro +++ b/graphics/qt5-pixeltool/files/patch-src__src.pro @@ -1,18 +1,17 @@ Only enter the directories we want to build, otherwise we might fail due to missing dependencies. ---- src/src.pro.orig 2016-02-04 10:42:47 UTC +--- src/src.pro.orig 2016-07-23 14:50:14 UTC +++ src/src.pro -@@ -1,38 +1,3 @@ +@@ -1,52 +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 @@ -21,8 +20,13 @@ missing dependencies. - -SUBDIRS += linguist \ - qdoc \ -- qtplugininfo --if(!android|android_app):!ios: SUBDIRS += qtpaths +- qtattributionsscanner +- +-qtConfig(library) { +- !android|android_app: SUBDIRS += qtplugininfo +-} +- +-if(!android|android_app):!uikit: SUBDIRS += qtpaths - -mac { - SUBDIRS += macdeployqt @@ -36,10 +40,20 @@ missing dependencies. - -win32|winrt:SUBDIRS += windeployqt -winrt:SUBDIRS += winrtrunner --qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag +-qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag - -qtNomakeTools( \ - pixeltool \ - macdeployqt \ -) +- +-# This is necessary to avoid a race condition between toolchain.prf +-# invocations in a module-by-module cross-build. +-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) { +- androiddeployqt.depends += qtattributionsscanner +- qdoc.depends += qtattributionsscanner +- windeployqt.depends += qtattributionsscanner +- winrtrunner.depends += qtattributionsscanner +- linguist.depends += qtattributionsscanner +-} +SUBDIRS = pixeltool diff --git a/graphics/qt5-svg/pkg-plist b/graphics/qt5-svg/pkg-plist index c8a3dbd91b6e..ab5890bd4211 100644 --- a/graphics/qt5-svg/pkg-plist +++ b/graphics/qt5-svg/pkg-plist @@ -1,5 +1,4 @@ %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgfont_p.h -%%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgfunctions_wince_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvggraphics_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvghandler_p.h %%QT_INCDIR%%/QtSvg/%%FULLVER%%/QtSvg/private/qsvgnode_p.h diff --git a/graphics/qt5-wayland/Makefile b/graphics/qt5-wayland/Makefile index 3570d0882b47..0ca209457035 100644 --- a/graphics/qt5-wayland/Makefile +++ b/graphics/qt5-wayland/Makefile @@ -11,9 +11,10 @@ COMMENT= Qt5 wrapper for Wayland LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libwayland-client.so:graphics/wayland \ + libwayland-egl.so:graphics/mesa-libs \ libxkbcommon.so:x11/libxkbcommon -USES= pkgconfig qmake:outsource +USES= pkgconfig qmake:norecursive USE_GL= egl gl USE_GNOME= glib20 USE_QT5= core dbus gui qml quick \ diff --git a/graphics/qt5-wayland/files/patch-qtwayland.pro b/graphics/qt5-wayland/files/patch-qtwayland.pro index 5c3506061cb4..e321fa2fd586 100644 --- a/graphics/qt5-wayland/files/patch-qtwayland.pro +++ b/graphics/qt5-wayland/files/patch-qtwayland.pro @@ -1,9 +1,8 @@ ---- qtwayland.pro.orig 2016-10-28 06:24:31 UTC +--- qtwayland.pro.orig 2017-06-23 10:50:50 UTC +++ qtwayland.pro -@@ -1,4 +1,5 @@ +@@ -1,3 +1,4 @@ -requires(linux:!android) +requires(!android) +requires(linux|freebsd) - - load(configure) - qtCompileTest(wayland) + requires(qtHaveModule(gui)) + load(qt_parts) diff --git a/graphics/qt5-wayland/pkg-plist b/graphics/qt5-wayland/pkg-plist index 53e326200f56..47f4659aaca5 100644 --- a/graphics/qt5-wayland/pkg-plist +++ b/graphics/qt5-wayland/pkg-plist @@ -1,11 +1,14 @@ +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qtwaylandclient-config_p.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qtwaylandclientglobal_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-hardware-integration.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-qt-windowmanager.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-qtkey-extension.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-server-buffer-extension.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-surface-extension.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v2.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-touch-extension.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-wayland.h -%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-windowmanager.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-xdg-shell-unstable-v6.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-xdg-shell.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandabstractdecoration_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandbuffer_p.h @@ -53,53 +56,69 @@ %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandxdgpopup_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandxdgshell_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandxdgshellintegration_p.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandxdgshellv6_p.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandxdgshellv6integration_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandxdgsurface_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-hardware-integration-client-protocol.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-qt-windowmanager-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-qtkey-extension-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-server-buffer-extension-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-surface-extension-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v2-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-touch-extension-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-wayland-client-protocol.h -%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-windowmanager-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-xdg-shell-client-protocol.h +%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-xdg-shell-unstable-v6-client-protocol.h %%QT_INCDIR%%/QtWaylandClient/QWaylandClientExtension %%QT_INCDIR%%/QtWaylandClient/QWaylandClientExtensionTemplate %%QT_INCDIR%%/QtWaylandClient/QtWaylandClient %%QT_INCDIR%%/QtWaylandClient/QtWaylandClientDepends %%QT_INCDIR%%/QtWaylandClient/QtWaylandClientVersion +%%QT_INCDIR%%/QtWaylandClient/qtwaylandclient-config.h +%%QT_INCDIR%%/QtWaylandClient/qtwaylandclientglobal.h %%QT_INCDIR%%/QtWaylandClient/qtwaylandclientversion.h %%QT_INCDIR%%/QtWaylandClient/qwaylandclientexport.h %%QT_INCDIR%%/QtWaylandClient/qwaylandclientextension.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qtwaylandcompositor-config_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qtwaylandcompositorglobal_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-hardware-integration.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-ivi-application.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-qt-windowmanager.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-qtkey-extension.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-server-buffer-extension.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-surface-extension.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-text-input-unstable-v2.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-touch-extension.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-wayland.h -%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-windowmanager.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-xdg-shell.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandcompositor_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandcompositorextension_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylanddestroylistener_p.h -%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandinput_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandinputmethodcontrol_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandiviapplication_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandivisurface_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandivisurfaceintegration_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandkeyboard_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandkeymap_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandoutput_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandoutputmode_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandpointer_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandqtwindowmanager_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandquickitem_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandquickshellsurfaceitem_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandseat_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandshell_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandsurface_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandtextinput_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandtextinputmanager_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandtouch_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandview_p.h -%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandwindowmanagerextension_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandwlshell_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandwlshellintegration_p.h -%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgshell_p.h -%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgshellintegration_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgshellv5_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgshellv5integration_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwlbuffermanager_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwlclientbuffer_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwlclientbufferintegration_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwlclientbufferintegrationfactory_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwlclientbufferintegrationplugin_p.h @@ -115,15 +134,15 @@ %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwlserverbufferintegration_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwlserverbufferintegrationfactory_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwlserverbufferintegrationplugin_p.h -%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwlsurfacebuffer_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-hardware-integration-server-protocol.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-ivi-application-server-protocol.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-qt-windowmanager-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-qtkey-extension-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-server-buffer-extension-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-surface-extension-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-text-input-unstable-v2-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-touch-extension-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-wayland-server-protocol.h -%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-windowmanager-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-xdg-shell-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/QWaylandBufferRef %%QT_INCDIR%%/QtWaylandCompositor/QWaylandClient @@ -132,13 +151,16 @@ %%QT_INCDIR%%/QtWaylandCompositor/QWaylandCompositorExtensionTemplate %%QT_INCDIR%%/QtWaylandCompositor/QWaylandDestroyListener %%QT_INCDIR%%/QtWaylandCompositor/QWaylandDrag -%%QT_INCDIR%%/QtWaylandCompositor/QWaylandInputDevice %%QT_INCDIR%%/QtWaylandCompositor/QWaylandInputMethodControl +%%QT_INCDIR%%/QtWaylandCompositor/QWaylandIviApplication +%%QT_INCDIR%%/QtWaylandCompositor/QWaylandIviSurface %%QT_INCDIR%%/QtWaylandCompositor/QWaylandKeyboard %%QT_INCDIR%%/QtWaylandCompositor/QWaylandKeymap %%QT_INCDIR%%/QtWaylandCompositor/QWaylandObject %%QT_INCDIR%%/QtWaylandCompositor/QWaylandOutput +%%QT_INCDIR%%/QtWaylandCompositor/QWaylandOutputMode %%QT_INCDIR%%/QtWaylandCompositor/QWaylandPointer +%%QT_INCDIR%%/QtWaylandCompositor/QWaylandQtWindowManager %%QT_INCDIR%%/QtWaylandCompositor/QWaylandQuickCompositor %%QT_INCDIR%%/QtWaylandCompositor/QWaylandQuickExtension %%QT_INCDIR%%/QtWaylandCompositor/QWaylandQuickItem @@ -146,8 +168,11 @@ %%QT_INCDIR%%/QtWaylandCompositor/QWaylandQuickShellSurfaceItem %%QT_INCDIR%%/QtWaylandCompositor/QWaylandQuickSurface %%QT_INCDIR%%/QtWaylandCompositor/QWaylandResource +%%QT_INCDIR%%/QtWaylandCompositor/QWaylandSeat +%%QT_INCDIR%%/QtWaylandCompositor/QWaylandShell %%QT_INCDIR%%/QtWaylandCompositor/QWaylandShellSurface %%QT_INCDIR%%/QtWaylandCompositor/QWaylandShellSurfaceTemplate +%%QT_INCDIR%%/QtWaylandCompositor/QWaylandShellTemplate %%QT_INCDIR%%/QtWaylandCompositor/QWaylandSurface %%QT_INCDIR%%/QtWaylandCompositor/QWaylandSurfaceGrabber %%QT_INCDIR%%/QtWaylandCompositor/QWaylandSurfaceRole @@ -155,15 +180,16 @@ %%QT_INCDIR%%/QtWaylandCompositor/QWaylandTextInputManager %%QT_INCDIR%%/QtWaylandCompositor/QWaylandTouch %%QT_INCDIR%%/QtWaylandCompositor/QWaylandView -%%QT_INCDIR%%/QtWaylandCompositor/QWaylandWindowManagerExtension %%QT_INCDIR%%/QtWaylandCompositor/QWaylandWlShell %%QT_INCDIR%%/QtWaylandCompositor/QWaylandWlShellSurface -%%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgPopup -%%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgShell -%%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgSurface +%%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgPopupV5 +%%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgShellV5 +%%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgSurfaceV5 %%QT_INCDIR%%/QtWaylandCompositor/QtWaylandCompositor %%QT_INCDIR%%/QtWaylandCompositor/QtWaylandCompositorDepends %%QT_INCDIR%%/QtWaylandCompositor/QtWaylandCompositorVersion +%%QT_INCDIR%%/QtWaylandCompositor/qtwaylandcompositor-config.h +%%QT_INCDIR%%/QtWaylandCompositor/qtwaylandcompositorglobal.h %%QT_INCDIR%%/QtWaylandCompositor/qtwaylandcompositorversion.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandbufferref.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandclient.h @@ -172,11 +198,15 @@ %%QT_INCDIR%%/QtWaylandCompositor/qwaylanddestroylistener.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylanddrag.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandexport.h -%%QT_INCDIR%%/QtWaylandCompositor/qwaylandinput.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandinputmethodcontrol.h +%%QT_INCDIR%%/QtWaylandCompositor/qwaylandiviapplication.h +%%QT_INCDIR%%/QtWaylandCompositor/qwaylandivisurface.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandkeyboard.h +%%QT_INCDIR%%/QtWaylandCompositor/qwaylandkeymap.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandoutput.h +%%QT_INCDIR%%/QtWaylandCompositor/qwaylandoutputmode.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandpointer.h +%%QT_INCDIR%%/QtWaylandCompositor/qwaylandqtwindowmanager.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandquickcompositor.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandquickextension.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandquickitem.h @@ -184,6 +214,8 @@ %%QT_INCDIR%%/QtWaylandCompositor/qwaylandquickshellsurfaceitem.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandquicksurface.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandresource.h +%%QT_INCDIR%%/QtWaylandCompositor/qwaylandseat.h +%%QT_INCDIR%%/QtWaylandCompositor/qwaylandshell.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandshellsurface.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandsurface.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandsurfacegrabber.h @@ -191,16 +223,26 @@ %%QT_INCDIR%%/QtWaylandCompositor/qwaylandtextinputmanager.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandtouch.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandview.h -%%QT_INCDIR%%/QtWaylandCompositor/qwaylandwindowmanagerextension.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandwlshell.h -%%QT_INCDIR%%/QtWaylandCompositor/qwaylandxdgshell.h -%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_.cmake +%%QT_INCDIR%%/QtWaylandCompositor/qwaylandxdgshellv5.h +%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QWaylandEglPlatformIntegrationPlugin.cmake +%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QWaylandIntegrationPlugin.cmake +%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QWaylandXCompositeEglPlatformIntegrationPlugin.cmake +%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QWaylandXCompositeGlxPlatformIntegrationPlugin.cmake %%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClientConfig.cmake %%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClientConfigVersion.cmake -%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_.cmake +%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_DrmEglServerBufferPlugin.cmake +%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandBradientDecorationPlugin.cmake +%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandEglClientBufferPlugin.cmake +%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandIviShellIntegrationPlugin.cmake +%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandXCompositeEglClientBufferPlugin.cmake +%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandXCompositeGlxClientBufferPlugin.cmake %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositorConfig.cmake %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositorConfigVersion.cmake -%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_.cmake +%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_DrmEglServerBufferIntegrationPlugin.cmake +%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandEglClientBufferIntegrationPlugin.cmake +%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandXCompositeEglClientBufferIntegrationPlugin.cmake +%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandXCompositeGlxClientBufferIntegrationPlugin.cmake %%QT_BINDIR%%/qtwaylandscanner %%QT_LIBDIR%%/libQt5WaylandClient.prl %%QT_LIBDIR%%/libQt5WaylandClient.so @@ -218,26 +260,21 @@ %%QT_MKSPECDIR%%/modules/qt_lib_waylandclient_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_waylandcompositor.pri %%QT_MKSPECDIR%%/modules/qt_lib_waylandcompositor_private.pri +%%QT_PLUGINDIR%%/platforms/libqwayland-egl.so %%QT_PLUGINDIR%%/platforms/libqwayland-generic.so -%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqwayland-generic.so.debug +%%QT_PLUGINDIR%%/platforms/libqwayland-xcomposite-egl.so %%QT_PLUGINDIR%%/platforms/libqwayland-xcomposite-glx.so -%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqwayland-xcomposite-glx.so.debug %%QT_PLUGINDIR%%/wayland-decoration-client/libbradient.so -%%DEBUG%%%%QT_PLUGINDIR%%/wayland-decoration-client/libbradient.so.debug %%QT_PLUGINDIR%%/wayland-graphics-integration-client/libdrm-egl-server.so -%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libdrm-egl-server.so.debug +%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libwayland-egl.so +%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-egl.so %%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so -%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so.debug %%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdrm-egl-server.so -%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdrm-egl-server.so.debug +%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libwayland-egl.so +%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-egl.so %%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-glx.so -%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-glx.so.debug %%QT_PLUGINDIR%%/wayland-shell-integration/libivi-shell.so -%%DEBUG%%%%QT_PLUGINDIR%%/wayland-shell-integration/libivi-shell.so.debug -%%DEBUG%%%%QT_QMLDIR%%/QtWayland/Compositor/WaylandCursorItem.qml -%%DEBUG%%%%QT_QMLDIR%%/QtWayland/Compositor/WaylandOutputWindow.qml %%QT_QMLDIR%%/QtWayland/Compositor/libqwaylandcompositorplugin.so -%%DEBUG%%%%QT_QMLDIR%%/QtWayland/Compositor/libqwaylandcompositorplugin.so.debug %%QT_QMLDIR%%/QtWayland/Compositor/plugins.qmltypes %%QT_QMLDIR%%/QtWayland/Compositor/qmldir libdata/pkgconfig/Qt5WaylandClient.pc diff --git a/lang/qt5-qml/Makefile b/lang/qt5-qml/Makefile index e51f7fcb9d5e..93fef9eb3199 100644 --- a/lang/qt5-qml/Makefile +++ b/lang/qt5-qml/Makefile @@ -2,7 +2,6 @@ PORTNAME= qml DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= lang PKGNAMEPREFIX= qt5- diff --git a/lang/qt5-qml/files/patch-configure.json b/lang/qt5-qml/files/patch-configure.json new file mode 100644 index 000000000000..a67ac9369f21 --- /dev/null +++ b/lang/qt5-qml/files/patch-configure.json @@ -0,0 +1,12 @@ +Do not enter src/quick for checks; we do not build this directory in this port +and it expects qt5-gui to be installed. +--- configure.json ++++ configure.json +@@ -1,6 +1,5 @@ + { + "subconfigs": [ +- "src/qml", +- "src/quick" ++ "src/qml" + ] + } diff --git a/lang/qt5-qml/files/patch-src__src.pro b/lang/qt5-qml/files/patch-src__src.pro index e95599ff1383..b40824c37b4a 100644 --- a/lang/qt5-qml/files/patch-src__src.pro +++ b/lang/qt5-qml/files/patch-src__src.pro @@ -1,17 +1,22 @@ Only enter the directories we want to build, otherwise we might fail due to missing dependencies. ---- src/src.pro.orig 2016-04-01 14:48:16 UTC +--- src/src.pro +++ src/src.pro -@@ -3,20 +3,7 @@ CONFIG += ordered +@@ -1,23 +1,8 @@ + TEMPLATE = subdirs + CONFIG += ordered +-include($$OUT_PWD/quick/qtquick-config.pri) + QT_FOR_CONFIG += network quick-private SUBDIRS += \ qml --qtHaveModule(gui):contains(QT_CONFIG, opengl(es1|es2)?) { +-qtHaveModule(gui):qtConfig(animation) { - SUBDIRS += \ - quick \ -- qmltest \ -- particles +- qmltest - +- qtConfig(quick-particles): \ +- SUBDIRS += particles - qtHaveModule(widgets): SUBDIRS += quickwidgets -} - @@ -19,7 +24,5 @@ missing dependencies. - plugins \ - imports \ qmldevtools - --!contains(QT_CONFIG, no-qml-debug): SUBDIRS += qmldebug - - qmldevtools.CONFIG = host_build +-qtConfig(localserver):!contains(QT_CONFIG, no-qml-debug): SUBDIRS += qmldebug diff --git a/lang/qt5-qml/pkg-plist b/lang/qt5-qml/pkg-plist index 0c5aa6fcc1b8..46789d447b91 100644 --- a/lang/qt5-qml/pkg-plist +++ b/lang/qt5-qml/pkg-plist @@ -3,7 +3,7 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qanimationjobutil_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qbitfield_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qcontinuinganimationgroupjob_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qdeletewatcher_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qdeferredcleanup_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qfieldlist_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qfinitestack_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qflagpointer_p.h @@ -16,10 +16,8 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qparallelanimationgroupjob_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qpauseanimationjob_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qpodvector_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qpointervaluepair_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlabstractbinding_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlabstractprofileradapter_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlaccessors_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmladaptormodel_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlapplicationengine_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbind_p.h @@ -29,12 +27,10 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbuiltinfunctions_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlchangeset_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcleanup_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcompiler_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcomponent_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcomponentattached_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlconnections_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcontext_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcontextwrapper_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcustomparser_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldata_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugconnector_p.h @@ -43,6 +39,7 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugservicefactory_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugserviceinterfaces_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugstatesdelegate_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldelayedcallqueue_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldelegatemodel_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldelegatemodel_p_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldirparser_p.h @@ -76,6 +73,7 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistmodelworkeragent_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllistwrapper_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllocale_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlloggingcategory_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmemoryprofiler_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmetatype_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmodelindexvaluetype_p.h @@ -90,6 +88,9 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlprofilerdefinitions_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlproperty_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertycache_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertycachecreator_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyindex_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyvalidator_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyvalueinterceptor_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlproxymetaobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlrefcount_p.h @@ -113,6 +114,7 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qrecursionwatcher_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qrecyclepool_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qsequentialanimationgroupjob_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qtqml-config_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qtqmlglobal_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4alloca_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4argumentsobject_p.h @@ -123,15 +125,16 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4binop_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4booleanobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4codegen_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compilationunitmapper_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compileddata_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compiler_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4context_p.h -%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4context_p_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4dataview_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4dateobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4debugging_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4domerrors_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4engine_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4enginebase_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4errorobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4executableallocator_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4function_p.h @@ -150,12 +153,14 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4isel_util_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4jsir_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4jsonobject_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4jssimplifier_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4lookup_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4managed_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4math_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4mathobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4memberdata_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4mm_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4mmdefs_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4numberobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4object_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4objectiterator_p.h @@ -163,12 +168,14 @@ %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4persistent_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4profiling_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4property_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4qmlcontext_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4qobjectwrapper_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4regalloc_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4regexp_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4regexpobject_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4registerinfo_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4runtime_p.h +%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4runtimeapi_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4scopedvalue_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4script_p.h %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4sequenceobject_p.h @@ -247,102 +254,9 @@ %%QT_INCDIR%%/QtQml/qqmlpropertymap.h %%QT_INCDIR%%/QtQml/qqmlpropertyvaluesource.h %%QT_INCDIR%%/QtQml/qqmlscriptstring.h +%%QT_INCDIR%%/QtQml/qtqml-config.h %%QT_INCDIR%%/QtQml/qtqmlglobal.h %%QT_INCDIR%%/QtQml/qtqmlversion.h -%%QT_INCDIR%%/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/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/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/qv4context_p_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/qv4heap_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/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_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_CMAKEDIR%%/Qt5Qml/Qt5QmlConfig.cmake %%QT_CMAKEDIR%%/Qt5Qml/Qt5QmlConfigExtras.cmake %%QT_CMAKEDIR%%/Qt5Qml/Qt5QmlConfigVersion.cmake diff --git a/misc/qt5-doc/Makefile b/misc/qt5-doc/Makefile index 3ae43bf9cf41..9d6fcc8fa757 100644 --- a/misc/qt5-doc/Makefile +++ b/misc/qt5-doc/Makefile @@ -4,55 +4,34 @@ PORTNAME= doc DISTVERSION= ${QT5_VERSION} CATEGORIES= misc -MASTER_SITES= QT/official_releases/qt/${QT5_VERSION:R}/${QT5_VERSION}/single +MASTER_SITES= QT/online/qtsdkrepository/linux_x64/desktop/qt5_${QT5_VERSION:S/.//g}_src_doc_examples/qt.${QT5_VERSION:S/.//g}.doc/ PKGNAMEPREFIX= qt5- -DISTNAME= qt-everywhere-opensource-src-${QT5_VERSION} +DISTNAME= ${QT5_VERSION}-0-201711211135qt-everywhere-documentation DIST_SUBDIR= KDE/Qt/${QT5_VERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Qt 5 documentation -USES= gmake python:build qmake:norecursive,outsource tar:xz -USE_QT5= buildtools_build concurrent_build help_build qdoc_build \ - sql_build sql-sqlite3_build -QMAKE_SOURCE_PATH= ${WRKSRC}/qt.pro +WRKSRC= ${WRKDIR}/Docs/Qt-${QT5_VERSION} + +# bsdtar(1) from 10.3 and earlier cannot read the distfile correctly: +# tar: Damaged 7-Zip archive +# Depend on p7zip across all versions because Uses/7z.mk does not work if +# included after bsd.port.pre.mk. +USES= 7z:p7zip +USE_QT5= # we just need access to QT5_VERSION and other variables. -ALL_TARGET= docs DESCR= ${.CURDIR:H:H}/devel/qt5/pkg-descr NO_ARCH= yes +NO_BUILD= yes -# The default qconfig.pri that qmake reads comes from devel/qt5-core and thus -# disables a lot of items. We re-enable the most important ones below so that -# we do not end up without documentation for QtGui and QtWidgets. -QMAKE_ARGS= QT_CONFIG-="no-gui no-widgets" - -# We need to invoke the qmake symlink we create in the pre-configure target so -# that it reads the qt.conf installed alongside it. -_QMAKE= ${BUILD_WRKSRC}/qtbase/bin/qmake - -SUB_FILES= qt.conf -SUB_LIST= BUILD_WRKSRC=${BUILD_WRKSRC} \ - QT_DOCDIR=${QT_DOCDIR} - -pre-configure: apply-slist - ${MKDIR} ${BUILD_WRKSRC}/qtbase/bin - ${LN} -sf ${MOC} ${BUILD_WRKSRC}/qtbase/bin/moc - ${LN} -sf ${UIC} ${BUILD_WRKSRC}/qtbase/bin/uic - ${LN} -sf ${RCC} ${BUILD_WRKSRC}/qtbase/bin/rcc - ${LN} -sf ${QMAKE} ${BUILD_WRKSRC}/qtbase/bin/qmake - ${LN} -sf ${QT_BINDIR}/qdoc ${BUILD_WRKSRC}/qtbase/bin/qdoc - ${LN} -sf ${QT_BINDIR}/qhelpgenerator ${BUILD_WRKSRC}/qtbase/bin/qhelpgenerator - ${CP} -Rp ${QT_MKSPECDIR} ${BUILD_WRKSRC}/qtbase/mkspecs - ${CP} ${WRKDIR}/qt.conf ${BUILD_WRKSRC}/qtbase/bin/qt.conf - -post-patch: -# qtdeclarative.pro wants to run python, replace that with PYTHON_CMD - ${REINPLACE_CMD} '/py_out/s#python#${PYTHON_CMD}#g' \ - ${WRKSRC}/qtdeclarative/qtdeclarative.pro +post-extract: + ${RM} ${WRKSRC}/Makefile + ${RM} -r ${WRKSRC}/global do-install: - ${MKDIR} ${STAGEDIR}${QT_DOCDIR} && \ - cd ${BUILD_WRKSRC}/qtbase/doc && \ + ${MKDIR} ${STAGEDIR}${QT_DOCDIR} + cd ${WRKSRC} && \ ${COPYTREE_SHARE} \* ${STAGEDIR}${QT_DOCDIR} .include diff --git a/misc/qt5-doc/distinfo b/misc/qt5-doc/distinfo index 684714bc6d06..fcc641ec6591 100644 --- a/misc/qt5-doc/distinfo +++ b/misc/qt5-doc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1485113393 -SHA256 (KDE/Qt/5.7.1/qt-everywhere-opensource-src-5.7.1.tar.xz) = 46ebca977deb629c5e69c2545bc5fe13f7e40012e5e2e451695c583bd33502fa -SIZE (KDE/Qt/5.7.1/qt-everywhere-opensource-src-5.7.1.tar.xz) = 337124364 +TIMESTAMP = 1513367417 +SHA256 (KDE/Qt/5.9.3/5.9.3-0-201711211135qt-everywhere-documentation.7z) = 8cf513a3c6da0550f2bde6b6bb7f341218f6fe35c930bd233718a28133abab5a +SIZE (KDE/Qt/5.9.3/5.9.3-0-201711211135qt-everywhere-documentation.7z) = 212308542 diff --git a/misc/qt5-doc/files/patch-qtserialbus_qtserialbus.pro b/misc/qt5-doc/files/patch-qtserialbus_qtserialbus.pro deleted file mode 100644 index d993cb874799..000000000000 --- a/misc/qt5-doc/files/patch-qtserialbus_qtserialbus.pro +++ /dev/null @@ -1,13 +0,0 @@ -Do not require a modern compiler, we are only building docs. ---- qtserialbus/qtserialbus.pro.orig 2016-05-12 10:12:53 UTC -+++ qtserialbus/qtserialbus.pro -@@ -10,9 +10,6 @@ qtCompileTest(socketcan) - qtCompileTest(socketcan_fd) - load(qt_parts) - --requires(config_language) # enforce defined set of C++11 --!config_language:warning("Cannot compile the module with your compiler, missing C++11 language features.") -- - linux { - !config_socketcan:warning("You need linux/can.h and linux/can/raw.h linux headers for socketCAN support, disabling it") - !config_socketcan_fd:warning("Newer kernel needed for flexible data-rate frame support 'canfd_frame'") diff --git a/misc/qt5-doc/files/qt.conf.in b/misc/qt5-doc/files/qt.conf.in deleted file mode 100644 index 50a0edcdb0d6..000000000000 --- a/misc/qt5-doc/files/qt.conf.in +++ /dev/null @@ -1,32 +0,0 @@ -# This file is installed alongside the qmake symlink in -# ${BUILD_WRKSRC}/qtbase/bin. The qmake binary reads it and overrides some of -# qmake's built-in properties. -# -# qmake's variant properties are not officially documented, so here is -# a quick explanation: -# - $$[FOO] refers to the final locations where things are installed. It can be -# changed in the Paths section of this file. -# - $$[FOO]/get refers to locations within a build directory, before the files -# are installed into their final location. It can be changed in the -# EffectivePaths section. -# - $$[FOO]/src refers to the source locations of some items (e.g. during a -# build, some files are expected to be in the source directory, not the build -# directory). It can be configured via the EffectiveSourcePaths entry. -# -# In short, we are tricking qmake into behaving as if we had run `configure -# -developer-build`: all the QT_* and QT_*/get properties point to -# ${BUILD_WRKSRC}/qtbase and its subdirectories so that this is treated like a -# developer build (where the installation prefix is the same as the build -# directory). -# -# Additionally, we point QT_INSTALL_DOC/src to the location where the .qdocconf -# files are installed by the devel/qt5-qdoc-data port. - -[EffectivePaths] -Prefix=%%BUILD_WRKSRC%%/qtbase - -[EffectiveSourcePaths] -Documentation=%%QT_DOCDIR%% - -[Paths] -Prefix=%%BUILD_WRKSRC%%/qtbase diff --git a/misc/qt5-doc/pkg-plist b/misc/qt5-doc/pkg-plist index 91c3a3858cf2..2cfeea80c30e 100644 --- a/misc/qt5-doc/pkg-plist +++ b/misc/qt5-doc/pkg-plist @@ -1,4 +1,3 @@ -%%QT_DOCDIR%%/Makefile %%QT_DOCDIR%%/activeqt.qch %%QT_DOCDIR%%/activeqt/activeqt-activeqt-comapp-comapp-pro.html %%QT_DOCDIR%%/activeqt/activeqt-activeqt-comapp-example.html @@ -95,6 +94,133 @@ %%QT_DOCDIR%%/activeqt/qaxwidget.html %%QT_DOCDIR%%/activeqt/style/offline-simple.css %%QT_DOCDIR%%/activeqt/style/offline.css +%%QT_DOCDIR%%/gammaray-manual.qch +%%QT_DOCDIR%%/gammaray-manual/examples-gammaray.html +%%QT_DOCDIR%%/gammaray-manual/examples-manifest.xml +%%QT_DOCDIR%%/gammaray-manual/gammaray-action-inspector.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-basic-operations.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-client.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-codec-browser.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-command-line.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-connections.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-enums.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-font-browser.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-getting-started.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-graphicsscene-inspector.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-http-cookies.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-install.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-launcher-gui.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-locales.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-manual.qhp +%%QT_DOCDIR%%/gammaray-manual/gammaray-manual.qhp.sha1 +%%QT_DOCDIR%%/gammaray-manual/gammaray-messages.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-metaobject-browser.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-metatype-browser.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-methods.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-mime-types.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-model-inspector.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-network.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-object-inspection.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-paint-analyzer.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-properties.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-qmlcontext.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-qobject-browser.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-qresource-browser.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-qsggeometry.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-qsgmaterial.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-qt3d-geometry-example.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-qt3d-geometry-mycylinder-cpp.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-qt3d-geometry-mycylinder-h.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-qt3d-geometry-qt3d-geometry-cpp.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-qt3d-geometry-qt3d-geometry-pro.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-qt3d-inspector.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-qt3dgeometry-inspector.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-qtcreator.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-qtquick2-inspector.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-quick-batching-example.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-quick-batching-quick-batching-pro.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-quick-batching-quick-batching-qml.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-quick-batching-slider-qml.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-quick-event-handling-example.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-quick-event-handling-quick-event-handling-pro.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-quick-event-handling-quick-event-handling-qml.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-signal-plotter.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-signal-slot-example.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-signal-slot-signal-slot-cpp.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-signal-slot-signal-slot-pro.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-standard-paths.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-state-machine-debugger.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-state-machine-example.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-state-machine-state-machine-pro.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-state-machine-state-machine-qml.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-styles.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-text-documents.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-timer-example.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-timer-timer-cpp.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-timer-timer-pro.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-timertop.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-tools.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-translator-inspector.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-wayland-compositors.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-web-inspector.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-widget-inspector.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-widget-layouting-example.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-widget-layouting-widget-layouting-cpp.html +%%QT_DOCDIR%%/gammaray-manual/gammaray-widget-layouting-widget-layouting-pro.html +%%QT_DOCDIR%%/gammaray-manual/gammaray.index +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-action-inspector.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-codec-browser.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-connections.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-enums.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-font-browser.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-graphicsitem-paint-analyzer.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-graphicsscene-inspector.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-http-cookies.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-launcher-attach.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-launcher-connect.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-launcher-launch.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-launcher-selftest.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-locales.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-logging-categories.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-metaobject-browser.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-metatype-browser.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-method-invocation.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-methods.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-mime-types.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-model-inspector.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-network-interfaces.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-object-inspector.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-paint-analyzer.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-properties.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qmlcontext.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qq2-geometry.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qq2-inspector.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qq2-qsg-visualize.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qqpainteditem-paint-analyzer.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qrc-browser.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qsggeometry.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qsgmaterial.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qsm-debugger.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qt3d-buffers.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qt3d-geometry-backface-culling.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qt3d-geometry-buffers.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qt3d-geometry-normals.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qt3d-geometry-wireframe.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qt3d-geometry.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qtcreator-attach.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qtcreator-connect.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-qtcreator.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-signal-plotter.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-standard-paths.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-style-controls.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-text-documents.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-timertop.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-timezones.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-translations.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-wayland-compositor.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-web-inspector.png +%%QT_DOCDIR%%/gammaray-manual/images/gammaray-widget-inspector.png +%%QT_DOCDIR%%/gammaray-manual/index.html %%QT_DOCDIR%%/qdoc.qch %%QT_DOCDIR%%/qdoc/01-qdoc-manual.html %%QT_DOCDIR%%/qdoc/03-qdoc-commands-markup.html @@ -148,7 +274,6 @@ %%QT_DOCDIR%%/qdoc/images/qa-table.png %%QT_DOCDIR%%/qdoc/images/training.jpg %%QT_DOCDIR%%/qdoc/images/windowsvista-pushbutton.png -%%QT_DOCDIR%%/qdoc/images/windowsvista-toolbutton.png %%QT_DOCDIR%%/qdoc/qdoc-categories.html %%QT_DOCDIR%%/qdoc/qdoc-componentset-componentset-pro.html %%QT_DOCDIR%%/qdoc/qdoc-componentset-example.html @@ -213,6 +338,7 @@ %%QT_DOCDIR%%/qt3d.qch %%QT_DOCDIR%%/qt3d/examples-manifest.xml %%QT_DOCDIR%%/qt3d/images/Space-invaders.jpg +%%QT_DOCDIR%%/qt3d/images/advanced-custom-material.jpg %%QT_DOCDIR%%/qt3d/images/arrow_bc.png %%QT_DOCDIR%%/qt3d/images/audio-visualizer-qml-example.png %%QT_DOCDIR%%/qt3d/images/basicshapes-cpp-example.jpg @@ -234,14 +360,16 @@ %%QT_DOCDIR%%/qt3d/images/materials.png %%QT_DOCDIR%%/qt3d/images/multiviewport-1.png %%QT_DOCDIR%%/qt3d/images/multiviewport-2.png -%%QT_DOCDIR%%/qt3d/images/multiviewport-qml-example.png +%%QT_DOCDIR%%/qt3d/images/multiviewport-qml-example.jpg %%QT_DOCDIR%%/qt3d/images/multiviewport.png %%QT_DOCDIR%%/qt3d/images/planets-qml-example.jpg %%QT_DOCDIR%%/qt3d/images/qt3d-wireframe-rendering.png +%%QT_DOCDIR%%/qt3d/images/scene2d.png %%QT_DOCDIR%%/qt3d/images/scene3d.png %%QT_DOCDIR%%/qt3d/images/shadowmapping-depth.png %%QT_DOCDIR%%/qt3d/images/shadowmapping-qt3d.png %%QT_DOCDIR%%/qt3d/images/simple-cpp.png +%%QT_DOCDIR%%/qt3d/images/simple-custom-material.jpg %%QT_DOCDIR%%/qt3d/images/simple-framegraph.png %%QT_DOCDIR%%/qt3d/images/simple-qml.png %%QT_DOCDIR%%/qt3d/images/used-in-examples/audio-visualizer-qml/images/albumcover.png @@ -256,36 +384,65 @@ %%QT_DOCDIR%%/qt3d/images/used-in-examples/audio-visualizer-qml/images/stophoverpressed.png %%QT_DOCDIR%%/qt3d/images/used-in-examples/audio-visualizer-qml/images/stopnormal.png %%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/earth.png -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/earthcloudmapcolortrans.png -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/earthcloudmapspec.jpg -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/earthmap1k.jpg -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/earthnormal1k.jpg -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/earthspec1k.jpg -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/galaxy_starfield.png %%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/jupiter.png -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/jupitermap.jpg %%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/mars.png -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/marsmap1k.jpg -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/marsnormal1k.jpg %%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/mercury.png -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/mercurymap.jpg -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/mercurynormal.jpg -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/moonmap1k.jpg -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/moonnormal1k.jpg +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/nasa/uranusringcolortrans.png %%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/neptune.png -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/neptunemap.jpg %%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/saturn.png -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/saturnmap.jpg -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/saturnringcolortrans.png +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/earthcloudmapcolortrans.png +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/earthcloudmapspec.jpg +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/earthmap2k.jpg +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/earthnormal2k.jpg +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/earthspec2k.jpg +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/galaxy_starfield.jpg +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/jupitermap.jpg +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/marsmap2k.jpg +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/marsnormal2k.jpg +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/mercurymap.jpg +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/mercurynormal.jpg +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/moonmap2k.jpg +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/moonnormal2k.jpg +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/neptunemap.jpg +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/saturnmap.jpg +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/saturnringcolortrans.png +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/sunmap.jpg +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/uranusmap.jpg +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/venusmap.jpg +%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/solarsystemscope/venusnormal.jpg %%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/sun.png -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/sunmap.jpg %%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/uranus.png -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/uranusmap.jpg -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/uranusringcolortrans.png %%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/venus.png -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/venusmap.jpg -%%QT_DOCDIR%%/qt3d/images/used-in-examples/planets-qml/images/venusnormal.jpg %%QT_DOCDIR%%/qt3d/images/wave.png +%%QT_DOCDIR%%/qt3d/images/widgets-scene3d.png +%%QT_DOCDIR%%/qt3d/qml-computecommand-members.html +%%QT_DOCDIR%%/qt3d/qml-computecommand.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-abstractanimation-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-abstractanimation.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-abstractclipanimator-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-abstractclipanimator.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-abstractclipblendnode-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-abstractclipblendnode.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-additiveclipblend-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-additiveclipblend.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-animationcontroller-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-animationcontroller.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-animationgroup-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-animationgroup.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-blendedclipanimator-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-blendedclipanimator.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-clipanimator-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-clipanimator.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-keyframeanimation-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-keyframeanimation.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-lerpblend-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-lerpblend.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-morphinganimation-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-morphinganimation.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-morphtarget-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-morphtarget.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-vertexblendanimation-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-animation-vertexblendanimation.html %%QT_DOCDIR%%/qt3d/qml-qt3d-core-component3d-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-core-component3d.html %%QT_DOCDIR%%/qt3d/qml-qt3d-core-entity-members.html @@ -316,9 +473,14 @@ %%QT_DOCDIR%%/qt3d/qml-qt3d-extras-diffusemapmaterial.html %%QT_DOCDIR%%/qt3d/qml-qt3d-extras-diffusespecularmapmaterial-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-extras-diffusespecularmapmaterial.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-extras-extrudedtextgeometry-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-extras-extrudedtextgeometry.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-extras-extrudedtextmesh-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-extras-extrudedtextmesh.html %%QT_DOCDIR%%/qt3d/qml-qt3d-extras-firstpersoncameracontroller-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-extras-firstpersoncameracontroller.html %%QT_DOCDIR%%/qt3d/qml-qt3d-extras-forwardrenderer-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-extras-forwardrenderer-obsolete.html %%QT_DOCDIR%%/qt3d/qml-qt3d-extras-forwardrenderer.html %%QT_DOCDIR%%/qt3d/qml-qt3d-extras-goochmaterial-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-extras-goochmaterial.html @@ -362,6 +524,8 @@ %%QT_DOCDIR%%/qt3d/qml-qt3d-input-analogaxisinput.html %%QT_DOCDIR%%/qt3d/qml-qt3d-input-axis-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-input-axis.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-input-axisaccumulator-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-input-axisaccumulator.html %%QT_DOCDIR%%/qt3d/qml-qt3d-input-axissetting-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-input-axissetting.html %%QT_DOCDIR%%/qt3d/qml-qt3d-input-buttonaxisinput-members.html @@ -392,6 +556,10 @@ %%QT_DOCDIR%%/qt3d/qml-qt3d-logic-frameaction.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-abstracttextureimage-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-abstracttextureimage.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-alphacoverage-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-alphacoverage.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-alphatest-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-alphatest.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-attribute-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-attribute.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-blendequation-members.html @@ -410,16 +578,28 @@ %%QT_DOCDIR%%/qt3d/qml-qt3d-render-clearbuffers.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-clipplane-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-clipplane.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-colormask-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-colormask.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-cullface-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-cullface.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-depthtest-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-depthtest.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-directionallight-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-directionallight.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-dispatchcompute-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-dispatchcompute.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-dithering-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-dithering.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-effect-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-effect.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-environmentlight-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-environmentlight.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-filterkey-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-filterkey.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-framegraphnode-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-framegraphnode.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-frontface-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-frontface.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-frustumculling-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-frustumculling.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-geometry-members.html @@ -432,12 +612,24 @@ %%QT_DOCDIR%%/qt3d/qml-qt3d-render-layer.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-layerfilter-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-layerfilter.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-levelofdetail-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-levelofdetail.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-levelofdetailloader-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-levelofdetailloader.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-levelofdetailswitch-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-levelofdetailswitch.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-light-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-light.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-material-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-material.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-memorybarrier-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-memorybarrier.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-mesh-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-mesh.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-multisampleantialiasing-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-multisampleantialiasing.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-nodepthmask-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-nodepthmask.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-nodraw-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-nodraw.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-objectpicker-members.html @@ -454,6 +646,14 @@ %%QT_DOCDIR%%/qt3d/qml-qt3d-render-pointlight.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-pointsize-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-pointsize.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-polygonoffset-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-polygonoffset.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-rendercapture-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-rendercapture-obsolete.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-rendercapture.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-rendercapturereply-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-rendercapturereply-obsolete.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-rendercapturereply.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-renderpass-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-renderpass.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-rendersettings-members.html @@ -464,18 +664,63 @@ %%QT_DOCDIR%%/qt3d/qml-qt3d-render-rendertargetselector.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-sceneloader-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-sceneloader.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-scissortest-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-scissortest.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-seamlesscubemap-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-seamlesscubemap.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-shaderprogram-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-shaderprogram.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-sortpolicy-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-sortpolicy.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-spotlight-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-spotlight.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-stencilmask-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-stencilmask.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-stenciloperation-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-stenciloperation.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-stenciloperationarguments-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-stenciloperationarguments.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-stenciltest-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-stenciltest.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-stenciltestarguments-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-render-stenciltestarguments.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-technique-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-technique.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-textureimage-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-textureimage.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-viewport-members.html %%QT_DOCDIR%%/qt3d/qml-qt3d-render-viewport.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-scene2d-scene2d-members.html +%%QT_DOCDIR%%/qt3d/qml-qt3d-scene2d-scene2d.html +%%QT_DOCDIR%%/qt3d/qml-renderpassfilter-members.html +%%QT_DOCDIR%%/qt3d/qml-renderpassfilter.html +%%QT_DOCDIR%%/qt3d/qml-renderstate-members.html +%%QT_DOCDIR%%/qt3d/qml-renderstate.html +%%QT_DOCDIR%%/qt3d/qml-renderstateset-members.html +%%QT_DOCDIR%%/qt3d/qml-renderstateset.html +%%QT_DOCDIR%%/qt3d/qml-rendertarget-members.html +%%QT_DOCDIR%%/qt3d/qml-rendertarget.html +%%QT_DOCDIR%%/qt3d/qml-rendertargetoutput-members.html +%%QT_DOCDIR%%/qt3d/qml-rendertargetoutput.html +%%QT_DOCDIR%%/qt3d/qml-techniquefilter-members.html +%%QT_DOCDIR%%/qt3d/qml-techniquefilter.html +%%QT_DOCDIR%%/qt3d/qt3d-advancedcustommaterial-advancedcustommaterial-pro.html +%%QT_DOCDIR%%/qt3d/qt3d-advancedcustommaterial-example.html +%%QT_DOCDIR%%/qt3d/qt3d-advancedcustommaterial-main-cpp.html +%%QT_DOCDIR%%/qt3d/qt3d-advancedcustommaterial-main-qml.html +%%QT_DOCDIR%%/qt3d/qt3d-advancedcustommaterial-models-qrc.html +%%QT_DOCDIR%%/qt3d/qt3d-advancedcustommaterial-qml-qrc.html +%%QT_DOCDIR%%/qt3d/qt3d-advancedcustommaterial-sceneroot-qml.html +%%QT_DOCDIR%%/qt3d/qt3d-advancedcustommaterial-shaders-es2-water-vert.html +%%QT_DOCDIR%%/qt3d/qt3d-advancedcustommaterial-shaders-gl3-water-vert.html +%%QT_DOCDIR%%/qt3d/qt3d-advancedcustommaterial-shaders-qrc.html +%%QT_DOCDIR%%/qt3d/qt3d-advancedcustommaterial-textures-qrc.html +%%QT_DOCDIR%%/qt3d/qt3d-advancedcustommaterial-water-qml.html +%%QT_DOCDIR%%/qt3d/qt3d-advancedcustommaterial-watermaterial-qml.html +%%QT_DOCDIR%%/qt3d/qt3d-animation-qmlmodule.html +%%QT_DOCDIR%%/qt3d/qt3d-attribution-assimp.html +%%QT_DOCDIR%%/qt3d/qt3d-attribution-nasa-jpl.html +%%QT_DOCDIR%%/qt3d/qt3d-attribution-solar-system-scope.html %%QT_DOCDIR%%/qt3d/qt3d-audio-visualizer-qml-audio-visualizer-qml-pro.html %%QT_DOCDIR%%/qt3d/qt3d-audio-visualizer-qml-audio-visualizer-qml-qrc.html %%QT_DOCDIR%%/qt3d/qt3d-audio-visualizer-qml-barentity-qml.html @@ -492,21 +737,6 @@ %%QT_DOCDIR%%/qt3d/qt3d-basicshapes-cpp-scenemodifier-h.html %%QT_DOCDIR%%/qt3d/qt3d-core-qmlmodule.html %%QT_DOCDIR%%/qt3d/qt3d-cpp.html -%%QT_DOCDIR%%/qt3d/qt3d-deferred-renderer-cpp-deferred-renderer-cpp-pro.html -%%QT_DOCDIR%%/qt3d/qt3d-deferred-renderer-cpp-deferred-renderer-cpp-qrc.html -%%QT_DOCDIR%%/qt3d/qt3d-deferred-renderer-cpp-example.html -%%QT_DOCDIR%%/qt3d/qt3d-deferred-renderer-cpp-final-gl2-vert.html -%%QT_DOCDIR%%/qt3d/qt3d-deferred-renderer-cpp-final-gl3-vert.html -%%QT_DOCDIR%%/qt3d/qt3d-deferred-renderer-cpp-finaleffect-cpp.html -%%QT_DOCDIR%%/qt3d/qt3d-deferred-renderer-cpp-finaleffect-h.html -%%QT_DOCDIR%%/qt3d/qt3d-deferred-renderer-cpp-gbuffer-cpp.html -%%QT_DOCDIR%%/qt3d/qt3d-deferred-renderer-cpp-gbuffer-h.html -%%QT_DOCDIR%%/qt3d/qt3d-deferred-renderer-cpp-geometry-gl2-vert.html -%%QT_DOCDIR%%/qt3d/qt3d-deferred-renderer-cpp-geometry-gl3-vert.html -%%QT_DOCDIR%%/qt3d/qt3d-deferred-renderer-cpp-pointlightblock-cpp.html -%%QT_DOCDIR%%/qt3d/qt3d-deferred-renderer-cpp-pointlightblock-h.html -%%QT_DOCDIR%%/qt3d/qt3d-deferred-renderer-cpp-sceneeffect-cpp.html -%%QT_DOCDIR%%/qt3d/qt3d-deferred-renderer-cpp-sceneeffect-h.html %%QT_DOCDIR%%/qt3d/qt3d-examples.html %%QT_DOCDIR%%/qt3d/qt3d-extras-qmlmodule.html %%QT_DOCDIR%%/qt3d/qt3d-index.html @@ -550,10 +780,13 @@ %%QT_DOCDIR%%/qt3d/qt3d-multiviewport-simplecamera-qml.html %%QT_DOCDIR%%/qt3d/qt3d-overview.html %%QT_DOCDIR%%/qt3d/qt3d-planets-qml-android-androidmanifest-xml.html +%%QT_DOCDIR%%/qt3d/qt3d-planets-qml-appletvinput-qml.html %%QT_DOCDIR%%/qt3d/qt3d-planets-qml-example.html %%QT_DOCDIR%%/qt3d/qt3d-planets-qml-fpsdisplay-qml.html %%QT_DOCDIR%%/qt3d/qt3d-planets-qml-infosheet-qml.html %%QT_DOCDIR%%/qt3d/qt3d-planets-qml-main-cpp.html +%%QT_DOCDIR%%/qt3d/qt3d-planets-qml-networkcontroller-cpp.html +%%QT_DOCDIR%%/qt3d/qt3d-planets-qml-networkcontroller-h.html %%QT_DOCDIR%%/qt3d/qt3d-planets-qml-planet-qml.html %%QT_DOCDIR%%/qt3d/qt3d-planets-qml-planetbutton-qml.html %%QT_DOCDIR%%/qt3d/qt3d-planets-qml-planeteffect-qml.html @@ -563,6 +796,10 @@ %%QT_DOCDIR%%/qt3d/qt3d-planets-qml-planets-qml-images-qrc.html %%QT_DOCDIR%%/qt3d/qt3d-planets-qml-planets-qml-pro.html %%QT_DOCDIR%%/qt3d/qt3d-planets-qml-planets-qml-qrc.html +%%QT_DOCDIR%%/qt3d/qt3d-planets-qml-planets-watchos-planetsclient-appdelegate-h.html +%%QT_DOCDIR%%/qt3d/qt3d-planets-qml-planets-watchos-planetsclient-viewcontroller-h.html +%%QT_DOCDIR%%/qt3d/qt3d-planets-qml-planets-watchos-planetsclient-watchkit-extension-extensiondelegate-h.html +%%QT_DOCDIR%%/qt3d/qt3d-planets-qml-planets-watchos-planetsclient-watchkit-extension-interfacecontroller-h.html %%QT_DOCDIR%%/qt3d/qt3d-planets-qml-planetslight-qml.html %%QT_DOCDIR%%/qt3d/qt3d-planets-qml-planetsmain-qml.html %%QT_DOCDIR%%/qt3d/qt3d-planets-qml-ring-qml.html @@ -579,6 +816,13 @@ %%QT_DOCDIR%%/qt3d/qt3d-planets-qml-styledslider-qml.html %%QT_DOCDIR%%/qt3d/qt3d-planets-qml-suneffect-qml.html %%QT_DOCDIR%%/qt3d/qt3d-render-qmlmodule.html +%%QT_DOCDIR%%/qt3d/qt3d-scene2d-example.html +%%QT_DOCDIR%%/qt3d/qt3d-scene2d-logocontrols-qml.html +%%QT_DOCDIR%%/qt3d/qt3d-scene2d-main-cpp.html +%%QT_DOCDIR%%/qt3d/qt3d-scene2d-main-qml.html +%%QT_DOCDIR%%/qt3d/qt3d-scene2d-qmlmodule.html +%%QT_DOCDIR%%/qt3d/qt3d-scene2d-scene2d-pro.html +%%QT_DOCDIR%%/qt3d/qt3d-scene2d-scene2d-qrc.html %%QT_DOCDIR%%/qt3d/qt3d-scene3d-animatedentity-qml.html %%QT_DOCDIR%%/qt3d/qt3d-scene3d-example.html %%QT_DOCDIR%%/qt3d/qt3d-scene3d-main-cpp.html @@ -612,6 +856,19 @@ %%QT_DOCDIR%%/qt3d/qt3d-simple-qml-main-qml.html %%QT_DOCDIR%%/qt3d/qt3d-simple-qml-simple-qml-pro.html %%QT_DOCDIR%%/qt3d/qt3d-simple-qml-simple-qml-qrc.html +%%QT_DOCDIR%%/qt3d/qt3d-simplecustommaterial-example.html +%%QT_DOCDIR%%/qt3d/qt3d-simplecustommaterial-main-cpp.html +%%QT_DOCDIR%%/qt3d/qt3d-simplecustommaterial-main-qml.html +%%QT_DOCDIR%%/qt3d/qt3d-simplecustommaterial-models-qrc.html +%%QT_DOCDIR%%/qt3d/qt3d-simplecustommaterial-planemodel-qml.html +%%QT_DOCDIR%%/qt3d/qt3d-simplecustommaterial-qml-qrc.html +%%QT_DOCDIR%%/qt3d/qt3d-simplecustommaterial-sceneroot-qml.html +%%QT_DOCDIR%%/qt3d/qt3d-simplecustommaterial-shaders-es2-simplecolor-vert.html +%%QT_DOCDIR%%/qt3d/qt3d-simplecustommaterial-shaders-gl3-simplecolor-vert.html +%%QT_DOCDIR%%/qt3d/qt3d-simplecustommaterial-shaders-qrc.html +%%QT_DOCDIR%%/qt3d/qt3d-simplecustommaterial-simplecustommaterial-pro.html +%%QT_DOCDIR%%/qt3d/qt3d-simplecustommaterial-simplematerial-qml.html +%%QT_DOCDIR%%/qt3d/qt3d-simplecustommaterial-textures-qrc.html %%QT_DOCDIR%%/qt3d/qt3d-wave-background-qml.html %%QT_DOCDIR%%/qt3d/qt3d-wave-backgroundeffect-qml.html %%QT_DOCDIR%%/qt3d/qt3d-wave-basiccamera-qml.html @@ -627,6 +884,10 @@ %%QT_DOCDIR%%/qt3d/qt3d-wave-waveeffect-qml.html %%QT_DOCDIR%%/qt3d/qt3d-wave-waveforwardrenderer-qml.html %%QT_DOCDIR%%/qt3d/qt3d-wave-wavematerial-qml.html +%%QT_DOCDIR%%/qt3d/qt3d-widgets-scene3d-example.html +%%QT_DOCDIR%%/qt3d/qt3d-widgets-scene3d-main-cpp.html +%%QT_DOCDIR%%/qt3d/qt3d-widgets-scene3d-widgets-scene3d-pro.html +%%QT_DOCDIR%%/qt3d/qt3d-widgets-scene3d-widgets-scene3d-qrc.html %%QT_DOCDIR%%/qt3d/qt3d-wireframe-basiccamera-qml.html %%QT_DOCDIR%%/qt3d/qt3d-wireframe-example.html %%QT_DOCDIR%%/qt3d/qt3d-wireframe-main-cpp.html @@ -642,852 +903,366 @@ %%QT_DOCDIR%%/qt3d/qt3d.qhp %%QT_DOCDIR%%/qt3d/qt3d.qhp.sha1 %%QT_DOCDIR%%/qt3d/qt3d.tags -%%QT_DOCDIR%%/qt3d/qt3dcore-arrayallocatingpolicy-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-arrayallocatingpolicy.html -%%QT_DOCDIR%%/qt3d/qt3dcore-arraypreallocationpolicy-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-arraypreallocationpolicy.html -%%QT_DOCDIR%%/qt3d/qt3dcore-aspecttaskrunnable-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-aspecttaskrunnable.html -%%QT_DOCDIR%%/qt3d/qt3dcore-circularbufferdata-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-circularbufferdata.html -%%QT_DOCDIR%%/qt3d/qt3dcore-debug-asynchronouscommandreply-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-debug-asynchronouscommandreply.html -%%QT_DOCDIR%%/qt3d/qt3dcore-debug.html -%%QT_DOCDIR%%/qt3d/qt3dcore-dependency-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-dependency.html -%%QT_DOCDIR%%/qt3d/qt3dcore-dependencyhandler-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-dependencyhandler.html -%%QT_DOCDIR%%/qt3d/qt3dcore-int2type-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-int2type.html +%%QT_DOCDIR%%/qt3d/qt3danimation-module.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qabstractanimation-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qabstractanimation.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qabstractanimationclip-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qabstractanimationclip.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qabstractclipanimator-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qabstractclipanimator.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qabstractclipblendnode-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qabstractclipblendnode.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qadditiveclipblend-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qadditiveclipblend.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qanimationaspect-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qanimationaspect.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qanimationclip-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qanimationclip.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qanimationclipdata-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qanimationclipdata.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qanimationcliploader-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qanimationcliploader.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qanimationcontroller-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qanimationcontroller.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qanimationgroup-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qanimationgroup.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qblendedclipanimator-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qblendedclipanimator.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qchannel-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qchannel.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qchannelcomponent-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qchannelcomponent.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qchannelmapper-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qchannelmapper.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qchannelmapping-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qchannelmapping.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qclipanimator-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qclipanimator.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qclipblendnodecreatedchange-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qclipblendnodecreatedchange.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qclipblendnodecreatedchangebase-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qclipblendnodecreatedchangebase.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qclipblendvalue-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qclipblendvalue.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qkeyframe-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qkeyframe.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qkeyframeanimation-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qkeyframeanimation.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qlerpclipblend-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qlerpclipblend.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qmorphinganimation-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qmorphinganimation.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qmorphtarget-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qmorphtarget.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qvertexblendanimation-members.html +%%QT_DOCDIR%%/qt3d/qt3danimation-qvertexblendanimation.html +%%QT_DOCDIR%%/qt3d/qt3danimation.html %%QT_DOCDIR%%/qt3d/qt3dcore-module.html -%%QT_DOCDIR%%/qt3d/qt3dcore-nonlockingpolicy-locker-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-nonlockingpolicy-locker.html -%%QT_DOCDIR%%/qt3d/qt3dcore-nonlockingpolicy-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-nonlockingpolicy-readlocker-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-nonlockingpolicy-readlocker.html -%%QT_DOCDIR%%/qt3d/qt3dcore-nonlockingpolicy-writelocker-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-nonlockingpolicy-writelocker.html -%%QT_DOCDIR%%/qt3d/qt3dcore-nonlockingpolicy.html -%%QT_DOCDIR%%/qt3d/qt3dcore-nullopenglinformationservice-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-nullopenglinformationservice.html -%%QT_DOCDIR%%/qt3d/qt3dcore-nullsysteminformationservice-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-nullsysteminformationservice.html -%%QT_DOCDIR%%/qt3d/qt3dcore-objectlevellockingpolicy-locker-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-objectlevellockingpolicy-locker.html -%%QT_DOCDIR%%/qt3d/qt3dcore-objectlevellockingpolicy-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-objectlevellockingpolicy-readlocker-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-objectlevellockingpolicy-readlocker.html -%%QT_DOCDIR%%/qt3d/qt3dcore-objectlevellockingpolicy-writelocker-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-objectlevellockingpolicy-writelocker.html -%%QT_DOCDIR%%/qt3d/qt3dcore-objectlevellockingpolicy.html -%%QT_DOCDIR%%/qt3d/qt3dcore-propertychangehandler-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-propertychangehandler.html -%%QT_DOCDIR%%/qt3d/qt3dcore-propertychangehandlerbase-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-propertychangehandlerbase.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qabstractarbiter-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qabstractarbiter.html %%QT_DOCDIR%%/qt3d/qt3dcore-qabstractaspect-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qabstractaspect.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qabstractaspectjobmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qabstractaspectjobmanager.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qabstractaspectprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qabstractaspectprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qabstractframeadvanceservice-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qabstractframeadvanceservice.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qabstractframeadvanceserviceprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qabstractframeadvanceserviceprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qabstractnodefactory-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qabstractnodefactory.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qabstractpostman-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qabstractpostman.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qabstractserviceprovider-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qabstractserviceprovider.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qabstractserviceproviderprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qabstractserviceproviderprivate.html %%QT_DOCDIR%%/qt3d/qt3dcore-qaspectengine-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qaspectengine.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qaspectengineprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qaspectengineprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qaspectfactory-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qaspectfactory.html %%QT_DOCDIR%%/qt3d/qt3dcore-qaspectjob-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qaspectjob.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qaspectjobmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qaspectjobmanager.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qaspectjobprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qaspectjobprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qaspectjobproviderinterface-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qaspectjobproviderinterface.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qaspectmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qaspectmanager.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qaspectthread-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qaspectthread.html %%QT_DOCDIR%%/qt3d/qt3dcore-qbackendnode-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qbackendnode.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qbackendnodefactory-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qbackendnodefactory.html %%QT_DOCDIR%%/qt3d/qt3dcore-qbackendnodemapper-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qbackendnodemapper.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qbackendnodeprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qbackendnodeprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qboundedcircularbuffer-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qboundedcircularbuffer.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qchangearbiter-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qchangearbiter.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qcircularbuffer-const-iterator-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qcircularbuffer-const-iterator.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qcircularbuffer-iterator-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qcircularbuffer-iterator.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qcircularbuffer-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qcircularbuffer.html %%QT_DOCDIR%%/qt3d/qt3dcore-qcomponent-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qcomponent.html %%QT_DOCDIR%%/qt3d/qt3dcore-qcomponentaddedchange-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qcomponentaddedchange.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qcomponentaddedchangeprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qcomponentaddedchangeprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qcomponentprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qcomponentprivate.html %%QT_DOCDIR%%/qt3d/qt3dcore-qcomponentremovedchange-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qcomponentremovedchange.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qcomponentremovedchangeprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qcomponentremovedchangeprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qdestructionidandtypecollector-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qdestructionidandtypecollector.html %%QT_DOCDIR%%/qt3d/qt3dcore-qdynamicpropertyupdatedchange-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qdynamicpropertyupdatedchange.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qdynamicpropertyupdatedchangeprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qdynamicpropertyupdatedchangeprivate.html %%QT_DOCDIR%%/qt3d/qt3dcore-qentity-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qentity.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qentitydata-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qentitydata.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qentityprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qentityprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qeventfilterservice-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qeventfilterservice.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qfixedframeallocator-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qfixedframeallocator.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qframeallocator-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qframeallocator.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qframeallocatorprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qframeallocatorprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qframechunk-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qframechunk.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qhandle-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qhandle.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qhandlemanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qhandlemanager.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qlockableobserverinterface-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qlockableobserverinterface.html %%QT_DOCDIR%%/qt3d/qt3dcore-qnode-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qnode.html %%QT_DOCDIR%%/qt3d/qt3dcore-qnodecreatedchange-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qnodecreatedchange.html %%QT_DOCDIR%%/qt3d/qt3dcore-qnodecreatedchangebase-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qnodecreatedchangebase.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qnodecreatedchangebaseprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qnodecreatedchangebaseprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qnodecreatedchangegenerator-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qnodecreatedchangegenerator.html %%QT_DOCDIR%%/qt3d/qt3dcore-qnodedestroyedchange-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qnodedestroyedchange.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qnodedestroyedchangeprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qnodedestroyedchangeprivate.html %%QT_DOCDIR%%/qt3d/qt3dcore-qnodeid-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qnodeid.html %%QT_DOCDIR%%/qt3d/qt3dcore-qnodeidtypepair-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qnodeidtypepair.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qnodeprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qnodeprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qnodevisitor-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qnodevisitor.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qobservableinterface-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qobservableinterface.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qobserverinterface-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qobserverinterface.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qopenglinformationservice-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qopenglinformationservice.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qopenglinformationserviceprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qopenglinformationserviceprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qpostman-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qpostman.html %%QT_DOCDIR%%/qt3d/qt3dcore-qpropertynodeaddedchange-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qpropertynodeaddedchange.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qpropertynodeaddedchangeprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qpropertynodeaddedchangeprivate.html %%QT_DOCDIR%%/qt3d/qt3dcore-qpropertynoderemovedchange-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qpropertynoderemovedchange.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qpropertynoderemovedchangeprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qpropertynoderemovedchangeprivate.html %%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyupdatedchange-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyupdatedchange.html %%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyupdatedchangebase-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyupdatedchangebase.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyupdatedchangebaseprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyupdatedchangebaseprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyupdatedchangeprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyupdatedchangeprivate.html %%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyvalueaddedchange-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyvalueaddedchange.html %%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyvalueaddedchangebase-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyvalueaddedchangebase.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyvalueaddedchangebaseprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyvalueaddedchangebaseprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyvalueaddedchangeprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyvalueaddedchangeprivate.html %%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyvalueremovedchange-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyvalueremovedchange.html %%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyvalueremovedchangebase-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyvalueremovedchangebase.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyvalueremovedchangebaseprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyvalueremovedchangebaseprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyvalueremovedchangeprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qpropertyvalueremovedchangeprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qresourceinfo-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qresourceinfo.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qresourcemanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qresourcemanager.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qscene-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qscene.html %%QT_DOCDIR%%/qt3d/qt3dcore-qscenechange-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qscenechange.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qscenechangeprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qscenechangeprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qsceneobserverinterface-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qsceneobserverinterface.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qscheduler-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qscheduler.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qservicelocator-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qservicelocator.html %%QT_DOCDIR%%/qt3d/qt3dcore-qstaticpropertyupdatedchangebase-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qstaticpropertyupdatedchangebase.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qstaticpropertyupdatedchangebaseprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qstaticpropertyupdatedchangebaseprivate.html %%QT_DOCDIR%%/qt3d/qt3dcore-qstaticpropertyvalueaddedchangebase-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qstaticpropertyvalueaddedchangebase.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qstaticpropertyvalueaddedchangebaseprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qstaticpropertyvalueaddedchangebaseprivate.html %%QT_DOCDIR%%/qt3d/qt3dcore-qstaticpropertyvalueremovedchangebase-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qstaticpropertyvalueremovedchangebase.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qstaticpropertyvalueremovedchangebaseprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qstaticpropertyvalueremovedchangebaseprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qsysteminformationservice-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qsysteminformationservice.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qsysteminformationserviceprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qsysteminformationserviceprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qthreadpooler-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qthreadpooler.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qtickclock-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qtickclock.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qtickclockservice-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qtickclockservice.html %%QT_DOCDIR%%/qt3d/qt3dcore-qtransform-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-qtransform.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qtransformdata-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qtransformdata.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qtransformprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qtransformprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qtypedpropertyupdatedchange-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-qtypedpropertyupdatedchange.html %%QT_DOCDIR%%/qt3d/qt3dcore-quick-qqmlaspectengine-members.html %%QT_DOCDIR%%/qt3d/qt3dcore-quick-qqmlaspectengine.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-qqmlaspectengineprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-qqmlaspectengineprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-qquaternionanimation-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-qquaternionanimation.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dcolorvaluetype-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dcolorvaluetype.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dentity-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dentity.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dentityloader-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dentityloader.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dentityloaderprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dentityloaderprivate.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dmatrix4x4valuetype-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dmatrix4x4valuetype.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dnode-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dnode.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dnodeinstantiator-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dnodeinstantiator.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dquaternionvaluetype-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dquaternionvaluetype.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dvaluetypes.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dvector2dvaluetype-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dvector2dvaluetype.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dvector3dvaluetype-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dvector3dvaluetype.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dvector4dvaluetype-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quick-quick3dvector4dvaluetype.html %%QT_DOCDIR%%/qt3d/qt3dcore-quick.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quicknodefactory-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-quicknodefactory.html -%%QT_DOCDIR%%/qt3d/qt3dcore-runnableinterface-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-runnableinterface.html -%%QT_DOCDIR%%/qt3d/qt3dcore-synctaskrunnable-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-synctaskrunnable.html -%%QT_DOCDIR%%/qt3d/qt3dcore-typedcircularbufferdata-members.html -%%QT_DOCDIR%%/qt3d/qt3dcore-typedcircularbufferdata.html %%QT_DOCDIR%%/qt3d/qt3dcore.html %%QT_DOCDIR%%/qt3d/qt3dextras-module.html %%QT_DOCDIR%%/qt3d/qt3dextras-qconegeometry-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qconegeometry.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qconegeometryprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qconegeometryprivate.html %%QT_DOCDIR%%/qt3d/qt3dextras-qconemesh-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qconemesh.html %%QT_DOCDIR%%/qt3d/qt3dextras-qcuboidgeometry-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qcuboidgeometry.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qcuboidgeometryprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qcuboidgeometryprivate.html %%QT_DOCDIR%%/qt3d/qt3dextras-qcuboidmesh-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qcuboidmesh.html %%QT_DOCDIR%%/qt3d/qt3dextras-qcylindergeometry-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qcylindergeometry.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qcylindergeometryprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qcylindergeometryprivate.html %%QT_DOCDIR%%/qt3d/qt3dextras-qcylindermesh-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qcylindermesh.html %%QT_DOCDIR%%/qt3d/qt3dextras-qdiffusemapmaterial-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qdiffusemapmaterial.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qdiffusemapmaterialprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qdiffusemapmaterialprivate.html %%QT_DOCDIR%%/qt3d/qt3dextras-qdiffusespecularmapmaterial-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qdiffusespecularmapmaterial.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qdiffusespecularmapmaterialprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qdiffusespecularmapmaterialprivate.html +%%QT_DOCDIR%%/qt3d/qt3dextras-qextrudedtextgeometry-members.html +%%QT_DOCDIR%%/qt3d/qt3dextras-qextrudedtextgeometry.html +%%QT_DOCDIR%%/qt3d/qt3dextras-qextrudedtextmesh-members.html +%%QT_DOCDIR%%/qt3d/qt3dextras-qextrudedtextmesh.html %%QT_DOCDIR%%/qt3d/qt3dextras-qfirstpersoncameracontroller-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qfirstpersoncameracontroller.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qfirstpersoncameracontrollerprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qfirstpersoncameracontrollerprivate.html %%QT_DOCDIR%%/qt3d/qt3dextras-qforwardrenderer-members.html +%%QT_DOCDIR%%/qt3d/qt3dextras-qforwardrenderer-obsolete.html %%QT_DOCDIR%%/qt3d/qt3dextras-qforwardrenderer.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qforwardrendererprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qforwardrendererprivate.html %%QT_DOCDIR%%/qt3d/qt3dextras-qgoochmaterial-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qgoochmaterial.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qgoochmaterialprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qgoochmaterialprivate.html +%%QT_DOCDIR%%/qt3d/qt3dextras-qmetalroughmaterial-members.html +%%QT_DOCDIR%%/qt3d/qt3dextras-qmetalroughmaterial.html +%%QT_DOCDIR%%/qt3d/qt3dextras-qmorphphongmaterial-members.html +%%QT_DOCDIR%%/qt3d/qt3dextras-qmorphphongmaterial.html %%QT_DOCDIR%%/qt3d/qt3dextras-qnormaldiffusemapalphamaterial-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qnormaldiffusemapalphamaterial.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qnormaldiffusemapalphamaterialprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qnormaldiffusemapalphamaterialprivate.html %%QT_DOCDIR%%/qt3d/qt3dextras-qnormaldiffusemapmaterial-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qnormaldiffusemapmaterial.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qnormaldiffusemapmaterialprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qnormaldiffusemapmaterialprivate.html %%QT_DOCDIR%%/qt3d/qt3dextras-qnormaldiffusespecularmapmaterial-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qnormaldiffusespecularmapmaterial.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qnormaldiffusespecularmapmaterialprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qnormaldiffusespecularmapmaterialprivate.html %%QT_DOCDIR%%/qt3d/qt3dextras-qorbitcameracontroller-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qorbitcameracontroller.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qorbitcameracontrollerprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qorbitcameracontrollerprivate.html %%QT_DOCDIR%%/qt3d/qt3dextras-qpervertexcolormaterial-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qpervertexcolormaterial.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qpervertexcolormaterialprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qpervertexcolormaterialprivate.html %%QT_DOCDIR%%/qt3d/qt3dextras-qphongalphamaterial-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qphongalphamaterial.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qphongalphamaterialprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qphongalphamaterialprivate.html %%QT_DOCDIR%%/qt3d/qt3dextras-qphongmaterial-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qphongmaterial.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qphongmaterialprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qphongmaterialprivate.html %%QT_DOCDIR%%/qt3d/qt3dextras-qplanegeometry-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qplanegeometry.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qplanegeometryprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qplanegeometryprivate.html %%QT_DOCDIR%%/qt3d/qt3dextras-qplanemesh-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qplanemesh.html %%QT_DOCDIR%%/qt3d/qt3dextras-qskyboxentity-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qskyboxentity.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qskyboxentityprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qskyboxentityprivate.html %%QT_DOCDIR%%/qt3d/qt3dextras-qspheregeometry-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qspheregeometry.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qspheregeometryprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qspheregeometryprivate.html %%QT_DOCDIR%%/qt3d/qt3dextras-qspheremesh-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qspheremesh.html %%QT_DOCDIR%%/qt3d/qt3dextras-qt3dwindow-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qt3dwindow.html +%%QT_DOCDIR%%/qt3d/qt3dextras-qtext2dentity-members.html +%%QT_DOCDIR%%/qt3d/qt3dextras-qtext2dentity.html +%%QT_DOCDIR%%/qt3d/qt3dextras-qtexturedmetalroughmaterial-members.html +%%QT_DOCDIR%%/qt3d/qt3dextras-qtexturedmetalroughmaterial.html +%%QT_DOCDIR%%/qt3d/qt3dextras-qtexturematerial-members.html +%%QT_DOCDIR%%/qt3d/qt3dextras-qtexturematerial.html %%QT_DOCDIR%%/qt3d/qt3dextras-qtorusgeometry-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qtorusgeometry.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qtorusgeometryprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dextras-qtorusgeometryprivate.html %%QT_DOCDIR%%/qt3d/qt3dextras-qtorusmesh-members.html %%QT_DOCDIR%%/qt3d/qt3dextras-qtorusmesh.html %%QT_DOCDIR%%/qt3d/qt3dextras.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-abstractactioninput-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-abstractactioninput.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-abstractaxisinput-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-abstractaxisinput.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-action-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-action.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-actioninput-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-actioninput.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-actioninputmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-actioninputmanager.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-actionmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-actionmanager.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-analogaxisinput-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-analogaxisinput.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-analogaxisinputmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-analogaxisinputmanager.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-assignkeyboardfocusjob-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-assignkeyboardfocusjob.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-axis-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-axis.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-axisidfilter-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-axisidfilter.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-axisidsetting-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-axisidsetting.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-axismanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-axismanager.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-axissetting-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-axissetting.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-axissettingmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-axissettingmanager.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-buttonaxisinput-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-buttonaxisinput.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-buttonaxisinputmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-buttonaxisinputmanager.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-eventsourcesetterhelper-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-eventsourcesetterhelper.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-genericdevicebackendfunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-genericdevicebackendfunctor.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-genericdevicebackendnode-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-genericdevicebackendnode.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-genericdevicebackendnodemanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-genericdevicebackendnodemanager.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-inputchord-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-inputchord.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-inputchordmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-inputchordmanager.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-inputhandler-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-inputhandler.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-inputnodefunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-inputnodefunctor.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-inputsequence-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-inputsequence.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-inputsequencemanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-inputsequencemanager.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-inputsettings-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-inputsettings.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-inputsettingsfunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-inputsettingsfunctor.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-jobtypes.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-keyboarddevice-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-keyboarddevice.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-keyboarddevicefunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-keyboarddevicefunctor.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-keyboarddevicemanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-keyboarddevicemanager.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-keyboardeventfilter-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-keyboardeventfilter.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-keyboardhandler-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-keyboardhandler.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-keyboardhandlerfunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-keyboardhandlerfunctor.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-keyboardinputmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-keyboardinputmanager.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-keyboardmousegenericdeviceintegration-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-keyboardmousegenericdeviceintegration.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-keyeventdispatcherjob-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-keyeventdispatcherjob.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-logicaldevice-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-logicaldevice.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-logicaldevicemanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-logicaldevicemanager.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-logicaldevicenodefunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-logicaldevicenodefunctor.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-mousedevice-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-mousedevice.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-mousedevicefunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-mousedevicefunctor.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-mousedevicemanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-mousedevicemanager.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-mouseeventdispatcherjob-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-mouseeventdispatcherjob.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-mouseeventfilter-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-mouseeventfilter.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-mousehandler-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-mousehandler.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-mousehandlerfunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-mousehandlerfunctor.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-mouseinputmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-mouseinputmanager.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-movingaverage-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-movingaverage.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-updateaxisactionjob-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input-updateaxisactionjob.html -%%QT_DOCDIR%%/qt3d/qt3dinput-input.html %%QT_DOCDIR%%/qt3d/qt3dinput-module.html %%QT_DOCDIR%%/qt3d/qt3dinput-qabstractactioninput-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qabstractactioninput.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qabstractactioninputprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qabstractactioninputprivate.html %%QT_DOCDIR%%/qt3d/qt3dinput-qabstractaxisinput-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qabstractaxisinput.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qabstractaxisinputdata-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qabstractaxisinputdata.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qabstractaxisinputprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qabstractaxisinputprivate.html %%QT_DOCDIR%%/qt3d/qt3dinput-qabstractphysicaldevice-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qabstractphysicaldevice.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qabstractphysicaldevicebackendnode-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qabstractphysicaldevicebackendnode.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qabstractphysicaldevicebackendnodeprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qabstractphysicaldevicebackendnodeprivate.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qabstractphysicaldeviceprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qabstractphysicaldeviceprivate.html %%QT_DOCDIR%%/qt3d/qt3dinput-qaction-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qaction.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qactiondata-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qactiondata.html %%QT_DOCDIR%%/qt3d/qt3dinput-qactioninput-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qactioninput.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qactioninputdata-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qactioninputdata.html %%QT_DOCDIR%%/qt3d/qt3dinput-qanalogaxisinput-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qanalogaxisinput.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qanalogaxisinputdata-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qanalogaxisinputdata.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qanalogaxisinputprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qanalogaxisinputprivate.html %%QT_DOCDIR%%/qt3d/qt3dinput-qaxis-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qaxis.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qaxisdata-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qaxisdata.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qaxisprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qaxisprivate.html +%%QT_DOCDIR%%/qt3d/qt3dinput-qaxisaccumulator-members.html +%%QT_DOCDIR%%/qt3d/qt3dinput-qaxisaccumulator.html %%QT_DOCDIR%%/qt3d/qt3dinput-qaxissetting-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qaxissetting.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qaxissettingdata-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qaxissettingdata.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qaxissettingprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qaxissettingprivate.html %%QT_DOCDIR%%/qt3d/qt3dinput-qbuttonaxisinput-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qbuttonaxisinput.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qbuttonaxisinputdata-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qbuttonaxisinputdata.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qbuttonaxisinputprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qbuttonaxisinputprivate.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qgamepadinput-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qgamepadinput.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qgenericinputdevice-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qgenericinputdevice.html %%QT_DOCDIR%%/qt3d/qt3dinput-qinputaspect-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qinputaspect.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qinputaspectprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qinputaspectprivate.html %%QT_DOCDIR%%/qt3d/qt3dinput-qinputchord-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qinputchord.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qinputchorddata-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qinputchorddata.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qinputdeviceintegration-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qinputdeviceintegration.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qinputdeviceintegrationfactory-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qinputdeviceintegrationfactory.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qinputdeviceintegrationprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qinputdeviceintegrationprivate.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qinputdeviceplugin-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qinputdeviceplugin.html %%QT_DOCDIR%%/qt3d/qt3dinput-qinputsequence-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qinputsequence.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qinputsequencedata-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qinputsequencedata.html %%QT_DOCDIR%%/qt3d/qt3dinput-qinputsettings-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qinputsettings.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qinputsettingsdata-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qinputsettingsdata.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qinputsettingsprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qinputsettingsprivate.html %%QT_DOCDIR%%/qt3d/qt3dinput-qkeyboarddevice-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qkeyboarddevice.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qkeyboarddeviceprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qkeyboarddeviceprivate.html %%QT_DOCDIR%%/qt3d/qt3dinput-qkeyboardhandler-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qkeyboardhandler.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qkeyboardhandlerdata-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qkeyboardhandlerdata.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qkeyboardhandlerprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qkeyboardhandlerprivate.html %%QT_DOCDIR%%/qt3d/qt3dinput-qkeyevent-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qkeyevent.html %%QT_DOCDIR%%/qt3d/qt3dinput-qlogicaldevice-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qlogicaldevice.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qlogicaldevicedata-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qlogicaldevicedata.html %%QT_DOCDIR%%/qt3d/qt3dinput-qmousedevice-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qmousedevice.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qmousedevicedata-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qmousedevicedata.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qmousedeviceprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qmousedeviceprivate.html %%QT_DOCDIR%%/qt3d/qt3dinput-qmouseevent-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qmouseevent.html %%QT_DOCDIR%%/qt3d/qt3dinput-qmousehandler-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qmousehandler.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qmousehandlerdata-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qmousehandlerdata.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qmousehandlerprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qmousehandlerprivate.html %%QT_DOCDIR%%/qt3d/qt3dinput-qphysicaldevicecreatedchange-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qphysicaldevicecreatedchange.html %%QT_DOCDIR%%/qt3d/qt3dinput-qphysicaldevicecreatedchangebase-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qphysicaldevicecreatedchangebase.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qphysicaldevicecreatedchangebaseprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dinput-qphysicaldevicecreatedchangebaseprivate.html %%QT_DOCDIR%%/qt3d/qt3dinput-qwheelevent-members.html %%QT_DOCDIR%%/qt3d/qt3dinput-qwheelevent.html %%QT_DOCDIR%%/qt3d/qt3dinput.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-logic-callbackjob-members.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-logic-callbackjob.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-logic-executor-members.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-logic-executor.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-logic-frameupdateevent-members.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-logic-frameupdateevent.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-logic-handler-members.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-logic-handler.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-logic-handlerfunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-logic-handlerfunctor.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-logic-handlermanager-members.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-logic-handlermanager.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-logic-jobtypes.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-logic-manager-members.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-logic-manager.html %%QT_DOCDIR%%/qt3d/qt3dlogic-logic.html %%QT_DOCDIR%%/qt3d/qt3dlogic-module.html %%QT_DOCDIR%%/qt3d/qt3dlogic-qframeaction-members.html %%QT_DOCDIR%%/qt3d/qt3dlogic-qframeaction.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-qframeactionprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-qframeactionprivate.html %%QT_DOCDIR%%/qt3d/qt3dlogic-qlogicaspect-members.html %%QT_DOCDIR%%/qt3d/qt3dlogic-qlogicaspect.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-qlogicaspectprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3dlogic-qlogicaspectprivate.html %%QT_DOCDIR%%/qt3d/qt3dlogic.html %%QT_DOCDIR%%/qt3d/qt3drender-assimphelper.html -%%QT_DOCDIR%%/qt3d/qt3drender-assimpio-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-assimpio.html -%%QT_DOCDIR%%/qt3d/qt3drender-faceindices-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-faceindices.html +%%QT_DOCDIR%%/qt3d/qt3drender-assimpimporter-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-assimpimporter.html +%%QT_DOCDIR%%/qt3d/qt3drender-fbxgeometryloader-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-fbxgeometryloader.html %%QT_DOCDIR%%/qt3d/qt3drender-framegraph.html %%QT_DOCDIR%%/qt3d/qt3drender-functortype-members.html %%QT_DOCDIR%%/qt3d/qt3drender-functortype.html %%QT_DOCDIR%%/qt3d/qt3drender-geometry.html -%%QT_DOCDIR%%/qt3d/qt3drender-gltfio-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-gltfio.html -%%QT_DOCDIR%%/qt3d/qt3drender-graphicsapifilterdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-graphicsapifilterdata.html +%%QT_DOCDIR%%/qt3d/qt3drender-gltfexporter-gltfoptions-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-gltfexporter-gltfoptions.html +%%QT_DOCDIR%%/qt3d/qt3drender-gltfexporter-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-gltfexporter.html +%%QT_DOCDIR%%/qt3d/qt3drender-gltfgeometryloader-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-gltfgeometryloader.html +%%QT_DOCDIR%%/qt3d/qt3drender-gltfimporter-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-gltfimporter.html %%QT_DOCDIR%%/qt3d/qt3drender-module.html +%%QT_DOCDIR%%/qt3d/qt3drender-objgeometryloader-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-objgeometryloader.html +%%QT_DOCDIR%%/qt3d/qt3drender-plygeometryloader-element-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-plygeometryloader-element.html +%%QT_DOCDIR%%/qt3d/qt3drender-plygeometryloader-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-plygeometryloader-property-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-plygeometryloader-property.html +%%QT_DOCDIR%%/qt3d/qt3drender-plygeometryloader.html %%QT_DOCDIR%%/qt3d/qt3drender-propertyreaderinterface-members.html %%QT_DOCDIR%%/qt3d/qt3drender-propertyreaderinterface.html %%QT_DOCDIR%%/qt3d/qt3drender-protips.html -%%QT_DOCDIR%%/qt3d/qt3drender-qabstractcollisionqueryservice-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qabstractcollisionqueryservice.html -%%QT_DOCDIR%%/qt3d/qt3drender-qabstractcollisionqueryserviceprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qabstractcollisionqueryserviceprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qabstractfunctor-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qabstractfunctor.html %%QT_DOCDIR%%/qt3d/qt3drender-qabstractlight-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qabstractlight.html -%%QT_DOCDIR%%/qt3d/qt3drender-qabstractlightdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qabstractlightdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qabstractlightprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qabstractlightprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qabstracttexture-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qabstracttexture.html -%%QT_DOCDIR%%/qt3d/qt3drender-qabstracttexturedata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qabstracttexturedata.html %%QT_DOCDIR%%/qt3d/qt3drender-qabstracttextureimage-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qabstracttextureimage.html -%%QT_DOCDIR%%/qt3d/qt3drender-qabstracttextureimagedata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qabstracttextureimagedata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qabstracttextureimageprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qabstracttextureimageprivate.html -%%QT_DOCDIR%%/qt3d/qt3drender-qabstracttextureprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qabstracttextureprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qalphacoverage-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qalphacoverage.html %%QT_DOCDIR%%/qt3d/qt3drender-qalphatest-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qalphatest.html -%%QT_DOCDIR%%/qt3d/qt3drender-qalphatestdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qalphatestdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qalphatestprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qalphatestprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qattribute-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qattribute.html -%%QT_DOCDIR%%/qt3d/qt3drender-qattributedata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qattributedata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qattributeprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qattributeprivate.html -%%QT_DOCDIR%%/qt3d/qt3drender-qaxisalignedboundingbox-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qaxisalignedboundingbox.html %%QT_DOCDIR%%/qt3d/qt3drender-qblendequation-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qblendequation.html %%QT_DOCDIR%%/qt3d/qt3drender-qblendequationarguments-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qblendequationarguments.html -%%QT_DOCDIR%%/qt3d/qt3drender-qblendequationargumentsdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qblendequationargumentsdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qblendequationargumentsprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qblendequationargumentsprivate.html -%%QT_DOCDIR%%/qt3d/qt3drender-qblendequationdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qblendequationdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qblendequationprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qblendequationprivate.html -%%QT_DOCDIR%%/qt3d/qt3drender-qboundingsphere-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qboundingsphere.html -%%QT_DOCDIR%%/qt3d/qt3drender-qboundingvolume-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qboundingvolume.html -%%QT_DOCDIR%%/qt3d/qt3drender-qboundingvolumeprovider-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qboundingvolumeprovider.html %%QT_DOCDIR%%/qt3d/qt3drender-qbuffer-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qbuffer.html -%%QT_DOCDIR%%/qt3d/qt3drender-qbufferdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qbufferdata.html +%%QT_DOCDIR%%/qt3d/qt3drender-qbuffercapture-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-qbuffercapture.html %%QT_DOCDIR%%/qt3d/qt3drender-qbufferdatagenerator-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qbufferdatagenerator.html -%%QT_DOCDIR%%/qt3d/qt3drender-qbufferprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qbufferprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qcamera-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qcamera.html %%QT_DOCDIR%%/qt3d/qt3drender-qcameralens-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qcameralens.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcameralensdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcameralensdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcameralensprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcameralensprivate.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcameraprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcameraprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qcameraselector-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qcameraselector.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcameraselectordata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcameraselectordata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcameraselectorprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcameraselectorprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qclearbuffers-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qclearbuffers.html -%%QT_DOCDIR%%/qt3d/qt3drender-qclearbuffersdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qclearbuffersdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qclearbuffersprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qclearbuffersprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qclipplane-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qclipplane.html -%%QT_DOCDIR%%/qt3d/qt3drender-qclipplanedata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qclipplanedata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qclipplaneprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qclipplaneprivate.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcollisionqueryresult-hit-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcollisionqueryresult-hit.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcollisionqueryresult-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcollisionqueryresult.html %%QT_DOCDIR%%/qt3d/qt3drender-qcolormask-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qcolormask.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcolormaskdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcolormaskdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcolormaskprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcolormaskprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qcomputecommand-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qcomputecommand.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcomputecommanddata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcomputecommanddata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcomputecommandprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcomputecommandprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qcullface-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qcullface.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcullfacedata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcullfacedata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcullfaceprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qcullfaceprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qdepthtest-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qdepthtest.html -%%QT_DOCDIR%%/qt3d/qt3drender-qdepthtestdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qdepthtestdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qdepthtestprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qdepthtestprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qdirectionallight-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qdirectionallight.html -%%QT_DOCDIR%%/qt3d/qt3drender-qdirectionallightprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qdirectionallightprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qdispatchcompute-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qdispatchcompute.html -%%QT_DOCDIR%%/qt3d/qt3drender-qdispatchcomputedata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qdispatchcomputedata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qdispatchcomputeprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qdispatchcomputeprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qdithering-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qdithering.html %%QT_DOCDIR%%/qt3d/qt3drender-qeffect-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qeffect.html -%%QT_DOCDIR%%/qt3d/qt3drender-qeffectdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qeffectdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qeffectprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qeffectprivate.html +%%QT_DOCDIR%%/qt3d/qt3drender-qenvironmentlight-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-qenvironmentlight.html %%QT_DOCDIR%%/qt3d/qt3drender-qfilterkey-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qfilterkey.html -%%QT_DOCDIR%%/qt3d/qt3drender-qfilterkeydata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qfilterkeydata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qfilterkeyprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qfilterkeyprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qframegraphnode-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qframegraphnode.html -%%QT_DOCDIR%%/qt3d/qt3drender-qframegraphnodeprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qframegraphnodeprivate.html +%%QT_DOCDIR%%/qt3d/qt3drender-qframegraphnodecreatedchange-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-qframegraphnodecreatedchange.html +%%QT_DOCDIR%%/qt3d/qt3drender-qframegraphnodecreatedchangebase-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-qframegraphnodecreatedchangebase.html %%QT_DOCDIR%%/qt3d/qt3drender-qfrontface-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qfrontface.html -%%QT_DOCDIR%%/qt3d/qt3drender-qfrontfacedata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qfrontfacedata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qfrontfaceprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qfrontfaceprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qfrustumculling-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qfrustumculling.html %%QT_DOCDIR%%/qt3d/qt3drender-qgeometry-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qgeometry.html -%%QT_DOCDIR%%/qt3d/qt3drender-qgeometrydata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qgeometrydata.html %%QT_DOCDIR%%/qt3d/qt3drender-qgeometryfactory-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qgeometryfactory.html -%%QT_DOCDIR%%/qt3d/qt3drender-qgeometryprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qgeometryprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qgeometryrenderer-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qgeometryrenderer.html -%%QT_DOCDIR%%/qt3d/qt3drender-qgeometryrendererdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qgeometryrendererdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qgeometryrendererprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qgeometryrendererprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qgraphicsapifilter-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qgraphicsapifilter.html -%%QT_DOCDIR%%/qt3d/qt3drender-qgraphicsapifilterprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qgraphicsapifilterprivate.html -%%QT_DOCDIR%%/qt3d/qt3drender-qimagetexturedatafunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qimagetexturedatafunctor.html -%%QT_DOCDIR%%/qt3d/qt3drender-qitemmodelbuffer-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qitemmodelbuffer.html %%QT_DOCDIR%%/qt3d/qt3drender-qlayer-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qlayer.html %%QT_DOCDIR%%/qt3d/qt3drender-qlayerfilter-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qlayerfilter.html -%%QT_DOCDIR%%/qt3d/qt3drender-qlayerfilterdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qlayerfilterdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qlayerfilterprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qlayerfilterprivate.html -%%QT_DOCDIR%%/qt3d/qt3drender-qlayerprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qlayerprivate.html +%%QT_DOCDIR%%/qt3d/qt3drender-qlevelofdetail-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-qlevelofdetail.html +%%QT_DOCDIR%%/qt3d/qt3drender-qlevelofdetailboundingsphere-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-qlevelofdetailboundingsphere.html +%%QT_DOCDIR%%/qt3d/qt3drender-qlevelofdetailswitch-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-qlevelofdetailswitch.html %%QT_DOCDIR%%/qt3d/qt3drender-qmaterial-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qmaterial.html -%%QT_DOCDIR%%/qt3d/qt3drender-qmaterialdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qmaterialdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qmaterialprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qmaterialprivate.html +%%QT_DOCDIR%%/qt3d/qt3drender-qmemorybarrier-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-qmemorybarrier.html %%QT_DOCDIR%%/qt3d/qt3drender-qmesh-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qmesh.html -%%QT_DOCDIR%%/qt3d/qt3drender-qmeshprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qmeshprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qmultisampleantialiasing-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qmultisampleantialiasing.html %%QT_DOCDIR%%/qt3d/qt3drender-qnodepthmask-members.html @@ -1496,193 +1271,74 @@ %%QT_DOCDIR%%/qt3d/qt3drender-qnodraw.html %%QT_DOCDIR%%/qt3d/qt3drender-qobjectpicker-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qobjectpicker.html -%%QT_DOCDIR%%/qt3d/qt3drender-qobjectpickerdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qobjectpickerdata.html +%%QT_DOCDIR%%/qt3d/qt3drender-qpaintedtextureimage-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-qpaintedtextureimage.html %%QT_DOCDIR%%/qt3d/qt3drender-qparameter-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qparameter.html -%%QT_DOCDIR%%/qt3d/qt3drender-qparameterdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qparameterdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qparameterprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qparameterprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qpickevent-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qpickevent.html -%%QT_DOCDIR%%/qt3d/qt3drender-qpickeventprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qpickeventprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qpickingsettings-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qpickingsettings.html -%%QT_DOCDIR%%/qt3d/qt3drender-qpickingsettingsprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qpickingsettingsprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qpicktriangleevent-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qpicktriangleevent.html %%QT_DOCDIR%%/qt3d/qt3drender-qpointlight-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qpointlight.html -%%QT_DOCDIR%%/qt3d/qt3drender-qpointlightprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qpointlightprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qpointsize-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qpointsize.html -%%QT_DOCDIR%%/qt3d/qt3drender-qpointsizedata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qpointsizedata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qpointsizeprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qpointsizeprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qpolygonoffset-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qpolygonoffset.html -%%QT_DOCDIR%%/qt3d/qt3drender-qpolygonoffsetdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qpolygonoffsetdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qpolygonoffsetprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qpolygonoffsetprivate.html -%%QT_DOCDIR%%/qt3d/qt3drender-qray3d-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qray3d.html -%%QT_DOCDIR%%/qt3d/qt3drender-qraycastingservice-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qraycastingservice.html -%%QT_DOCDIR%%/qt3d/qt3drender-qraycastingserviceprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qraycastingserviceprivate-query-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qraycastingserviceprivate-query.html -%%QT_DOCDIR%%/qt3d/qt3drender-qraycastingserviceprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qrenderaspect-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qrenderaspect.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderaspectprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderaspectprivate.html +%%QT_DOCDIR%%/qt3d/qt3drender-qrendercapture-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-qrendercapture.html +%%QT_DOCDIR%%/qt3d/qt3drender-qrendercapturereply-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-qrendercapturereply.html %%QT_DOCDIR%%/qt3d/qt3drender-qrenderpass-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qrenderpass.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderpassdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderpassdata.html %%QT_DOCDIR%%/qt3d/qt3drender-qrenderpassfilter-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qrenderpassfilter.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderpassfilterdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderpassfilterdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderpassfilterprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderpassfilterprivate.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderpassprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderpassprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qrendersettings-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qrendersettings.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendersettingsdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendersettingsdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendersettingsprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendersettingsprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qrenderstate-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qrenderstate.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderstatecreatedchange-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderstatecreatedchange.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderstatecreatedchangebase-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderstatecreatedchangebase.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderstateprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderstateprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qrenderstateset-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qrenderstateset.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderstatesetdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderstatesetdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderstatesetprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrenderstatesetprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qrendersurfaceselector-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qrendersurfaceselector.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendersurfaceselectordata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendersurfaceselectordata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendersurfaceselectorprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendersurfaceselectorprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qrendertarget-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qrendertarget.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendertargetdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendertargetdata.html %%QT_DOCDIR%%/qt3d/qt3drender-qrendertargetoutput-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qrendertargetoutput.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendertargetoutputdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendertargetoutputdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendertargetoutputprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendertargetoutputprivate.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendertargetprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendertargetprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qrendertargetselector-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qrendertargetselector.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendertargetselectordata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendertargetselectordata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendertargetselectorprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qrendertargetselectorprivate.html -%%QT_DOCDIR%%/qt3d/qt3drender-qsceneiofactory-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qsceneiofactory.html -%%QT_DOCDIR%%/qt3d/qt3drender-qsceneiohandler-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qsceneiohandler.html -%%QT_DOCDIR%%/qt3d/qt3drender-qsceneioplugin-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qsceneioplugin.html %%QT_DOCDIR%%/qt3d/qt3drender-qsceneloader-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qsceneloader.html -%%QT_DOCDIR%%/qt3d/qt3drender-qsceneloaderdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qsceneloaderdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qsceneloaderprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qsceneloaderprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qscissortest-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qscissortest.html -%%QT_DOCDIR%%/qt3d/qt3drender-qscissortestdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qscissortestdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qscissortestprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qscissortestprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qseamlesscubemap-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qseamlesscubemap.html %%QT_DOCDIR%%/qt3d/qt3drender-qshaderdata-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qshaderdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qshaderdatadata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qshaderdataprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qshaderdataprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qshaderprogram-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qshaderprogram.html -%%QT_DOCDIR%%/qt3d/qt3drender-qshaderprogramdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qshaderprogramdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qshaderprogramprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qshaderprogramprivate.html -%%QT_DOCDIR%%/qt3d/qt3drender-qsortcriterion-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qsortcriterion.html %%QT_DOCDIR%%/qt3d/qt3drender-qsortpolicy-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qsortpolicy.html -%%QT_DOCDIR%%/qt3d/qt3drender-qsortpolicydata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qsortpolicydata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qsortpolicyprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qsortpolicyprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qspotlight-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qspotlight.html -%%QT_DOCDIR%%/qt3d/qt3drender-qspotlightprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qspotlightprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qstencilmask-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qstencilmask.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstencilmaskdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstencilmaskdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstencilmaskprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstencilmaskprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qstenciloperation-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qstenciloperation.html %%QT_DOCDIR%%/qt3d/qt3drender-qstenciloperationarguments-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qstenciloperationarguments.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstenciloperationargumentsdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstenciloperationargumentsdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstenciloperationargumentsprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstenciloperationargumentsprivate.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstenciloperationdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstenciloperationdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstenciloperationprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstenciloperationprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qstenciltest-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qstenciltest.html %%QT_DOCDIR%%/qt3d/qt3drender-qstenciltestarguments-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qstenciltestarguments.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstenciltestargumentsdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstenciltestargumentsdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstenciltestargumentsprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstenciltestargumentsprivate.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstenciltestdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstenciltestdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstenciltestprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qstenciltestprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qtechnique-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qtechnique.html -%%QT_DOCDIR%%/qt3d/qt3drender-qtechniquedata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qtechniquedata.html %%QT_DOCDIR%%/qt3d/qt3drender-qtechniquefilter-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qtechniquefilter.html -%%QT_DOCDIR%%/qt3d/qt3drender-qtechniquefilterdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qtechniquefilterdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qtechniquefilterprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qtechniquefilterprivate.html -%%QT_DOCDIR%%/qt3d/qt3drender-qtechniqueprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qtechniqueprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qtexture1d-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qtexture1d.html %%QT_DOCDIR%%/qt3d/qt3drender-qtexture1darray-members.html @@ -1705,8 +1361,6 @@ %%QT_DOCDIR%%/qt3d/qt3drender-qtexturecubemaparray.html %%QT_DOCDIR%%/qt3d/qt3drender-qtexturedata-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qtexturedata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qtexturefromsourcegenerator-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qtexturefromsourcegenerator.html %%QT_DOCDIR%%/qt3d/qt3drender-qtexturegenerator-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qtexturegenerator.html %%QT_DOCDIR%%/qt3d/qt3drender-qtextureimage-members.html @@ -1715,377 +1369,21 @@ %%QT_DOCDIR%%/qt3d/qt3drender-qtextureimagedata.html %%QT_DOCDIR%%/qt3d/qt3drender-qtextureimagedatagenerator-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qtextureimagedatagenerator.html -%%QT_DOCDIR%%/qt3d/qt3drender-qtextureimagedataprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qtextureimagedataprivate.html -%%QT_DOCDIR%%/qt3d/qt3drender-qtextureimageprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qtextureimageprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qtextureloader-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qtextureloader.html -%%QT_DOCDIR%%/qt3d/qt3drender-qtextureloaderprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qtextureloaderprivate.html %%QT_DOCDIR%%/qt3d/qt3drender-qtexturerectangle-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qtexturerectangle.html %%QT_DOCDIR%%/qt3d/qt3drender-qtexturewrapmode-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qtexturewrapmode.html -%%QT_DOCDIR%%/qt3d/qt3drender-qurlhelper-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qurlhelper.html +%%QT_DOCDIR%%/qt3d/qt3drender-quick-qscene2d-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-quick-qscene2d.html %%QT_DOCDIR%%/qt3d/qt3drender-qviewport-members.html %%QT_DOCDIR%%/qt3d/qt3drender-qviewport.html -%%QT_DOCDIR%%/qt3d/qt3drender-qviewportdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qviewportdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-qviewportprivate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-qviewportprivate.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-abstractrenderer-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-abstractrenderer.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-alphacoverage-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-alphacoverage.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-alphafunc-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-alphafunc.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-attachment-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-attachment.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-attachmentmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-attachmentmanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-attachmentpack-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-attachmentpack.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-attribute-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-attribute.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-attributemanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-attributemanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-backendnode-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-backendnode.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-blendequation-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-blendequation.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-blendequationarguments-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-blendequationarguments.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-blocktoubo-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-blocktoubo.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-buffer-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-buffer.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-bufferfunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-bufferfunctor.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-buffermanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-buffermanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-calcgeometrytrianglevolumes-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-calcgeometrytrianglevolumes.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-calculateboundingvolumejob-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-calculateboundingvolumejob.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-cameralens-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-cameralens.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-cameramanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-cameramanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-cameraselector-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-cameraselector.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-clearbufferinfo-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-clearbufferinfo.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-clearbuffers-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-clearbuffers.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-clipplane-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-clipplane.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-colormask-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-colormask.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-computecommand-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-computecommand.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-computecommandmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-computecommandmanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-cullface-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-cullface.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-depthtest-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-depthtest.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-dispatchcompute-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-dispatchcompute.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-dithering-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-dithering.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-effect-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-effect.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-effectmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-effectmanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-entity-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-entity.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-entitymanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-entitymanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-expandboundingvolumejob-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-expandboundingvolumejob.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-filterentitybycomponentjob-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-filterentitybycomponentjob.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-filterkey-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-filterkey.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-filterkeymanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-filterkeymanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-filterlayerentityjob-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-filterlayerentityjob.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-framecleanupjob-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-framecleanupjob.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-framegraphmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-framegraphmanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-framegraphnode-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-framegraphnode.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-framegraphnodefunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-framegraphnodefunctor.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-framegraphvisitor-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-framegraphvisitor.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-framepreparationjob-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-framepreparationjob.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-frontface-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-frontface.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-frustumculling-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-frustumculling.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-frustumcullingjob-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-frustumcullingjob.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-genericlambdajob-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-genericlambdajob.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-genericstate-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-genericstate.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-geometry-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-geometry.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-geometrymanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-geometrymanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-geometryrenderer-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-geometryrenderer.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-geometryrendererfunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-geometryrendererfunctor.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-geometryrenderermanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-geometryrenderermanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-glbuffer-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-glbuffer.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-glbuffermanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-glbuffermanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-graphicscontext-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-graphicscontext.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-graphicshelperes2-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-graphicshelperes2.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-graphicshelperes3-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-graphicshelperes3.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-graphicshelpergl2-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-graphicshelpergl2.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-graphicshelpergl3-3-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-graphicshelpergl3-3.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-graphicshelpergl3-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-graphicshelpergl3.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-graphicshelpergl4-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-graphicshelpergl4.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-graphicshelperinterface-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-graphicshelperinterface.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-jobtypes.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-layer-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-layer.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-layerfilternode-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-layerfilternode.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-layermanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-layermanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-light-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-light.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-lightgatherer-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-lightgatherer.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-lightmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-lightmanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-lightsource-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-lightsource.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-loadbufferjob-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-loadbufferjob.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-loadgeometryjob-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-loadgeometryjob.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-loadscenejob-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-loadscenejob.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-loadtexturedatajob-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-loadtexturedatajob.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-material-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-material.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-materialmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-materialmanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-materialparametergathererjob-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-materialparametergathererjob.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-matrixmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-matrixmanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-msaaenabled-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-msaaenabled.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-nodefunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-nodefunctor.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-nodemanagers-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-nodemanagers.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-nodepthmask-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-nodepthmask.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-nodraw-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-nodraw.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-objectpicker-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-objectpicker.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-objectpickermanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-objectpickermanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-openglvertexarrayobject-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-openglvertexarrayobject.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-parameter-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-parameter.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-parameterinfo-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-parameterinfo.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-parametermanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-parametermanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-parameterpack-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-parameterpack.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-pickboundingvolumejob-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-pickboundingvolumejob.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-pickeventfilter-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-pickeventfilter.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-plane-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-plane.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-platformsurfacefilter-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-platformsurfacefilter.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-pointsize-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-pointsize.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-polygonoffset-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-polygonoffset.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-quniformvalue-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-quniformvalue-textureidunit-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-quniformvalue-textureidunit.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-quniformvalue.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendercommand-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendercommand-sortingtype-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendercommand-sortingtype.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendercommand.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderconfiguration-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderconfiguration.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderentityfunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderentityfunctor.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderer-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderer-viewsubmissionresultdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderer-viewsubmissionresultdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderer.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderlightfunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderlightfunctor.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderpass-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderpass.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderpassfilter-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderpassfilter.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderpassmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderpassmanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderpassparameterdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderpassparameterdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderqueue-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderqueue.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderscenefunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderscenefunctor.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendersettings-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendersettings.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendersettingsfunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendersettingsfunctor.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendershaderdatafunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendershaderdatafunctor.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderstateimpl-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderstateimpl.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderstatemanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderstatemanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderstatenode-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderstatenode.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderstateset-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderstateset.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendersurfaceselector-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendersurfaceselector.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendertarget-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendertarget.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendertargetmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendertargetmanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendertargetoutput-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendertargetoutput.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendertargetselector-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-rendertargetselector.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderthread-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderthread.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderview-innerdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderview-innerdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderview-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderview.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderviewbuilderjob-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderviewbuilderjob.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderviewinitializerjob-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-renderviewinitializerjob.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-scene-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-scene.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-scenemanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-scenemanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-scissortest-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-scissortest.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-seamlesscubemap-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-seamlesscubemap.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-shader-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-shader.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-shaderattribute-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-shaderattribute.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-shadercache-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-shadercache.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-shaderdata-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-shaderdata.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-shaderdatamanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-shaderdatamanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-shadermanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-shadermanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-shaderparameterpack-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-shaderparameterpack-namedtexture-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-shaderparameterpack-namedtexture.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-shaderparameterpack.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-sortpolicy-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-sortpolicy.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-sphere-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-sphere.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-statesetnode-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-statesetnode.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-statevariant-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-statevariant-u-data-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-statevariant-u-data.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-statevariant.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-stencilmask-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-stencilmask.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-stencilop-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-stencilop.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-stenciltest-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-stenciltest.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-stringtoint-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-stringtoint.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-surfacelocker-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-surfacelocker.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-technique-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-technique.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-techniquefilter-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-techniquefilter.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-techniquemanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-techniquemanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-texture-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-texture.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-texturedatamanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-texturedatamanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-texturefunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-texturefunctor.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-textureimage-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-textureimage.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-textureimagefunctor-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-textureimagefunctor.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-textureimagemanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-textureimagemanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-texturemanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-texturemanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-transform-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-transform.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-transformmanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-transformmanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-triangleboundingvolume-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-triangleboundingvolume.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-trianglesextractor-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-trianglesextractor.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-trianglesvisitor-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-trianglesvisitor.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-uniformblockvaluebuilder-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-uniformblockvaluebuilder.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-updateworldboundingvolumejob-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-updateworldboundingvolumejob.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-updateworldtransformjob-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-updateworldtransformjob.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-vaomanager-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-vaomanager.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-viewportnode-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-viewportnode.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-vsyncframeadvanceservice-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-render-vsyncframeadvanceservice.html %%QT_DOCDIR%%/qt3d/qt3drender-render.html -%%QT_DOCDIR%%/qt3d/qt3drender-textureloadinghelper-members.html -%%QT_DOCDIR%%/qt3d/qt3drender-textureloadinghelper.html +%%QT_DOCDIR%%/qt3d/qt3drender-stlgeometryloader-members.html +%%QT_DOCDIR%%/qt3d/qt3drender-stlgeometryloader.html %%QT_DOCDIR%%/qt3d/qt3drender.html +%%QT_DOCDIR%%/qt3d/qt3dscene2d-module.html %%QT_DOCDIR%%/qt3d/style/offline-simple.css %%QT_DOCDIR%%/qt3d/style/offline.css %%QT_DOCDIR%%/qtandroidextras.qch @@ -2198,9 +1496,10 @@ %%QT_DOCDIR%%/qtbluetooth/images/bullet_sq.png %%QT_DOCDIR%%/qtbluetooth/images/chat-view.png %%QT_DOCDIR%%/qtbluetooth/images/devicescan.png -%%QT_DOCDIR%%/qtbluetooth/images/heartratefound.png -%%QT_DOCDIR%%/qtbluetooth/images/heartratemonitor.png -%%QT_DOCDIR%%/qtbluetooth/images/heartrateresults.png +%%QT_DOCDIR%%/qtbluetooth/images/heartgame-result.png +%%QT_DOCDIR%%/qtbluetooth/images/heartgame-running.png +%%QT_DOCDIR%%/qtbluetooth/images/heartgame-search.png +%%QT_DOCDIR%%/qtbluetooth/images/heartgame-start.png %%QT_DOCDIR%%/qtbluetooth/images/home.png %%QT_DOCDIR%%/qtbluetooth/images/ico_note.png %%QT_DOCDIR%%/qtbluetooth/images/ico_note_attention.png @@ -2279,6 +1578,7 @@ %%QT_DOCDIR%%/qtbluetooth/qml-qtbluetooth-bluetoothservice.html %%QT_DOCDIR%%/qtbluetooth/qml-qtbluetooth-bluetoothsocket-members.html %%QT_DOCDIR%%/qtbluetooth/qml-qtbluetooth-bluetoothsocket.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-attribution-bluez.html %%QT_DOCDIR%%/qtbluetooth/qtbluetooth-btchat-btchat-pro.html %%QT_DOCDIR%%/qtbluetooth/qtbluetooth-btchat-chat-cpp.html %%QT_DOCDIR%%/qtbluetooth/qtbluetooth-btchat-chat-h.html @@ -2322,22 +1622,36 @@ %%QT_DOCDIR%%/qtbluetooth/qtbluetooth-chat-inputbox-qml.html %%QT_DOCDIR%%/qtbluetooth/qtbluetooth-chat-qmlchat-cpp.html %%QT_DOCDIR%%/qtbluetooth/qtbluetooth-chat-search-qml.html -%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartlistener-assets-button-qml.html -%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartlistener-assets-dialog-qml.html -%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartlistener-assets-draw-js.html -%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartlistener-assets-home-qml.html -%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartlistener-assets-main-qml.html -%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartlistener-assets-monitor-qml.html -%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartlistener-assets-point-qml.html -%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartlistener-assets-results-qml.html -%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartlistener-deviceinfo-cpp.html -%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartlistener-deviceinfo-h.html -%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartlistener-example.html -%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartlistener-heartlistener-pro.html -%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartlistener-heartrate-cpp.html -%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartlistener-heartrate-h.html -%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartlistener-main-cpp.html -%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartlistener-resources-qrc.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-bluetoothbaseclass-cpp.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-bluetoothbaseclass-h.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-connectionhandler-cpp.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-connectionhandler-h.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-devicefinder-cpp.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-devicefinder-h.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-devicehandler-cpp.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-devicehandler-h.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-deviceinfo-cpp.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-deviceinfo-h.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-example.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-heartrate-game-pro.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-heartrate-global-h.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-images-qrc.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-main-cpp.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-qml-app-qml.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-qml-bluetoothalarmdialog-qml.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-qml-bottomline-qml.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-qml-connect-qml.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-qml-gamebutton-qml.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-qml-gamepage-qml.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-qml-gamesettings-qml.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-qml-main-qml.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-qml-measure-qml.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-qml-qmldir.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-qml-qrc.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-qml-splashscreen-qml.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-qml-stats-qml.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-qml-statslabel-qml.html +%%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-game-qml-titlebar-qml.html %%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-server-example.html %%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-server-heartrate-server-pro.html %%QT_DOCDIR%%/qtbluetooth/qtbluetooth-heartrate-server-main-cpp.html @@ -2571,496 +1885,6 @@ %%QT_DOCDIR%%/qtcanvas3d/qtcanvas3d.qhp.sha1 %%QT_DOCDIR%%/qtcanvas3d/style/offline-simple.css %%QT_DOCDIR%%/qtcanvas3d/style/offline.css -%%QT_DOCDIR%%/qtcharts.qch -%%QT_DOCDIR%%/qtcharts/charts-examples.html -%%QT_DOCDIR%%/qtcharts/examples-manifest.xml -%%QT_DOCDIR%%/qtcharts/images/api_category_axis.png -%%QT_DOCDIR%%/qtcharts/images/api_datatime_axis.png -%%QT_DOCDIR%%/qtcharts/images/arrow_bc.png -%%QT_DOCDIR%%/qtcharts/images/bgrContent.png -%%QT_DOCDIR%%/qtcharts/images/btn_next.png -%%QT_DOCDIR%%/qtcharts/images/btn_prev.png -%%QT_DOCDIR%%/qtcharts/images/bullet_dn.png -%%QT_DOCDIR%%/qtcharts/images/bullet_sq.png -%%QT_DOCDIR%%/qtcharts/images/examples_areachart.png -%%QT_DOCDIR%%/qtcharts/images/examples_audio.png -%%QT_DOCDIR%%/qtcharts/images/examples_barchart.png -%%QT_DOCDIR%%/qtcharts/images/examples_barmodelmapper.png -%%QT_DOCDIR%%/qtcharts/images/examples_boxplotchart.png -%%QT_DOCDIR%%/qtcharts/images/examples_callout.png -%%QT_DOCDIR%%/qtcharts/images/examples_chartthemes_blue_cerulean.png -%%QT_DOCDIR%%/qtcharts/images/examples_chartthemes_brown_sand.png -%%QT_DOCDIR%%/qtcharts/images/examples_chartthemes_light.png -%%QT_DOCDIR%%/qtcharts/images/examples_customchart.png -%%QT_DOCDIR%%/qtcharts/images/examples_datetimeaxis.png -%%QT_DOCDIR%%/qtcharts/images/examples_donutbreakdown.png -%%QT_DOCDIR%%/qtcharts/images/examples_donutchart.png -%%QT_DOCDIR%%/qtcharts/images/examples_dynamicspline1.png -%%QT_DOCDIR%%/qtcharts/images/examples_dynamicspline2.png -%%QT_DOCDIR%%/qtcharts/images/examples_horizontalbarchart.png -%%QT_DOCDIR%%/qtcharts/images/examples_horizontalpercentbarchart.png -%%QT_DOCDIR%%/qtcharts/images/examples_horizontalstackedbarchart.png -%%QT_DOCDIR%%/qtcharts/images/examples_legend_detach.png -%%QT_DOCDIR%%/qtcharts/images/examples_legend_detach2.png -%%QT_DOCDIR%%/qtcharts/images/examples_legendmarkers.png -%%QT_DOCDIR%%/qtcharts/images/examples_lineandbar.png -%%QT_DOCDIR%%/qtcharts/images/examples_linechart.png -%%QT_DOCDIR%%/qtcharts/images/examples_logvalueaxis.png -%%QT_DOCDIR%%/qtcharts/images/examples_modeldata.png -%%QT_DOCDIR%%/qtcharts/images/examples_multiaxis.png -%%QT_DOCDIR%%/qtcharts/images/examples_nesteddonuts.png -%%QT_DOCDIR%%/qtcharts/images/examples_openglseries.png -%%QT_DOCDIR%%/qtcharts/images/examples_percentbarchart.png -%%QT_DOCDIR%%/qtcharts/images/examples_percentbarchart_legend.png -%%QT_DOCDIR%%/qtcharts/images/examples_piechart.png -%%QT_DOCDIR%%/qtcharts/images/examples_piechartdrill1.png -%%QT_DOCDIR%%/qtcharts/images/examples_piechartdrill2.png -%%QT_DOCDIR%%/qtcharts/images/examples_polarchart.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlaxes1.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlaxes2.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlaxes3.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlboxplot.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlchart1.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlchart10.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlchart11.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlchart12.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlchart2.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlchart3.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlchart4.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlchart5.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlchart6.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlchart7.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlchart8.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlchart9.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlcustomizations.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlcustomlegend1.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlcustomlegend2.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlcustomlegend3.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlf1legends.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmloscilloscope.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlpiechart.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlpolarchart1.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlpolarchart2.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlpolarchart3.png -%%QT_DOCDIR%%/qtcharts/images/examples_qmlweather.png -%%QT_DOCDIR%%/qtcharts/images/examples_scatterchart.png -%%QT_DOCDIR%%/qtcharts/images/examples_scatterinteractions.png -%%QT_DOCDIR%%/qtcharts/images/examples_splinechart.png -%%QT_DOCDIR%%/qtcharts/images/examples_stackedbarchart.png -%%QT_DOCDIR%%/qtcharts/images/examples_stackedbarchartdrilldown1.png -%%QT_DOCDIR%%/qtcharts/images/examples_stackedbarchartdrilldown2.png -%%QT_DOCDIR%%/qtcharts/images/examples_temperaturerecords.png -%%QT_DOCDIR%%/qtcharts/images/examples_zoomlinechart1.png -%%QT_DOCDIR%%/qtcharts/images/examples_zoomlinechart2.png -%%QT_DOCDIR%%/qtcharts/images/home.png -%%QT_DOCDIR%%/qtcharts/images/ico_note.png -%%QT_DOCDIR%%/qtcharts/images/ico_note_attention.png -%%QT_DOCDIR%%/qtcharts/images/ico_out.png -%%QT_DOCDIR%%/qtcharts/images/logo.png -%%QT_DOCDIR%%/qtcharts/images/piechart_customization.png -%%QT_DOCDIR%%/qtcharts/qabstractaxis-members.html -%%QT_DOCDIR%%/qtcharts/qabstractaxis.html -%%QT_DOCDIR%%/qtcharts/qabstractbarseries-members.html -%%QT_DOCDIR%%/qtcharts/qabstractbarseries.html -%%QT_DOCDIR%%/qtcharts/qabstractseries-members.html -%%QT_DOCDIR%%/qtcharts/qabstractseries.html -%%QT_DOCDIR%%/qtcharts/qarealegendmarker-members.html -%%QT_DOCDIR%%/qtcharts/qarealegendmarker.html -%%QT_DOCDIR%%/qtcharts/qareaseries-members.html -%%QT_DOCDIR%%/qtcharts/qareaseries.html -%%QT_DOCDIR%%/qtcharts/qbarcategoryaxis-members.html -%%QT_DOCDIR%%/qtcharts/qbarcategoryaxis.html -%%QT_DOCDIR%%/qtcharts/qbarlegendmarker-members.html -%%QT_DOCDIR%%/qtcharts/qbarlegendmarker.html -%%QT_DOCDIR%%/qtcharts/qbarseries-members.html -%%QT_DOCDIR%%/qtcharts/qbarseries.html -%%QT_DOCDIR%%/qtcharts/qbarset-members.html -%%QT_DOCDIR%%/qtcharts/qbarset.html -%%QT_DOCDIR%%/qtcharts/qboxplotlegendmarker-members.html -%%QT_DOCDIR%%/qtcharts/qboxplotlegendmarker.html -%%QT_DOCDIR%%/qtcharts/qboxplotseries-members.html -%%QT_DOCDIR%%/qtcharts/qboxplotseries.html -%%QT_DOCDIR%%/qtcharts/qboxset-members.html -%%QT_DOCDIR%%/qtcharts/qboxset.html -%%QT_DOCDIR%%/qtcharts/qcategoryaxis-members.html -%%QT_DOCDIR%%/qtcharts/qcategoryaxis.html -%%QT_DOCDIR%%/qtcharts/qchart-members.html -%%QT_DOCDIR%%/qtcharts/qchart.html -%%QT_DOCDIR%%/qtcharts/qchartview-members.html -%%QT_DOCDIR%%/qtcharts/qchartview.html -%%QT_DOCDIR%%/qtcharts/qdatetimeaxis-members.html -%%QT_DOCDIR%%/qtcharts/qdatetimeaxis.html -%%QT_DOCDIR%%/qtcharts/qhbarmodelmapper-members.html -%%QT_DOCDIR%%/qtcharts/qhbarmodelmapper.html -%%QT_DOCDIR%%/qtcharts/qhorizontalbarseries-members.html -%%QT_DOCDIR%%/qtcharts/qhorizontalbarseries.html -%%QT_DOCDIR%%/qtcharts/qhorizontalpercentbarseries-members.html -%%QT_DOCDIR%%/qtcharts/qhorizontalpercentbarseries.html -%%QT_DOCDIR%%/qtcharts/qhorizontalstackedbarseries-members.html -%%QT_DOCDIR%%/qtcharts/qhorizontalstackedbarseries.html -%%QT_DOCDIR%%/qtcharts/qhpiemodelmapper-members.html -%%QT_DOCDIR%%/qtcharts/qhpiemodelmapper.html -%%QT_DOCDIR%%/qtcharts/qhxymodelmapper-members.html -%%QT_DOCDIR%%/qtcharts/qhxymodelmapper.html -%%QT_DOCDIR%%/qtcharts/qlegend-members.html -%%QT_DOCDIR%%/qtcharts/qlegend.html -%%QT_DOCDIR%%/qtcharts/qlegendmarker-members.html -%%QT_DOCDIR%%/qtcharts/qlegendmarker.html -%%QT_DOCDIR%%/qtcharts/qlineseries-members.html -%%QT_DOCDIR%%/qtcharts/qlineseries.html -%%QT_DOCDIR%%/qtcharts/qlogvalueaxis-members.html -%%QT_DOCDIR%%/qtcharts/qlogvalueaxis.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-abstractaxis-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-abstractaxis.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-abstractbarseries-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-abstractbarseries.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-abstractseries-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-abstractseries.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-areaseries-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-areaseries.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-barcategoryaxis-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-barcategoryaxis.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-barseries-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-barseries.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-barset-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-barset.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-boxplotseries-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-boxplotseries.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-boxset-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-boxset.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-categoryaxis-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-categoryaxis.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-categoryrange-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-categoryrange.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-chartview-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-chartview.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-datetimeaxis-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-datetimeaxis.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-hbarmodelmapper-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-hbarmodelmapper.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-horizontalbarseries-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-horizontalbarseries.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-horizontalpercentbarseries-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-horizontalpercentbarseries.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-horizontalstackedbarseries-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-horizontalstackedbarseries.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-hpiemodelmapper-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-hpiemodelmapper.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-hxymodelmapper-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-hxymodelmapper.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-legend-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-legend.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-lineseries-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-lineseries.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-logvalueaxis-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-logvalueaxis.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-margins-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-margins.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-percentbarseries-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-percentbarseries.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-pieseries-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-pieseries.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-pieslice-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-pieslice.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-polarchartview-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-polarchartview.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-scatterseries-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-scatterseries.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-splineseries-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-splineseries.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-stackedbarseries-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-stackedbarseries.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-valueaxis-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-valueaxis.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-vbarmodelmapper-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-vbarmodelmapper.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-vboxplotmodelmapper-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-vboxplotmodelmapper.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-vpiemodelmapper-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-vpiemodelmapper.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-vxymodelmapper-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-vxymodelmapper.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-xypoint-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-xypoint.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-xyseries-members.html -%%QT_DOCDIR%%/qtcharts/qml-qtcharts-xyseries.html -%%QT_DOCDIR%%/qtcharts/qpercentbarseries-members.html -%%QT_DOCDIR%%/qtcharts/qpercentbarseries.html -%%QT_DOCDIR%%/qtcharts/qpielegendmarker-members.html -%%QT_DOCDIR%%/qtcharts/qpielegendmarker.html -%%QT_DOCDIR%%/qtcharts/qpieseries-members.html -%%QT_DOCDIR%%/qtcharts/qpieseries.html -%%QT_DOCDIR%%/qtcharts/qpieslice-members.html -%%QT_DOCDIR%%/qtcharts/qpieslice.html -%%QT_DOCDIR%%/qtcharts/qpolarchart-members.html -%%QT_DOCDIR%%/qtcharts/qpolarchart.html -%%QT_DOCDIR%%/qtcharts/qscatterseries-members.html -%%QT_DOCDIR%%/qtcharts/qscatterseries.html -%%QT_DOCDIR%%/qtcharts/qsplineseries-members.html -%%QT_DOCDIR%%/qtcharts/qsplineseries.html -%%QT_DOCDIR%%/qtcharts/qstackedbarseries-members.html -%%QT_DOCDIR%%/qtcharts/qstackedbarseries.html -%%QT_DOCDIR%%/qtcharts/qt-charts-module.html -%%QT_DOCDIR%%/qtcharts/qtcharts-areachart-areachart-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-areachart-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-areachart-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-audio-audio-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-audio-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-audio-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-audio-widget-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-audio-widget-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-audio-xyseriesiodevice-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-audio-xyseriesiodevice-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-barchart-barchart-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-barchart-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-barchart-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-barmodelmapper-barmodelmapper-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-barmodelmapper-customtablemodel-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-barmodelmapper-customtablemodel-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-barmodelmapper-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-barmodelmapper-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-barmodelmapper-tablewidget-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-barmodelmapper-tablewidget-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-boxplotchart-boxdatareader-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-boxplotchart-boxdatareader-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-boxplotchart-boxplotchart-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-boxplotchart-boxplotdata-qrc.html -%%QT_DOCDIR%%/qtcharts/qtcharts-boxplotchart-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-boxplotchart-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-callout-callout-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-callout-callout-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-callout-callout-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-callout-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-callout-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-callout-view-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-callout-view-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-chartthemes-chartthemes-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-chartthemes-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-chartthemes-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-chartthemes-themewidget-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-chartthemes-themewidget-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-customchart-customchart-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-customchart-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-customchart-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-datetimeaxis-datetimeaxis-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-datetimeaxis-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-datetimeaxis-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-datetimeaxis-sundata-qrc.html -%%QT_DOCDIR%%/qtcharts/qtcharts-donutbreakdown-donutbreakdown-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-donutbreakdown-donutbreakdownchart-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-donutbreakdown-donutbreakdownchart-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-donutbreakdown-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-donutbreakdown-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-donutbreakdown-mainslice-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-donutbreakdown-mainslice-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-donutchart-donutchart-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-donutchart-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-donutchart-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-dynamicspline-chart-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-dynamicspline-chart-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-dynamicspline-dynamicspline-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-dynamicspline-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-dynamicspline-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-horizontalbarchart-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-horizontalbarchart-horizontalbarchart-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-horizontalbarchart-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-horizontalpercentbarchart-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-horizontalpercentbarchart-horizontalpercentbarchart-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-horizontalpercentbarchart-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-horizontalstackedbarchart-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-horizontalstackedbarchart-horizontalstackedbarchart-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-horizontalstackedbarchart-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-index.html -%%QT_DOCDIR%%/qtcharts/qtcharts-legend-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-legend-legend-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-legend-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-legend-mainwidget-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-legend-mainwidget-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-legendmarkers-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-legendmarkers-legendmarkers-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-legendmarkers-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-legendmarkers-mainwidget-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-legendmarkers-mainwidget-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-lineandbar-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-lineandbar-lineandbar-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-lineandbar-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-linechart-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-linechart-linechart-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-linechart-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-logvalueaxis-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-logvalueaxis-logvalueaxis-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-logvalueaxis-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-modeldata-customtablemodel-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-modeldata-customtablemodel-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-modeldata-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-modeldata-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-modeldata-modeldata-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-modeldata-tablewidget-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-modeldata-tablewidget-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-multiaxis-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-multiaxis-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-multiaxis-multiaxis-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-nesteddonuts-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-nesteddonuts-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-nesteddonuts-nesteddonuts-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-nesteddonuts-widget-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-nesteddonuts-widget-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-openglseries-datasource-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-openglseries-datasource-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-openglseries-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-openglseries-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-openglseries-openglseries-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-percentbarchart-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-percentbarchart-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-percentbarchart-percentbarchart-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechart-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechart-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechart-piechart-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechartcustomization-brushtool-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechartcustomization-brushtool-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechartcustomization-customslice-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechartcustomization-customslice-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechartcustomization-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechartcustomization-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechartcustomization-mainwidget-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechartcustomization-mainwidget-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechartcustomization-pentool-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechartcustomization-pentool-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechartcustomization-piechartcustomization-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechartdrilldown-drilldownchart-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechartdrilldown-drilldownchart-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechartdrilldown-drilldownslice-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechartdrilldown-drilldownslice-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechartdrilldown-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechartdrilldown-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-piechartdrilldown-piechartdrilldown-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-polarchart-chartview-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-polarchart-chartview-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-polarchart-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-polarchart-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-polarchart-polarchart-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlaxes-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlaxes-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlaxes-qml-qmlaxes-main-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlaxes-qml-qmlaxes-view1-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlaxes-qml-qmlaxes-view2-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlaxes-qml-qmlaxes-view3-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlaxes-qmlaxes-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlaxes-resources-qrc.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlchart-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlchart-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlchart-qml-qmlchart-main-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlchart-qml-qmlchart-view1-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlchart-qml-qmlchart-view10-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlchart-qml-qmlchart-view11-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlchart-qml-qmlchart-view12-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlchart-qml-qmlchart-view2-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlchart-qml-qmlchart-view3-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlchart-qml-qmlchart-view4-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlchart-qml-qmlchart-view5-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlchart-qml-qmlchart-view6-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlchart-qml-qmlchart-view7-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlchart-qml-qmlchart-view8-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlchart-qml-qmlchart-view9-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlchart-qmlchart-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlchart-resources-qrc.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlcustomizations-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlcustomizations-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlcustomizations-qml-qmlcustomizations-main-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlcustomizations-qmlcustomizations-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlcustomizations-resources-qrc.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlcustomlegend-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlcustomlegend-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlcustomlegend-qml-qmlcustomlegend-animatedareaseries-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlcustomlegend-qml-qmlcustomlegend-chartviewhighlighted-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlcustomlegend-qml-qmlcustomlegend-chartviewselector-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlcustomlegend-qml-qmlcustomlegend-chartviewstacked-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlcustomlegend-qml-qmlcustomlegend-customlegend-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlcustomlegend-qml-qmlcustomlegend-main-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlcustomlegend-qmlcustomlegend-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlcustomlegend-resources-qrc.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlf1legends-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlf1legends-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlf1legends-qml-qmlf1legends-main-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlf1legends-qml-qmlf1legends-speedsxml-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlf1legends-qmlf1legends-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlf1legends-resources-qrc.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlmodule.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmloscilloscope-datasource-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmloscilloscope-datasource-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmloscilloscope-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmloscilloscope-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmloscilloscope-qml-qmloscilloscope-controlpanel-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmloscilloscope-qml-qmloscilloscope-main-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmloscilloscope-qml-qmloscilloscope-multibutton-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmloscilloscope-qml-qmloscilloscope-scopeview-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmloscilloscope-qmloscilloscope-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmloscilloscope-resources-qrc.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlpolarchart-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlpolarchart-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlpolarchart-qml-qmlpolarchart-main-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlpolarchart-qml-qmlpolarchart-view1-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlpolarchart-qml-qmlpolarchart-view2-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlpolarchart-qml-qmlpolarchart-view3-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlpolarchart-qmlpolarchart-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlpolarchart-resources-qrc.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlweather-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlweather-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlweather-qml-qmlweather-main-qml.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlweather-qmlweather-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-qmlweather-resources-qrc.html -%%QT_DOCDIR%%/qtcharts/qtcharts-scatterchart-chartview-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-scatterchart-chartview-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-scatterchart-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-scatterchart-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-scatterchart-scatterchart-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-scatterinteractions-chartview-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-scatterinteractions-chartview-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-scatterinteractions-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-scatterinteractions-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-scatterinteractions-scatterinteractions-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-splinechart-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-splinechart-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-splinechart-splinechart-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-stackedbarchart-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-stackedbarchart-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-stackedbarchart-stackedbarchart-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-stackedbarchartdrilldown-drilldownchart-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-stackedbarchartdrilldown-drilldownchart-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-stackedbarchartdrilldown-drilldownseries-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-stackedbarchartdrilldown-drilldownseries-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-stackedbarchartdrilldown-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-stackedbarchartdrilldown-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-stackedbarchartdrilldown-stackedbarchartdrilldown-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-temperaturerecords-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-temperaturerecords-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-temperaturerecords-temperaturerecords-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts-zoomlinechart-chart-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-zoomlinechart-chart-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-zoomlinechart-chartview-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-zoomlinechart-chartview-h.html -%%QT_DOCDIR%%/qtcharts/qtcharts-zoomlinechart-example.html -%%QT_DOCDIR%%/qtcharts/qtcharts-zoomlinechart-main-cpp.html -%%QT_DOCDIR%%/qtcharts/qtcharts-zoomlinechart-zoomlinechart-pro.html -%%QT_DOCDIR%%/qtcharts/qtcharts.index -%%QT_DOCDIR%%/qtcharts/qtcharts.qhp -%%QT_DOCDIR%%/qtcharts/qtcharts.qhp.sha1 -%%QT_DOCDIR%%/qtcharts/qvalueaxis-members.html -%%QT_DOCDIR%%/qtcharts/qvalueaxis.html -%%QT_DOCDIR%%/qtcharts/qvbarmodelmapper-members.html -%%QT_DOCDIR%%/qtcharts/qvbarmodelmapper.html -%%QT_DOCDIR%%/qtcharts/qvboxplotmodelmapper-members.html -%%QT_DOCDIR%%/qtcharts/qvboxplotmodelmapper.html -%%QT_DOCDIR%%/qtcharts/qvpiemodelmapper-members.html -%%QT_DOCDIR%%/qtcharts/qvpiemodelmapper.html -%%QT_DOCDIR%%/qtcharts/qvxymodelmapper-members.html -%%QT_DOCDIR%%/qtcharts/qvxymodelmapper.html -%%QT_DOCDIR%%/qtcharts/qxylegendmarker-members.html -%%QT_DOCDIR%%/qtcharts/qxylegendmarker.html -%%QT_DOCDIR%%/qtcharts/qxyseries-members.html -%%QT_DOCDIR%%/qtcharts/qxyseries.html -%%QT_DOCDIR%%/qtcharts/style/offline-simple.css -%%QT_DOCDIR%%/qtcharts/style/offline.css %%QT_DOCDIR%%/qtconcurrent.qch %%QT_DOCDIR%%/qtconcurrent/examples-manifest.xml %%QT_DOCDIR%%/qtconcurrent/images/arrow_bc.png @@ -3339,6 +2163,7 @@ %%QT_DOCDIR%%/qtcore/qcollatorsortkey-members.html %%QT_DOCDIR%%/qtcore/qcollatorsortkey.html %%QT_DOCDIR%%/qtcore/qcommandlineoption-members.html +%%QT_DOCDIR%%/qtcore/qcommandlineoption-obsolete.html %%QT_DOCDIR%%/qtcore/qcommandlineoption.html %%QT_DOCDIR%%/qtcore/qcommandlineparser-members.html %%QT_DOCDIR%%/qtcore/qcommandlineparser.html @@ -3356,7 +2181,10 @@ %%QT_DOCDIR%%/qtcore/qdate-obsolete.html %%QT_DOCDIR%%/qtcore/qdate.html %%QT_DOCDIR%%/qtcore/qdatetime-members.html +%%QT_DOCDIR%%/qtcore/qdatetime-obsolete.html %%QT_DOCDIR%%/qtcore/qdatetime.html +%%QT_DOCDIR%%/qtcore/qdeadlinetimer-members.html +%%QT_DOCDIR%%/qtcore/qdeadlinetimer.html %%QT_DOCDIR%%/qtcore/qdebug-members.html %%QT_DOCDIR%%/qtcore/qdebug.html %%QT_DOCDIR%%/qtcore/qdebugstatesaver-members.html @@ -3405,6 +2233,7 @@ %%QT_DOCDIR%%/qtcore/qflag.html %%QT_DOCDIR%%/qtcore/qflags-members.html %%QT_DOCDIR%%/qtcore/qflags.html +%%QT_DOCDIR%%/qtcore/qfloat16.html %%QT_DOCDIR%%/qtcore/qfuture-const-iterator-members.html %%QT_DOCDIR%%/qtcore/qfuture-const-iterator.html %%QT_DOCDIR%%/qtcore/qfuture-members.html @@ -3544,6 +2373,7 @@ %%QT_DOCDIR%%/qtcore/qmimetype-members.html %%QT_DOCDIR%%/qtcore/qmimetype.html %%QT_DOCDIR%%/qtcore/qmodelindex-members.html +%%QT_DOCDIR%%/qtcore/qmodelindex-obsolete.html %%QT_DOCDIR%%/qtcore/qmodelindex.html %%QT_DOCDIR%%/qtcore/qmultihash-members.html %%QT_DOCDIR%%/qtcore/qmultihash.html @@ -3570,6 +2400,8 @@ %%QT_DOCDIR%%/qtcore/qobject.html %%QT_DOCDIR%%/qtcore/qobjectcleanuphandler-members.html %%QT_DOCDIR%%/qtcore/qobjectcleanuphandler.html +%%QT_DOCDIR%%/qtcore/qoperatingsystemversion-members.html +%%QT_DOCDIR%%/qtcore/qoperatingsystemversion.html %%QT_DOCDIR%%/qtcore/qpair-members.html %%QT_DOCDIR%%/qtcore/qpair.html %%QT_DOCDIR%%/qtcore/qparallelanimationgroup-members.html @@ -3577,6 +2409,7 @@ %%QT_DOCDIR%%/qtcore/qpauseanimation-members.html %%QT_DOCDIR%%/qtcore/qpauseanimation.html %%QT_DOCDIR%%/qtcore/qpersistentmodelindex-members.html +%%QT_DOCDIR%%/qtcore/qpersistentmodelindex-obsolete.html %%QT_DOCDIR%%/qtcore/qpersistentmodelindex.html %%QT_DOCDIR%%/qtcore/qpluginloader-members.html %%QT_DOCDIR%%/qtcore/qpluginloader.html @@ -3683,6 +2516,7 @@ %%QT_DOCDIR%%/qtcore/qstatemachine-wrappedevent-members.html %%QT_DOCDIR%%/qtcore/qstatemachine-wrappedevent.html %%QT_DOCDIR%%/qtcore/qstatemachine.html +%%QT_DOCDIR%%/qtcore/qstaticbytearraymatcher.html %%QT_DOCDIR%%/qtcore/qstaticplugin-members.html %%QT_DOCDIR%%/qtcore/qstaticplugin.html %%QT_DOCDIR%%/qtcore/qstorageinfo-members.html @@ -3701,6 +2535,7 @@ %%QT_DOCDIR%%/qtcore/qstringref-obsolete.html %%QT_DOCDIR%%/qtcore/qstringref.html %%QT_DOCDIR%%/qtcore/qsysinfo-members.html +%%QT_DOCDIR%%/qtcore/qsysinfo-obsolete.html %%QT_DOCDIR%%/qtcore/qsysinfo.html %%QT_DOCDIR%%/qtcore/qsystemsemaphore-members.html %%QT_DOCDIR%%/qtcore/qsystemsemaphore.html @@ -3708,6 +2543,30 @@ %%QT_DOCDIR%%/qtcore/qt.html %%QT_DOCDIR%%/qtcore/qtalgorithms-obsolete.html %%QT_DOCDIR%%/qtcore/qtalgorithms.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-android-gradle-wrapper.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-cldr-data.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-doubleconversion.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-easing.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-forkfd.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-freebsd.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-md4.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-md5.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-pcre2.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-psl.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-qbig5codecs.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-qbkcodec.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-qeucjpcodec.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-qeuckrcodec.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-qeventdispatcher-cf.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-qjiscodec.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-qsjiscodec.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-qtemporaryfile.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-qtsciicodec.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-rfc6234.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-sha1.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-sha3-endian.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-sha3-keccak.html +%%QT_DOCDIR%%/qtcore/qtcore-attribution-zlib.html %%QT_DOCDIR%%/qtcore/qtcore-index.html %%QT_DOCDIR%%/qtcore/qtcore-ipc-localfortuneclient-client-cpp.html %%QT_DOCDIR%%/qtcore/qtcore-ipc-localfortuneclient-client-h.html @@ -3802,6 +2661,7 @@ %%QT_DOCDIR%%/qtcore/qthread-members.html %%QT_DOCDIR%%/qtcore/qthread.html %%QT_DOCDIR%%/qtcore/qthreadpool-members.html +%%QT_DOCDIR%%/qtcore/qthreadpool-obsolete.html %%QT_DOCDIR%%/qtcore/qthreadpool.html %%QT_DOCDIR%%/qtcore/qthreadstorage-members.html %%QT_DOCDIR%%/qtcore/qthreadstorage.html @@ -3876,360 +2736,6 @@ %%QT_DOCDIR%%/qtcore/style/offline-simple.css %%QT_DOCDIR%%/qtcore/style/offline.css %%QT_DOCDIR%%/qtcore/timers.html -%%QT_DOCDIR%%/qtdatavis3d.qch -%%QT_DOCDIR%%/qtdatavisualization/datavisualization-examples.html -%%QT_DOCDIR%%/qtdatavisualization/examples-manifest.xml -%%QT_DOCDIR%%/qtdatavisualization/images/arrow_bc.png -%%QT_DOCDIR%%/qtdatavisualization/images/audiolevels-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/bars-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/bgrContent.png -%%QT_DOCDIR%%/qtdatavisualization/images/btn_next.png -%%QT_DOCDIR%%/qtdatavisualization/images/btn_prev.png -%%QT_DOCDIR%%/qtdatavisualization/images/bullet_dn.png -%%QT_DOCDIR%%/qtdatavisualization/images/bullet_sq.png -%%QT_DOCDIR%%/qtdatavisualization/images/custominput-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/customitems-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/customproxy-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/draggableaxes-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/home.png -%%QT_DOCDIR%%/qtdatavisualization/images/ico_note.png -%%QT_DOCDIR%%/qtdatavisualization/images/ico_note_attention.png -%%QT_DOCDIR%%/qtdatavisualization/images/ico_out.png -%%QT_DOCDIR%%/qtdatavisualization/images/itemmodel-example-2.png -%%QT_DOCDIR%%/qtdatavisualization/images/itemmodel-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/logo.png -%%QT_DOCDIR%%/qtdatavisualization/images/q3dbars-minimal.png -%%QT_DOCDIR%%/qtdatavisualization/images/q3dscatter-minimal.png -%%QT_DOCDIR%%/qtdatavisualization/images/q3dsurface-minimal.png -%%QT_DOCDIR%%/qtdatavisualization/images/qmlaxisdrag-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/qmlaxisformatter-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/qmlbars-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/qmlcustominput-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/qmllegend-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/qmlmultigraph-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/qmloscilloscope-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/qmlscatter-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/qmlspectrogram-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/qmlsurface-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/qmlsurfacelayers-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/rotations-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/scatter-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/surface-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/texturesurface-example.png -%%QT_DOCDIR%%/qtdatavisualization/images/volumetric-example.png -%%QT_DOCDIR%%/qtdatavisualization/q3dbars-members.html -%%QT_DOCDIR%%/qtdatavisualization/q3dbars.html -%%QT_DOCDIR%%/qtdatavisualization/q3dcamera-members.html -%%QT_DOCDIR%%/qtdatavisualization/q3dcamera.html -%%QT_DOCDIR%%/qtdatavisualization/q3dinputhandler-members.html -%%QT_DOCDIR%%/qtdatavisualization/q3dinputhandler.html -%%QT_DOCDIR%%/qtdatavisualization/q3dlight-members.html -%%QT_DOCDIR%%/qtdatavisualization/q3dlight.html -%%QT_DOCDIR%%/qtdatavisualization/q3dobject-members.html -%%QT_DOCDIR%%/qtdatavisualization/q3dobject.html -%%QT_DOCDIR%%/qtdatavisualization/q3dscatter-members.html -%%QT_DOCDIR%%/qtdatavisualization/q3dscatter.html -%%QT_DOCDIR%%/qtdatavisualization/q3dscene-members.html -%%QT_DOCDIR%%/qtdatavisualization/q3dscene.html -%%QT_DOCDIR%%/qtdatavisualization/q3dsurface-members.html -%%QT_DOCDIR%%/qtdatavisualization/q3dsurface.html -%%QT_DOCDIR%%/qtdatavisualization/q3dtheme-members.html -%%QT_DOCDIR%%/qtdatavisualization/q3dtheme.html -%%QT_DOCDIR%%/qtdatavisualization/qabstract3daxis-members.html -%%QT_DOCDIR%%/qtdatavisualization/qabstract3daxis.html -%%QT_DOCDIR%%/qtdatavisualization/qabstract3dgraph-members.html -%%QT_DOCDIR%%/qtdatavisualization/qabstract3dgraph.html -%%QT_DOCDIR%%/qtdatavisualization/qabstract3dinputhandler-members.html -%%QT_DOCDIR%%/qtdatavisualization/qabstract3dinputhandler.html -%%QT_DOCDIR%%/qtdatavisualization/qabstract3dseries-members.html -%%QT_DOCDIR%%/qtdatavisualization/qabstract3dseries.html -%%QT_DOCDIR%%/qtdatavisualization/qabstractdataproxy-members.html -%%QT_DOCDIR%%/qtdatavisualization/qabstractdataproxy.html -%%QT_DOCDIR%%/qtdatavisualization/qbar3dseries-members.html -%%QT_DOCDIR%%/qtdatavisualization/qbar3dseries.html -%%QT_DOCDIR%%/qtdatavisualization/qbardataitem-members.html -%%QT_DOCDIR%%/qtdatavisualization/qbardataitem.html -%%QT_DOCDIR%%/qtdatavisualization/qbardataproxy-members.html -%%QT_DOCDIR%%/qtdatavisualization/qbardataproxy.html -%%QT_DOCDIR%%/qtdatavisualization/qcategory3daxis-members.html -%%QT_DOCDIR%%/qtdatavisualization/qcategory3daxis.html -%%QT_DOCDIR%%/qtdatavisualization/qcustom3ditem-members.html -%%QT_DOCDIR%%/qtdatavisualization/qcustom3ditem.html -%%QT_DOCDIR%%/qtdatavisualization/qcustom3dlabel-members.html -%%QT_DOCDIR%%/qtdatavisualization/qcustom3dlabel.html -%%QT_DOCDIR%%/qtdatavisualization/qcustom3dvolume-members.html -%%QT_DOCDIR%%/qtdatavisualization/qcustom3dvolume.html -%%QT_DOCDIR%%/qtdatavisualization/qheightmapsurfacedataproxy-members.html -%%QT_DOCDIR%%/qtdatavisualization/qheightmapsurfacedataproxy.html -%%QT_DOCDIR%%/qtdatavisualization/qitemmodelbardataproxy-members.html -%%QT_DOCDIR%%/qtdatavisualization/qitemmodelbardataproxy.html -%%QT_DOCDIR%%/qtdatavisualization/qitemmodelscatterdataproxy-members.html -%%QT_DOCDIR%%/qtdatavisualization/qitemmodelscatterdataproxy.html -%%QT_DOCDIR%%/qtdatavisualization/qitemmodelsurfacedataproxy-members.html -%%QT_DOCDIR%%/qtdatavisualization/qitemmodelsurfacedataproxy.html -%%QT_DOCDIR%%/qtdatavisualization/qlogvalue3daxisformatter-members.html -%%QT_DOCDIR%%/qtdatavisualization/qlogvalue3daxisformatter.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-abstract3dseries-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-abstract3dseries.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-abstractaxis3d-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-abstractaxis3d.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-abstractdataproxy-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-abstractdataproxy.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-abstractgraph3d-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-abstractgraph3d.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-abstractinputhandler3d-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-abstractinputhandler3d.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-bar3dseries-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-bar3dseries.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-bardataproxy-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-bardataproxy.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-bars3d-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-bars3d.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-camera3d-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-camera3d.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-categoryaxis3d-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-categoryaxis3d.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-colorgradient-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-colorgradient.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-colorgradientstop-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-colorgradientstop.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-custom3ditem-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-custom3ditem.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-custom3dlabel-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-custom3dlabel.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-custom3dvolume-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-custom3dvolume.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-heightmapsurfacedataproxy-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-heightmapsurfacedataproxy.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-inputhandler3d-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-inputhandler3d.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-itemmodelbardataproxy-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-itemmodelbardataproxy.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-itemmodelscatterdataproxy-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-itemmodelscatterdataproxy.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-itemmodelsurfacedataproxy-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-itemmodelsurfacedataproxy.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-light3d-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-light3d.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-logvalueaxis3dformatter-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-logvalueaxis3dformatter.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-scatter3d-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-scatter3d.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-scatter3dseries-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-scatter3dseries.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-scatterdataproxy-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-scatterdataproxy.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-scene3d-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-scene3d.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-surface3d-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-surface3d.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-surface3dseries-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-surface3dseries.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-surfacedataproxy-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-surfacedataproxy.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-theme3d-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-theme3d.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-themecolor-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-themecolor.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-touchinputhandler3d-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-touchinputhandler3d.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-valueaxis3d-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-valueaxis3d.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-valueaxis3dformatter-members.html -%%QT_DOCDIR%%/qtdatavisualization/qml-qtdatavisualization-valueaxis3dformatter.html -%%QT_DOCDIR%%/qtdatavisualization/qscatter3dseries-members.html -%%QT_DOCDIR%%/qtdatavisualization/qscatter3dseries.html -%%QT_DOCDIR%%/qtdatavisualization/qscatterdataitem-members.html -%%QT_DOCDIR%%/qtdatavisualization/qscatterdataitem.html -%%QT_DOCDIR%%/qtdatavisualization/qscatterdataproxy-members.html -%%QT_DOCDIR%%/qtdatavisualization/qscatterdataproxy.html -%%QT_DOCDIR%%/qtdatavisualization/qsurface3dseries-members.html -%%QT_DOCDIR%%/qtdatavisualization/qsurface3dseries.html -%%QT_DOCDIR%%/qtdatavisualization/qsurfacedataitem-members.html -%%QT_DOCDIR%%/qtdatavisualization/qsurfacedataitem.html -%%QT_DOCDIR%%/qtdatavisualization/qsurfacedataproxy-members.html -%%QT_DOCDIR%%/qtdatavisualization/qsurfacedataproxy.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavis3d.qhp -%%QT_DOCDIR%%/qtdatavisualization/qtdatavis3d.qhp.sha1 -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-audiolevels-audiolevels-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-audiolevels-audiolevels-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-audiolevels-audiolevels-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-audiolevels-audiolevelsiodevice-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-audiolevels-audiolevelsiodevice-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-audiolevels-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-audiolevels-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-bars-bars-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-bars-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-bars-graphmodifier-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-bars-graphmodifier-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-bars-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-custominput-custominput-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-custominput-custominput-qrc.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-custominput-custominputhandler-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-custominput-custominputhandler-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-custominput-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-custominput-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-custominput-scatterdatamodifier-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-custominput-scatterdatamodifier-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-customitems-customitemgraph-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-customitems-customitemgraph-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-customitems-customitems-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-customitems-customitems-qrc.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-customitems-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-customitems-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-customproxy-customproxy-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-customproxy-customproxy-qrc.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-customproxy-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-customproxy-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-customproxy-rainfallgraph-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-customproxy-rainfallgraph-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-customproxy-variantbardatamapping-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-customproxy-variantbardatamapping-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-customproxy-variantbardataproxy-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-customproxy-variantbardataproxy-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-customproxy-variantdataset-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-customproxy-variantdataset-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-data-handling.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-draggableaxes-axesinputhandler-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-draggableaxes-axesinputhandler-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-draggableaxes-data-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-draggableaxes-data-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-draggableaxes-draggableaxes-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-draggableaxes-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-draggableaxes-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-getting-started.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-index.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-interacting-with-data.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-itemmodel-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-itemmodel-itemmodel-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-itemmodel-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-known-issues.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-module.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlaxisdrag-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlaxisdrag-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlaxisdrag-qml-qmlaxisdrag-main-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlaxisdrag-qml-qmlaxisdrag-newbutton-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlaxisdrag-qmlaxisdrag-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlaxisdrag-qmlaxisdrag-qrc.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlaxisformatter-customformatter-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlaxisformatter-customformatter-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlaxisformatter-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlaxisformatter-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlaxisformatter-qml-qmlaxisformatter-data-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlaxisformatter-qml-qmlaxisformatter-main-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlaxisformatter-qml-qmlaxisformatter-newbutton-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlaxisformatter-qmlaxisformatter-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlaxisformatter-qmlaxisformatter-qrc.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlbars-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlbars-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlbars-qml-qmlbars-axes-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlbars-qml-qmlbars-data-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlbars-qml-qmlbars-main-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlbars-qmlbars-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlbars-qmlbars-qrc.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlcustominput-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlcustominput-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlcustominput-qml-qmlcustominput-data-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlcustominput-qml-qmlcustominput-main-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlcustominput-qml-qmlcustominput-newbutton-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlcustominput-qmlcustominput-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlcustominput-qmlcustominput-qrc.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmllegend-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmllegend-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmllegend-qml-qmllegend-data-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmllegend-qml-qmllegend-legenditem-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmllegend-qml-qmllegend-main-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmllegend-qml-qmllegend-newbutton-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmllegend-qmllegend-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmllegend-qmllegend-qrc.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlmodule.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlmultigraph-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlmultigraph-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlmultigraph-qml-qmlmultigraph-data-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlmultigraph-qml-qmlmultigraph-main-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlmultigraph-qml-qmlmultigraph-newbutton-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlmultigraph-qmlmultigraph-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlmultigraph-qmlmultigraph-qrc.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmloscilloscope-datasource-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmloscilloscope-datasource-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmloscilloscope-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmloscilloscope-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmloscilloscope-qml-qmloscilloscope-main-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmloscilloscope-qml-qmloscilloscope-newbutton-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmloscilloscope-qmloscilloscope-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmloscilloscope-qmloscilloscope-qrc.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlscatter-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlscatter-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlscatter-qml-qmlscatter-data-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlscatter-qml-qmlscatter-main-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlscatter-qml-qmlscatter-newbutton-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlscatter-qmlscatter-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlscatter-qmlscatter-qrc.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlspectrogram-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlspectrogram-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlspectrogram-qml-qmlspectrogram-data-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlspectrogram-qml-qmlspectrogram-main-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlspectrogram-qml-qmlspectrogram-newbutton-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlspectrogram-qmlspectrogram-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlspectrogram-qmlspectrogram-qrc.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlsurface-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlsurface-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlsurface-qml-qmlsurface-data-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlsurface-qml-qmlsurface-main-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlsurface-qml-qmlsurface-newbutton-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlsurface-qmlsurface-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlsurface-qmlsurface-qrc.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlsurfacelayers-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlsurfacelayers-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlsurfacelayers-qml-qmlsurfacelayers-main-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlsurfacelayers-qml-qmlsurfacelayers-newbutton-qml.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlsurfacelayers-qmlsurfacelayers-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-qmlsurfacelayers-qmlsurfacelayers-qrc.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-rotations-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-rotations-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-rotations-rotations-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-rotations-rotations-qrc.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-rotations-scatterdatamodifier-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-rotations-scatterdatamodifier-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-scatter-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-scatter-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-scatter-scatter-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-scatter-scatterdatamodifier-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-scatter-scatterdatamodifier-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-surface-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-surface-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-surface-surface-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-surface-surface-qrc.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-surface-surfacegraph-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-surface-surfacegraph-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-texturesurface-custominputhandler-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-texturesurface-custominputhandler-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-texturesurface-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-texturesurface-highlightseries-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-texturesurface-highlightseries-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-texturesurface-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-texturesurface-surfacegraph-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-texturesurface-surfacegraph-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-texturesurface-texturedsurface-qrc.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-texturesurface-texturesurface-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-texturesurface-topographicseries-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-texturesurface-topographicseries-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-volumetric-example.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-volumetric-main-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-volumetric-volumetric-cpp.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-volumetric-volumetric-h.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-volumetric-volumetric-pro.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization-volumetric-volumetric-qrc.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization.html -%%QT_DOCDIR%%/qtdatavisualization/qtdatavisualization.index -%%QT_DOCDIR%%/qtdatavisualization/qtouch3dinputhandler-members.html -%%QT_DOCDIR%%/qtdatavisualization/qtouch3dinputhandler.html -%%QT_DOCDIR%%/qtdatavisualization/qvalue3daxis-members.html -%%QT_DOCDIR%%/qtdatavisualization/qvalue3daxis.html -%%QT_DOCDIR%%/qtdatavisualization/qvalue3daxisformatter-members.html -%%QT_DOCDIR%%/qtdatavisualization/qvalue3daxisformatter.html -%%QT_DOCDIR%%/qtdatavisualization/style/offline-simple.css -%%QT_DOCDIR%%/qtdatavisualization/style/offline.css %%QT_DOCDIR%%/qtdbus.qch %%QT_DOCDIR%%/qtdbus/examples-dbus.html %%QT_DOCDIR%%/qtdbus/examples-manifest.xml @@ -4352,7 +2858,6 @@ %%QT_DOCDIR%%/qtdesigner/designer-customizing-forms.html %%QT_DOCDIR%%/qtdesigner/designer-editing-mode.html %%QT_DOCDIR%%/qtdesigner/designer-layouts.html -%%QT_DOCDIR%%/qtdesigner/designer-license-information.html %%QT_DOCDIR%%/qtdesigner/designer-preview.html %%QT_DOCDIR%%/qtdesigner/designer-quick-start.html %%QT_DOCDIR%%/qtdesigner/designer-resources.html @@ -4591,7 +3096,6 @@ %%QT_DOCDIR%%/qtdesigner/style/offline-simple.css %%QT_DOCDIR%%/qtdesigner/style/offline.css %%QT_DOCDIR%%/qtdoc.qch -%%QT_DOCDIR%%/qtdoc/3rdparty.html %%QT_DOCDIR%%/qtdoc/accelerators.html %%QT_DOCDIR%%/qtdoc/accessibility.html %%QT_DOCDIR%%/qtdoc/accessible-qtquick.html @@ -4671,13 +3175,6 @@ %%QT_DOCDIR%%/qtdoc/images/deployment-windows-depends.png %%QT_DOCDIR%%/qtdoc/images/draganddrop-examples.png %%QT_DOCDIR%%/qtdoc/images/flickr_application.png -%%QT_DOCDIR%%/qtdoc/images/gs-project1.png -%%QT_DOCDIR%%/qtdoc/images/gs-project2.png -%%QT_DOCDIR%%/qtdoc/images/gs1.png -%%QT_DOCDIR%%/qtdoc/images/gs2.png -%%QT_DOCDIR%%/qtdoc/images/gs3.png -%%QT_DOCDIR%%/qtdoc/images/gs4.png -%%QT_DOCDIR%%/qtdoc/images/gs5.png %%QT_DOCDIR%%/qtdoc/images/home.png %%QT_DOCDIR%%/qtdoc/images/ico_note.png %%QT_DOCDIR%%/qtdoc/images/ico_note_attention.png @@ -4685,8 +3182,18 @@ %%QT_DOCDIR%%/qtdoc/images/icon_QtCreator_78x78px.png %%QT_DOCDIR%%/qtdoc/images/icon_Qt_78x78px.png %%QT_DOCDIR%%/qtdoc/images/icon_Tools.png +%%QT_DOCDIR%%/qtdoc/images/kernel-settings.png %%QT_DOCDIR%%/qtdoc/images/layout-examples.png %%QT_DOCDIR%%/qtdoc/images/logo.png +%%QT_DOCDIR%%/qtdoc/images/notepad1.png +%%QT_DOCDIR%%/qtdoc/images/notepad2.png +%%QT_DOCDIR%%/qtdoc/images/notepad3.png +%%QT_DOCDIR%%/qtdoc/images/notepad4.png +%%QT_DOCDIR%%/qtdoc/images/ok.png +%%QT_DOCDIR%%/qtdoc/images/open-project.png +%%QT_DOCDIR%%/qtdoc/images/project-view-2.png +%%QT_DOCDIR%%/qtdoc/images/project-view.png +%%QT_DOCDIR%%/qtdoc/images/project-wizard.png %%QT_DOCDIR%%/qtdoc/images/qml-extending-types.png %%QT_DOCDIR%%/qtdoc/images/qml-texteditor1_button.png %%QT_DOCDIR%%/qtdoc/images/qml-texteditor1_editmenu.png @@ -4719,11 +3226,11 @@ %%QT_DOCDIR%%/qtdoc/images/qtcreator-run.png %%QT_DOCDIR%%/qtdoc/images/qtlocation-mapviewer-demo.jpg %%QT_DOCDIR%%/qtdoc/images/qtpositioning_weatherinfo_ex.jpg -%%QT_DOCDIR%%/qtdoc/images/qtquickcontrols-example-gallery-android.png -%%QT_DOCDIR%%/qtdoc/images/qtquickcontrols-example-gallery-osx.png +%%QT_DOCDIR%%/qtdoc/images/qtquickcontrols2-material.png %%QT_DOCDIR%%/qtdoc/images/qtsensors_accelbubble_ex.jpg %%QT_DOCDIR%%/qtdoc/images/qtwebengine_quicknanobrowser.jpg %%QT_DOCDIR%%/qtdoc/images/scalability-gridlayout.png +%%QT_DOCDIR%%/qtdoc/images/select-item-to-add.png %%QT_DOCDIR%%/qtdoc/images/session.png %%QT_DOCDIR%%/qtdoc/images/sql-examples.png %%QT_DOCDIR%%/qtdoc/images/thread-examples.png @@ -4732,13 +3239,20 @@ %%QT_DOCDIR%%/qtdoc/images/tool-examples.png %%QT_DOCDIR%%/qtdoc/images/xml-examples.png %%QT_DOCDIR%%/qtdoc/index.html +%%QT_DOCDIR%%/qtdoc/integrity-building-monolith.html +%%QT_DOCDIR%%/qtdoc/integrity-building-qt-for-imx6quad-board.html +%%QT_DOCDIR%%/qtdoc/integrity-building-u-boot-image.html +%%QT_DOCDIR%%/qtdoc/integrity-creating-bootable-sd-card.html +%%QT_DOCDIR%%/qtdoc/integrity-installing-dependencies.html +%%QT_DOCDIR%%/qtdoc/integrity-monolith-project-tutorial.html +%%QT_DOCDIR%%/qtdoc/integrity-preparing-bsp-for-imx6quad-board.html +%%QT_DOCDIR%%/qtdoc/integrity-preparing-u-boot.html %%QT_DOCDIR%%/qtdoc/internationalization.html %%QT_DOCDIR%%/qtdoc/ios-support.html %%QT_DOCDIR%%/qtdoc/ipc.html %%QT_DOCDIR%%/qtdoc/known-issues.html %%QT_DOCDIR%%/qtdoc/lgpl.html -%%QT_DOCDIR%%/qtdoc/licenses-fonts.html -%%QT_DOCDIR%%/qtdoc/licenses.html +%%QT_DOCDIR%%/qtdoc/licenses-used-in-qt.html %%QT_DOCDIR%%/qtdoc/licensing.html %%QT_DOCDIR%%/qtdoc/linux-building.html %%QT_DOCDIR%%/qtdoc/linux-deployment.html @@ -4759,6 +3273,8 @@ %%QT_DOCDIR%%/qtdoc/newclasses55.html %%QT_DOCDIR%%/qtdoc/newclasses56.html %%QT_DOCDIR%%/qtdoc/newclasses57.html +%%QT_DOCDIR%%/qtdoc/newclasses58.html +%%QT_DOCDIR%%/qtdoc/newclasses59.html %%QT_DOCDIR%%/qtdoc/obsoleteclasses.html %%QT_DOCDIR%%/qtdoc/obsoleteqmltypes.html %%QT_DOCDIR%%/qtdoc/opensourcelicense.html @@ -4790,6 +3306,8 @@ %%QT_DOCDIR%%/qtdoc/qmltypes.html %%QT_DOCDIR%%/qtdoc/qpa.html %%QT_DOCDIR%%/qtdoc/qt-activex.html +%%QT_DOCDIR%%/qtdoc/qt-attribution-cmake-macros.html +%%QT_DOCDIR%%/qtdoc/qt-attribution-llvmpipe.html %%QT_DOCDIR%%/qtdoc/qt-conf.html %%QT_DOCDIR%%/qtdoc/qt-embedded-fonts.html %%QT_DOCDIR%%/qtdoc/qt-embedded-kmap2qmap.html @@ -4862,6 +3380,7 @@ %%QT_DOCDIR%%/qtdoc/uic.html %%QT_DOCDIR%%/qtdoc/unicode.html %%QT_DOCDIR%%/qtdoc/unix-signals.html +%%QT_DOCDIR%%/qtdoc/vxworks.html %%QT_DOCDIR%%/qtdoc/whatsnew50.html %%QT_DOCDIR%%/qtdoc/whatsnew51.html %%QT_DOCDIR%%/qtdoc/whatsnew52.html @@ -4870,6 +3389,8 @@ %%QT_DOCDIR%%/qtdoc/whatsnew55.html %%QT_DOCDIR%%/qtdoc/whatsnew56.html %%QT_DOCDIR%%/qtdoc/whatsnew57.html +%%QT_DOCDIR%%/qtdoc/whatsnew58.html +%%QT_DOCDIR%%/qtdoc/whatsnew59.html %%QT_DOCDIR%%/qtdoc/why-moc.html %%QT_DOCDIR%%/qtdoc/windows-building.html %%QT_DOCDIR%%/qtdoc/windows-deployment.html @@ -4896,6 +3417,10 @@ %%QT_DOCDIR%%/qtgamepad/images/qtquickgamepad-example.png %%QT_DOCDIR%%/qtgamepad/qgamepad-members.html %%QT_DOCDIR%%/qtgamepad/qgamepad.html +%%QT_DOCDIR%%/qtgamepad/qgamepadkeynavigation-members.html +%%QT_DOCDIR%%/qtgamepad/qgamepadkeynavigation.html +%%QT_DOCDIR%%/qtgamepad/qgamepadmanager-members.html +%%QT_DOCDIR%%/qtgamepad/qgamepadmanager.html %%QT_DOCDIR%%/qtgamepad/qtgamepad-configurebuttons-android-androidmanifest-xml.html %%QT_DOCDIR%%/qtgamepad/qtgamepad-configurebuttons-configurebuttons-pro.html %%QT_DOCDIR%%/qtgamepad/qtgamepad-configurebuttons-example.html @@ -5417,6 +3942,7 @@ %%QT_DOCDIR%%/qtgui/images/rxor.png %%QT_DOCDIR%%/qtgui/images/texttable-merge.png %%QT_DOCDIR%%/qtgui/images/texttable-split.png +%%QT_DOCDIR%%/qtgui/images/touchpoint-metrics.png %%QT_DOCDIR%%/qtgui/painting-3d.html %%QT_DOCDIR%%/qtgui/painting.html %%QT_DOCDIR%%/qtgui/paintsystem-devices.html @@ -5558,6 +4084,8 @@ %%QT_DOCDIR%%/qtgui/qiconengine-availablesizesargument-members.html %%QT_DOCDIR%%/qtgui/qiconengine-availablesizesargument.html %%QT_DOCDIR%%/qtgui/qiconengine-members.html +%%QT_DOCDIR%%/qtgui/qiconengine-scaledpixmapargument-members.html +%%QT_DOCDIR%%/qtgui/qiconengine-scaledpixmapargument.html %%QT_DOCDIR%%/qtgui/qiconengine.html %%QT_DOCDIR%%/qtgui/qiconengineplugin-members.html %%QT_DOCDIR%%/qtgui/qiconengineplugin.html @@ -5693,6 +4221,8 @@ %%QT_DOCDIR%%/qtgui/qopengltexture-members.html %%QT_DOCDIR%%/qtgui/qopengltexture-obsolete.html %%QT_DOCDIR%%/qtgui/qopengltexture.html +%%QT_DOCDIR%%/qtgui/qopengltextureblitter-members.html +%%QT_DOCDIR%%/qtgui/qopengltextureblitter.html %%QT_DOCDIR%%/qtgui/qopengltimemonitor-members.html %%QT_DOCDIR%%/qtgui/qopengltimemonitor.html %%QT_DOCDIR%%/qtgui/qopengltimerquery-members.html @@ -5763,12 +4293,10 @@ %%QT_DOCDIR%%/qtgui/qpixmapcache-members.html %%QT_DOCDIR%%/qtgui/qpixmapcache-obsolete.html %%QT_DOCDIR%%/qtgui/qpixmapcache.html -%%QT_DOCDIR%%/qtgui/qplatformgraphicsbuffer-members.html -%%QT_DOCDIR%%/qtgui/qplatformgraphicsbuffer.html %%QT_DOCDIR%%/qtgui/qplatformsurfaceevent-members.html %%QT_DOCDIR%%/qtgui/qplatformsurfaceevent.html -%%QT_DOCDIR%%/qtgui/qplatformsystemtrayicon-members.html -%%QT_DOCDIR%%/qtgui/qplatformsystemtrayicon.html +%%QT_DOCDIR%%/qtgui/qpointingdeviceuniqueid-members.html +%%QT_DOCDIR%%/qtgui/qpointingdeviceuniqueid.html %%QT_DOCDIR%%/qtgui/qpolygon-members.html %%QT_DOCDIR%%/qtgui/qpolygon.html %%QT_DOCDIR%%/qtgui/qpolygonf-members.html @@ -5900,6 +4428,30 @@ %%QT_DOCDIR%%/qtgui/qtgui-analogclock-analogclock-pro.html %%QT_DOCDIR%%/qtgui/qtgui-analogclock-example.html %%QT_DOCDIR%%/qtgui/qtgui-analogclock-main-cpp.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-android-native-style.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-angle-arrayboundsclamper.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-angle-murmurhash.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-angle-systeminfo.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-angle-trace-event.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-angle.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-cocoa-platform-plugin.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-freetype-bdf.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-freetype-pcf.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-freetype-zlib.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-freetype.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-grayraster.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-harfbuzz-ng.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-harfbuzz.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-iaccessible2.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-libjpeg.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-libpng.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-opengl-es2-headers.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-opengl-headers.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-pixman.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-smooth-scaling-algorithm.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-wintab.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-xcb.html +%%QT_DOCDIR%%/qtgui/qtgui-attribution-xkbcommon.html %%QT_DOCDIR%%/qtgui/qtgui-index.html %%QT_DOCDIR%%/qtgui/qtgui-module.html %%QT_DOCDIR%%/qtgui/qtgui-openglwindow-example.html @@ -5921,6 +4473,7 @@ %%QT_DOCDIR%%/qtgui/qtouchevent-members.html %%QT_DOCDIR%%/qtgui/qtouchevent-obsolete.html %%QT_DOCDIR%%/qtgui/qtouchevent-touchpoint-members.html +%%QT_DOCDIR%%/qtgui/qtouchevent-touchpoint-obsolete.html %%QT_DOCDIR%%/qtgui/qtouchevent-touchpoint.html %%QT_DOCDIR%%/qtgui/qtouchevent.html %%QT_DOCDIR%%/qtgui/qtransform-members.html @@ -5979,6 +4532,7 @@ %%QT_DOCDIR%%/qthelp/qhelpenginecore-members.html %%QT_DOCDIR%%/qthelp/qhelpenginecore.html %%QT_DOCDIR%%/qthelp/qhelpindexmodel-members.html +%%QT_DOCDIR%%/qthelp/qhelpindexmodel-obsolete.html %%QT_DOCDIR%%/qthelp/qhelpindexmodel.html %%QT_DOCDIR%%/qthelp/qhelpindexwidget-members.html %%QT_DOCDIR%%/qthelp/qhelpindexwidget.html @@ -5986,9 +4540,13 @@ %%QT_DOCDIR%%/qthelp/qhelpsearchengine-obsolete.html %%QT_DOCDIR%%/qthelp/qhelpsearchengine.html %%QT_DOCDIR%%/qthelp/qhelpsearchquery-members.html +%%QT_DOCDIR%%/qthelp/qhelpsearchquery-obsolete.html %%QT_DOCDIR%%/qthelp/qhelpsearchquery.html %%QT_DOCDIR%%/qthelp/qhelpsearchquerywidget-members.html +%%QT_DOCDIR%%/qthelp/qhelpsearchquerywidget-obsolete.html %%QT_DOCDIR%%/qthelp/qhelpsearchquerywidget.html +%%QT_DOCDIR%%/qthelp/qhelpsearchresult-members.html +%%QT_DOCDIR%%/qthelp/qhelpsearchresult.html %%QT_DOCDIR%%/qthelp/qhelpsearchresultwidget-members.html %%QT_DOCDIR%%/qthelp/qhelpsearchresultwidget.html %%QT_DOCDIR%%/qthelp/qthelp-contextsensitivehelp-contextsensitivehelp-pro.html @@ -6022,12 +4580,109 @@ %%QT_DOCDIR%%/qtimageformats/images/ico_note_attention.png %%QT_DOCDIR%%/qtimageformats/images/ico_out.png %%QT_DOCDIR%%/qtimageformats/images/logo.png +%%QT_DOCDIR%%/qtimageformats/qtimageformats-attribution-jasper.html +%%QT_DOCDIR%%/qtimageformats/qtimageformats-attribution-libmng.html +%%QT_DOCDIR%%/qtimageformats/qtimageformats-attribution-libtiff.html +%%QT_DOCDIR%%/qtimageformats/qtimageformats-attribution-libwebp.html %%QT_DOCDIR%%/qtimageformats/qtimageformats-index.html %%QT_DOCDIR%%/qtimageformats/qtimageformats.index %%QT_DOCDIR%%/qtimageformats/qtimageformats.qhp %%QT_DOCDIR%%/qtimageformats/qtimageformats.qhp.sha1 %%QT_DOCDIR%%/qtimageformats/style/offline-simple.css %%QT_DOCDIR%%/qtimageformats/style/offline.css +%%QT_DOCDIR%%/qtlabscalendar.qch +%%QT_DOCDIR%%/qtlabscalendar/images/arrow_bc.png +%%QT_DOCDIR%%/qtlabscalendar/images/bgrContent.png +%%QT_DOCDIR%%/qtlabscalendar/images/btn_next.png +%%QT_DOCDIR%%/qtlabscalendar/images/btn_prev.png +%%QT_DOCDIR%%/qtlabscalendar/images/bullet_dn.png +%%QT_DOCDIR%%/qtlabscalendar/images/bullet_sq.png +%%QT_DOCDIR%%/qtlabscalendar/images/home.png +%%QT_DOCDIR%%/qtlabscalendar/images/ico_note.png +%%QT_DOCDIR%%/qtlabscalendar/images/ico_note_attention.png +%%QT_DOCDIR%%/qtlabscalendar/images/ico_out.png +%%QT_DOCDIR%%/qtlabscalendar/images/logo.png +%%QT_DOCDIR%%/qtlabscalendar/images/qtlabscalendar-dayofweekrow-layout.png +%%QT_DOCDIR%%/qtlabscalendar/images/qtlabscalendar-dayofweekrow.png +%%QT_DOCDIR%%/qtlabscalendar/images/qtlabscalendar-monthgrid-layout.png +%%QT_DOCDIR%%/qtlabscalendar/images/qtlabscalendar-monthgrid.png +%%QT_DOCDIR%%/qtlabscalendar/images/qtlabscalendar-weeknumbercolumn-layout.png +%%QT_DOCDIR%%/qtlabscalendar/images/qtlabscalendar-weeknumbercolumn.png +%%QT_DOCDIR%%/qtlabscalendar/qml-qt-labs-calendar-calendar-members.html +%%QT_DOCDIR%%/qtlabscalendar/qml-qt-labs-calendar-calendar.html +%%QT_DOCDIR%%/qtlabscalendar/qml-qt-labs-calendar-calendarmodel-members.html +%%QT_DOCDIR%%/qtlabscalendar/qml-qt-labs-calendar-calendarmodel.html +%%QT_DOCDIR%%/qtlabscalendar/qml-qt-labs-calendar-dayofweekrow-members.html +%%QT_DOCDIR%%/qtlabscalendar/qml-qt-labs-calendar-dayofweekrow.html +%%QT_DOCDIR%%/qtlabscalendar/qml-qt-labs-calendar-monthgrid-members.html +%%QT_DOCDIR%%/qtlabscalendar/qml-qt-labs-calendar-monthgrid.html +%%QT_DOCDIR%%/qtlabscalendar/qml-qt-labs-calendar-weeknumbercolumn-members.html +%%QT_DOCDIR%%/qtlabscalendar/qml-qt-labs-calendar-weeknumbercolumn.html +%%QT_DOCDIR%%/qtlabscalendar/qt-labs-calendar-qmlmodule.html +%%QT_DOCDIR%%/qtlabscalendar/qtlabscalendar-index.html +%%QT_DOCDIR%%/qtlabscalendar/qtlabscalendar.index +%%QT_DOCDIR%%/qtlabscalendar/qtlabscalendar.qhp +%%QT_DOCDIR%%/qtlabscalendar/qtlabscalendar.qhp.sha1 +%%QT_DOCDIR%%/qtlabscalendar/qtlabscalendar.tags +%%QT_DOCDIR%%/qtlabscalendar/style/offline-simple.css +%%QT_DOCDIR%%/qtlabscalendar/style/offline.css +%%QT_DOCDIR%%/qtlabsplatform.qch +%%QT_DOCDIR%%/qtlabsplatform/images/arrow_bc.png +%%QT_DOCDIR%%/qtlabsplatform/images/bgrContent.png +%%QT_DOCDIR%%/qtlabsplatform/images/btn_next.png +%%QT_DOCDIR%%/qtlabsplatform/images/btn_prev.png +%%QT_DOCDIR%%/qtlabsplatform/images/bullet_dn.png +%%QT_DOCDIR%%/qtlabsplatform/images/bullet_sq.png +%%QT_DOCDIR%%/qtlabsplatform/images/home.png +%%QT_DOCDIR%%/qtlabsplatform/images/ico_note.png +%%QT_DOCDIR%%/qtlabsplatform/images/ico_note_attention.png +%%QT_DOCDIR%%/qtlabsplatform/images/ico_out.png +%%QT_DOCDIR%%/qtlabsplatform/images/logo.png +%%QT_DOCDIR%%/qtlabsplatform/images/qtlabsplatform-colordialog-gtk.png +%%QT_DOCDIR%%/qtlabsplatform/images/qtlabsplatform-filedialog-gtk.png +%%QT_DOCDIR%%/qtlabsplatform/images/qtlabsplatform-folderdialog-gtk.png +%%QT_DOCDIR%%/qtlabsplatform/images/qtlabsplatform-fontdialog-gtk.png +%%QT_DOCDIR%%/qtlabsplatform/images/qtlabsplatform-menu.png +%%QT_DOCDIR%%/qtlabsplatform/images/qtlabsplatform-menubar.png +%%QT_DOCDIR%%/qtlabsplatform/images/qtlabsplatform-messagedialog-android.png +%%QT_DOCDIR%%/qtlabsplatform/images/qtlabsplatform-messagedialog-informative-android.png +%%QT_DOCDIR%%/qtlabsplatform/images/qtlabsplatform-systemtrayicon-menu.png +%%QT_DOCDIR%%/qtlabsplatform/images/qtlabsplatform-systemtrayicon-message.png +%%QT_DOCDIR%%/qtlabsplatform/images/qtlabsplatform-systemtrayicon.png +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-colordialog-members.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-colordialog.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-dialog-members.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-dialog.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-filedialog-members.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-filedialog.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-folderdialog-members.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-folderdialog.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-fontdialog-members.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-fontdialog.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-menu-members.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-menu.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-menubar-members.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-menubar.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-menuitem-members.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-menuitem.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-menuitemgroup-members.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-menuitemgroup.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-menuseparator-members.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-menuseparator.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-messagedialog-members.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-messagedialog.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-standardpaths-members.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-standardpaths.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-systemtrayicon-members.html +%%QT_DOCDIR%%/qtlabsplatform/qml-qt-labs-platform-systemtrayicon.html +%%QT_DOCDIR%%/qtlabsplatform/qt-labs-platform-qmlmodule.html +%%QT_DOCDIR%%/qtlabsplatform/qtlabsplatform-index.html +%%QT_DOCDIR%%/qtlabsplatform/qtlabsplatform.index +%%QT_DOCDIR%%/qtlabsplatform/qtlabsplatform.qhp +%%QT_DOCDIR%%/qtlabsplatform/qtlabsplatform.qhp.sha1 +%%QT_DOCDIR%%/qtlabsplatform/qtlabsplatform.tags +%%QT_DOCDIR%%/qtlabsplatform/style/offline-simple.css +%%QT_DOCDIR%%/qtlabsplatform/style/offline.css %%QT_DOCDIR%%/qtlinguist.qch %%QT_DOCDIR%%/qtlinguist/examples-linguist.html %%QT_DOCDIR%%/qtlinguist/examples-manifest.xml @@ -6096,6 +4751,7 @@ %%QT_DOCDIR%%/qtlocation.qch %%QT_DOCDIR%%/qtlocation/examples-manifest.xml %%QT_DOCDIR%%/qtlocation/images/api-mapcircle.png +%%QT_DOCDIR%%/qtlocation/images/api-mapitemgroup.png %%QT_DOCDIR%%/qtlocation/images/api-mappolygon.png %%QT_DOCDIR%%/qtlocation/images/api-mappolyline.png %%QT_DOCDIR%%/qtlocation/images/api-mapquickitem-anchor.png @@ -6124,8 +4780,11 @@ %%QT_DOCDIR%%/qtlocation/location-places-backend.html %%QT_DOCDIR%%/qtlocation/location-places-cpp.html %%QT_DOCDIR%%/qtlocation/location-places-qml.html +%%QT_DOCDIR%%/qtlocation/location-plugin-esri.html %%QT_DOCDIR%%/qtlocation/location-plugin-here.html +%%QT_DOCDIR%%/qtlocation/location-plugin-itemsoverlay.html %%QT_DOCDIR%%/qtlocation/location-plugin-mapbox.html +%%QT_DOCDIR%%/qtlocation/location-plugin-mapboxgl.html %%QT_DOCDIR%%/qtlocation/location-plugin-osm.html %%QT_DOCDIR%%/qtlocation/qgeocodereply-members.html %%QT_DOCDIR%%/qtlocation/qgeocodereply.html @@ -6175,10 +4834,16 @@ %%QT_DOCDIR%%/qtlocation/qml-qtlocation-map.html %%QT_DOCDIR%%/qtlocation/qml-qtlocation-mapcircle-members.html %%QT_DOCDIR%%/qtlocation/qml-qtlocation-mapcircle.html +%%QT_DOCDIR%%/qtlocation/qml-qtlocation-mapcopyrightnotice-members.html +%%QT_DOCDIR%%/qtlocation/qml-qtlocation-mapcopyrightnotice.html %%QT_DOCDIR%%/qtlocation/qml-qtlocation-mapgesturearea-members.html %%QT_DOCDIR%%/qtlocation/qml-qtlocation-mapgesturearea.html +%%QT_DOCDIR%%/qtlocation/qml-qtlocation-mapitemgroup-members.html +%%QT_DOCDIR%%/qtlocation/qml-qtlocation-mapitemgroup.html %%QT_DOCDIR%%/qtlocation/qml-qtlocation-mapitemview-members.html %%QT_DOCDIR%%/qtlocation/qml-qtlocation-mapitemview.html +%%QT_DOCDIR%%/qtlocation/qml-qtlocation-mapparameter-members.html +%%QT_DOCDIR%%/qtlocation/qml-qtlocation-mapparameter.html %%QT_DOCDIR%%/qtlocation/qml-qtlocation-mappinchevent-members.html %%QT_DOCDIR%%/qtlocation/qml-qtlocation-mappinchevent.html %%QT_DOCDIR%%/qtlocation/qml-qtlocation-mappolygon-members.html @@ -6278,6 +4943,30 @@ %%QT_DOCDIR%%/qtlocation/qplacesupplier.html %%QT_DOCDIR%%/qtlocation/qplaceuser-members.html %%QT_DOCDIR%%/qtlocation/qplaceuser.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-clip2tri.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-clipper.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-earcut.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-any.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-boost.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-css-color-parser.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-earcut.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-geojson.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-geojsonvt.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-geometry.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-kdbush.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-libcxx.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-parsedate.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-polylabel.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-protozero.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-rapidjson.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-shelfpack.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-supercluster.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-unique-resource.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-variant.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-vectortile.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl-wagyu.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-mapboxgl.html +%%QT_DOCDIR%%/qtlocation/qtlocation-attribution-poly2tri.html %%QT_DOCDIR%%/qtlocation/qtlocation-changes.html %%QT_DOCDIR%%/qtlocation/qtlocation-cpp.html %%QT_DOCDIR%%/qtlocation/qtlocation-examples.html @@ -6304,6 +4993,7 @@ %%QT_DOCDIR%%/qtlocation/qtlocation-mapviewer-map-circleitem-qml.html %%QT_DOCDIR%%/qtlocation/qtlocation-mapviewer-map-imageitem-qml.html %%QT_DOCDIR%%/qtlocation/qtlocation-mapviewer-map-mapcomponent-qml.html +%%QT_DOCDIR%%/qtlocation/qtlocation-mapviewer-map-mapsliders-qml.html %%QT_DOCDIR%%/qtlocation/qtlocation-mapviewer-map-marker-qml.html %%QT_DOCDIR%%/qtlocation/qtlocation-mapviewer-map-minimap-qml.html %%QT_DOCDIR%%/qtlocation/qtlocation-mapviewer-map-polygonitem-qml.html @@ -6422,7 +5112,6 @@ %%QT_DOCDIR%%/qtmacextras/style/offline.css %%QT_DOCDIR%%/qtmultimedia.qch %%QT_DOCDIR%%/qtmultimedia/audiooverview.html -%%QT_DOCDIR%%/qtmultimedia/blackberry.html %%QT_DOCDIR%%/qtmultimedia/cameraoverview.html %%QT_DOCDIR%%/qtmultimedia/changes.html %%QT_DOCDIR%%/qtmultimedia/examples-manifest.xml @@ -6483,6 +5172,12 @@ %%QT_DOCDIR%%/qtmultimedia/multimedia-examples.html %%QT_DOCDIR%%/qtmultimedia/multimediabackend.html %%QT_DOCDIR%%/qtmultimedia/multimediaoverview.html +%%QT_DOCDIR%%/qtmultimedia/qabstractaudiodeviceinfo-members.html +%%QT_DOCDIR%%/qtmultimedia/qabstractaudiodeviceinfo.html +%%QT_DOCDIR%%/qtmultimedia/qabstractaudioinput-members.html +%%QT_DOCDIR%%/qtmultimedia/qabstractaudioinput.html +%%QT_DOCDIR%%/qtmultimedia/qabstractaudiooutput-members.html +%%QT_DOCDIR%%/qtmultimedia/qabstractaudiooutput.html %%QT_DOCDIR%%/qtmultimedia/qabstractplanarvideobuffer-members.html %%QT_DOCDIR%%/qtmultimedia/qabstractplanarvideobuffer.html %%QT_DOCDIR%%/qtmultimedia/qabstractvideobuffer-members.html @@ -6522,6 +5217,8 @@ %%QT_DOCDIR%%/qtmultimedia/qaudiorecorder.html %%QT_DOCDIR%%/qtmultimedia/qaudiorolecontrol-members.html %%QT_DOCDIR%%/qtmultimedia/qaudiorolecontrol.html +%%QT_DOCDIR%%/qtmultimedia/qaudiosystemplugin-members.html +%%QT_DOCDIR%%/qtmultimedia/qaudiosystemplugin.html %%QT_DOCDIR%%/qtmultimedia/qcamera-frameraterange-members.html %%QT_DOCDIR%%/qtmultimedia/qcamera-frameraterange.html %%QT_DOCDIR%%/qtmultimedia/qcamera-members.html @@ -6705,6 +5402,7 @@ %%QT_DOCDIR%%/qtmultimedia/qsoundeffect.html %%QT_DOCDIR%%/qtmultimedia/qtaudioengine-qmlmodule.html %%QT_DOCDIR%%/qtmultimedia/qtmultimedia-index.html +%%QT_DOCDIR%%/qtmultimedia/qtmultimedia-ios.html %%QT_DOCDIR%%/qtmultimedia/qtmultimedia-module.html %%QT_DOCDIR%%/qtmultimedia/qtmultimedia-modules.html %%QT_DOCDIR%%/qtmultimedia/qtmultimedia-multimedia-audiodevices-audiodevices-cpp.html @@ -6919,8 +5617,10 @@ %%QT_DOCDIR%%/qtmultimedia/qtmultimedia-multimediawidgets-camera-camera-cpp.html %%QT_DOCDIR%%/qtmultimedia/qtmultimedia-multimediawidgets-camera-camera-h.html %%QT_DOCDIR%%/qtmultimedia/qtmultimedia-multimediawidgets-camera-camera-pro.html +%%QT_DOCDIR%%/qtmultimedia/qtmultimedia-multimediawidgets-camera-camera-qrc.html %%QT_DOCDIR%%/qtmultimedia/qtmultimedia-multimediawidgets-camera-camera-ui.html %%QT_DOCDIR%%/qtmultimedia/qtmultimedia-multimediawidgets-camera-example.html +%%QT_DOCDIR%%/qtmultimedia/qtmultimedia-multimediawidgets-camera-images-shutter-svg.html %%QT_DOCDIR%%/qtmultimedia/qtmultimedia-multimediawidgets-camera-imagesettings-cpp.html %%QT_DOCDIR%%/qtmultimedia/qtmultimedia-multimediawidgets-camera-imagesettings-h.html %%QT_DOCDIR%%/qtmultimedia/qtmultimedia-multimediawidgets-camera-imagesettings-ui.html @@ -7041,6 +5741,8 @@ %%QT_DOCDIR%%/qtnetwork/qhostaddress.html %%QT_DOCDIR%%/qtnetwork/qhostinfo-members.html %%QT_DOCDIR%%/qtnetwork/qhostinfo.html +%%QT_DOCDIR%%/qtnetwork/qhstspolicy-members.html +%%QT_DOCDIR%%/qtnetwork/qhstspolicy.html %%QT_DOCDIR%%/qtnetwork/qhttpmultipart-members.html %%QT_DOCDIR%%/qtnetwork/qhttpmultipart.html %%QT_DOCDIR%%/qtnetwork/qhttppart-members.html @@ -7063,6 +5765,8 @@ %%QT_DOCDIR%%/qtnetwork/qnetworkcookie.html %%QT_DOCDIR%%/qtnetwork/qnetworkcookiejar-members.html %%QT_DOCDIR%%/qtnetwork/qnetworkcookiejar.html +%%QT_DOCDIR%%/qtnetwork/qnetworkdatagram-members.html +%%QT_DOCDIR%%/qtnetwork/qnetworkdatagram.html %%QT_DOCDIR%%/qtnetwork/qnetworkdiskcache-members.html %%QT_DOCDIR%%/qtnetwork/qnetworkdiskcache.html %%QT_DOCDIR%%/qtnetwork/qnetworkinterface-members.html @@ -7079,6 +5783,10 @@ %%QT_DOCDIR%%/qtnetwork/qnetworkrequest.html %%QT_DOCDIR%%/qtnetwork/qnetworksession-members.html %%QT_DOCDIR%%/qtnetwork/qnetworksession.html +%%QT_DOCDIR%%/qtnetwork/qsctpserver-members.html +%%QT_DOCDIR%%/qtnetwork/qsctpserver.html +%%QT_DOCDIR%%/qtnetwork/qsctpsocket-members.html +%%QT_DOCDIR%%/qtnetwork/qsctpsocket.html %%QT_DOCDIR%%/qtnetwork/qssl-obsolete.html %%QT_DOCDIR%%/qtnetwork/qssl.html %%QT_DOCDIR%%/qtnetwork/qsslcertificate-members.html @@ -7090,6 +5798,8 @@ %%QT_DOCDIR%%/qtnetwork/qsslcipher.html %%QT_DOCDIR%%/qtnetwork/qsslconfiguration-members.html %%QT_DOCDIR%%/qtnetwork/qsslconfiguration.html +%%QT_DOCDIR%%/qtnetwork/qssldiffiehellmanparameters-members.html +%%QT_DOCDIR%%/qtnetwork/qssldiffiehellmanparameters.html %%QT_DOCDIR%%/qtnetwork/qsslellipticcurve-members.html %%QT_DOCDIR%%/qtnetwork/qsslellipticcurve.html %%QT_DOCDIR%%/qtnetwork/qsslerror-members.html @@ -7511,6 +6221,8 @@ %%QT_DOCDIR%%/qtpositioning/qgeocoordinate.html %%QT_DOCDIR%%/qtpositioning/qgeolocation-members.html %%QT_DOCDIR%%/qtpositioning/qgeolocation.html +%%QT_DOCDIR%%/qtpositioning/qgeopath-members.html +%%QT_DOCDIR%%/qtpositioning/qgeopath.html %%QT_DOCDIR%%/qtpositioning/qgeopositioninfo-members.html %%QT_DOCDIR%%/qtpositioning/qgeopositioninfo.html %%QT_DOCDIR%%/qtpositioning/qgeopositioninfosource-members.html @@ -7524,9 +6236,11 @@ %%QT_DOCDIR%%/qtpositioning/qgeosatelliteinfosource-members.html %%QT_DOCDIR%%/qtpositioning/qgeosatelliteinfosource.html %%QT_DOCDIR%%/qtpositioning/qgeoshape-members.html +%%QT_DOCDIR%%/qtpositioning/qgeoshape-obsolete.html %%QT_DOCDIR%%/qtpositioning/qgeoshape.html %%QT_DOCDIR%%/qtpositioning/qml-coordinate.html %%QT_DOCDIR%%/qtpositioning/qml-geocircle.html +%%QT_DOCDIR%%/qtpositioning/qml-geopath.html %%QT_DOCDIR%%/qtpositioning/qml-georectangle.html %%QT_DOCDIR%%/qtpositioning/qml-geoshape.html %%QT_DOCDIR%%/qtpositioning/qml-qtpositioning-address-members.html @@ -7641,68 +6355,6 @@ %%QT_DOCDIR%%/qtprintsupport/qtprintsupport.tags %%QT_DOCDIR%%/qtprintsupport/style/offline-simple.css %%QT_DOCDIR%%/qtprintsupport/style/offline.css -%%QT_DOCDIR%%/qtpurchasing.qch -%%QT_DOCDIR%%/qtpurchasing/examples-manifest.xml -%%QT_DOCDIR%%/qtpurchasing/images/arrow_bc.png -%%QT_DOCDIR%%/qtpurchasing/images/bgrContent.png -%%QT_DOCDIR%%/qtpurchasing/images/btn_next.png -%%QT_DOCDIR%%/qtpurchasing/images/btn_prev.png -%%QT_DOCDIR%%/qtpurchasing/images/bullet_dn.png -%%QT_DOCDIR%%/qtpurchasing/images/bullet_sq.png -%%QT_DOCDIR%%/qtpurchasing/images/home.png -%%QT_DOCDIR%%/qtpurchasing/images/ico_note.png -%%QT_DOCDIR%%/qtpurchasing/images/ico_note_attention.png -%%QT_DOCDIR%%/qtpurchasing/images/ico_out.png -%%QT_DOCDIR%%/qtpurchasing/images/logo.png -%%QT_DOCDIR%%/qtpurchasing/images/qthangman-example.png -%%QT_DOCDIR%%/qtpurchasing/images/qthangman-store-example.png -%%QT_DOCDIR%%/qtpurchasing/qinappproduct-members.html -%%QT_DOCDIR%%/qtpurchasing/qinappproduct.html -%%QT_DOCDIR%%/qtpurchasing/qinappstore-members.html -%%QT_DOCDIR%%/qtpurchasing/qinappstore.html -%%QT_DOCDIR%%/qtpurchasing/qinapptransaction-members.html -%%QT_DOCDIR%%/qtpurchasing/qinapptransaction.html -%%QT_DOCDIR%%/qtpurchasing/qml-qtpurchasing-product-members.html -%%QT_DOCDIR%%/qtpurchasing/qml-qtpurchasing-product.html -%%QT_DOCDIR%%/qtpurchasing/qml-qtpurchasing-store-members.html -%%QT_DOCDIR%%/qtpurchasing/qml-qtpurchasing-store.html -%%QT_DOCDIR%%/qtpurchasing/qml-qtpurchasing-transaction-members.html -%%QT_DOCDIR%%/qtpurchasing/qml-qtpurchasing-transaction.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-appstore.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-examples.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-gettingstarted-cpp.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-gettingstarted-qml.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-googleplay.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-index.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-module.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qmlmodule.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-example.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-hangmangame-cpp.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-hangmangame-h.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-main-cpp.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-qml-qthangman-gameview-qml.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-qml-qthangman-guesswordview-qml.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-qml-qthangman-hangman-qml.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-qml-qthangman-howtoview-qml.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-qml-qthangman-key-qml.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-qml-qthangman-letter-qml.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-qml-qthangman-letterselector-qml.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-qml-qthangman-main-qml.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-qml-qthangman-mainview-qml.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-qml-qthangman-pageheader-qml.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-qml-qthangman-scoreitem-qml.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-qml-qthangman-simplebutton-qml.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-qml-qthangman-splashscreen-qml.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-qml-qthangman-storeitem-qml.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-qml-qthangman-storeview-qml.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-qml-qthangman-word-qml.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-qthangman-pro.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing-qthangman-resources-qrc.html -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing.index -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing.qhp -%%QT_DOCDIR%%/qtpurchasing/qtpurchasing.qhp.sha1 -%%QT_DOCDIR%%/qtpurchasing/style/offline-simple.css -%%QT_DOCDIR%%/qtpurchasing/style/offline.css %%QT_DOCDIR%%/qtqml.qch %%QT_DOCDIR%%/qtqml/examples-manifest.xml %%QT_DOCDIR%%/qtqml/images/arrow_bc.png @@ -7712,6 +6364,7 @@ %%QT_DOCDIR%%/qtqml/images/bullet_dn.png %%QT_DOCDIR%%/qtqml/images/bullet_sq.png %%QT_DOCDIR%%/qtqml/images/button-types.png +%%QT_DOCDIR%%/qtqml/images/cppintegration-ex.png %%QT_DOCDIR%%/qtqml/images/declarative-rect_tint.png %%QT_DOCDIR%%/qtqml/images/documents-definetypes-attributes.png %%QT_DOCDIR%%/qtqml/images/documents-definetypes-simple.png @@ -7767,6 +6420,8 @@ %%QT_DOCDIR%%/qtqml/qml-qtqml-instantiator.html %%QT_DOCDIR%%/qtqml/qml-qtqml-locale-members.html %%QT_DOCDIR%%/qtqml/qml-qtqml-locale.html +%%QT_DOCDIR%%/qtqml/qml-qtqml-loggingcategory-members.html +%%QT_DOCDIR%%/qtqml/qml-qtqml-loggingcategory.html %%QT_DOCDIR%%/qtqml/qml-qtqml-models-delegatemodel-members.html %%QT_DOCDIR%%/qtqml/qml-qtqml-models-delegatemodel.html %%QT_DOCDIR%%/qtqml/qml-qtqml-models-delegatemodelgroup-members.html @@ -7867,12 +6522,14 @@ %%QT_DOCDIR%%/qtqml/qqmlscriptstring-members.html %%QT_DOCDIR%%/qtqml/qqmlscriptstring.html %%QT_DOCDIR%%/qtqml/qtjavascript.html +%%QT_DOCDIR%%/qtqml/qtqml-attribution-masm.html %%QT_DOCDIR%%/qtqml/qtqml-cppclasses-topic.html %%QT_DOCDIR%%/qtqml/qtqml-cppintegration-contextproperties.html %%QT_DOCDIR%%/qtqml/qtqml-cppintegration-data.html %%QT_DOCDIR%%/qtqml/qtqml-cppintegration-definetypes.html %%QT_DOCDIR%%/qtqml/qtqml-cppintegration-exposecppattributes.html %%QT_DOCDIR%%/qtqml/qtqml-cppintegration-interactqmlfromcpp.html +%%QT_DOCDIR%%/qtqml/qtqml-cppintegration-overview.html %%QT_DOCDIR%%/qtqml/qtqml-cppintegration-topic.html %%QT_DOCDIR%%/qtqml/qtqml-documents-definetypes.html %%QT_DOCDIR%%/qtqml/qtqml-documents-networktransparency.html @@ -8077,7 +6734,9 @@ %%QT_DOCDIR%%/qtqml/qtqml-xmlhttprequest-data-xml.html %%QT_DOCDIR%%/qtqml/qtqml-xmlhttprequest-example.html %%QT_DOCDIR%%/qtqml/qtqml-xmlhttprequest-get-qml.html +%%QT_DOCDIR%%/qtqml/qtqml-xmlhttprequest-getform-ui-qml.html %%QT_DOCDIR%%/qtqml/qtqml-xmlhttprequest-main-cpp.html +%%QT_DOCDIR%%/qtqml/qtqml-xmlhttprequest-methods-js.html %%QT_DOCDIR%%/qtqml/qtqml-xmlhttprequest-xmlhttprequest-pro.html %%QT_DOCDIR%%/qtqml/qtqml-xmlhttprequest-xmlhttprequest-qml.html %%QT_DOCDIR%%/qtqml/qtqml-xmlhttprequest-xmlhttprequest-qmlproject.html @@ -8351,6 +7010,7 @@ %%QT_DOCDIR%%/qtquick/images/star.png %%QT_DOCDIR%%/qtquick/images/textureinsgnode-example.jpg %%QT_DOCDIR%%/qtquick/images/textureinthread-example.jpg +%%QT_DOCDIR%%/qtquick/images/touchpoint-metrics.png %%QT_DOCDIR%%/qtquick/images/translate.png %%QT_DOCDIR%%/qtquick/images/twotextureproviders-example.jpg %%QT_DOCDIR%%/qtquick/images/verticalpositioner_example.png @@ -8401,6 +7061,8 @@ %%QT_DOCDIR%%/qtquick/qml-qtquick-behavior.html %%QT_DOCDIR%%/qtquick/qml-qtquick-borderimage-members.html %%QT_DOCDIR%%/qtquick/qml-qtquick-borderimage.html +%%QT_DOCDIR%%/qtquick/qml-qtquick-borderimagemesh-members.html +%%QT_DOCDIR%%/qtquick/qml-qtquick-borderimagemesh.html %%QT_DOCDIR%%/qtquick/qml-qtquick-canvas-members.html %%QT_DOCDIR%%/qtquick/qml-qtquick-canvas-obsolete.html %%QT_DOCDIR%%/qtquick/qml-qtquick-canvas.html @@ -8442,6 +7104,8 @@ %%QT_DOCDIR%%/qtquick/qml-qtquick-gradient.html %%QT_DOCDIR%%/qtquick/qml-qtquick-gradientstop-members.html %%QT_DOCDIR%%/qtquick/qml-qtquick-gradientstop.html +%%QT_DOCDIR%%/qtquick/qml-qtquick-graphicsinfo-members.html +%%QT_DOCDIR%%/qtquick/qml-qtquick-graphicsinfo.html %%QT_DOCDIR%%/qtquick/qml-qtquick-grid-members.html %%QT_DOCDIR%%/qtquick/qml-qtquick-grid.html %%QT_DOCDIR%%/qtquick/qml-qtquick-gridmesh-members.html @@ -8519,6 +7183,7 @@ %%QT_DOCDIR%%/qtquick/qml-qtquick-particles-friction-members.html %%QT_DOCDIR%%/qtquick/qml-qtquick-particles-friction.html %%QT_DOCDIR%%/qtquick/qml-qtquick-particles-gravity-members.html +%%QT_DOCDIR%%/qtquick/qml-qtquick-particles-gravity-obsolete.html %%QT_DOCDIR%%/qtquick/qml-qtquick-particles-gravity.html %%QT_DOCDIR%%/qtquick/qml-qtquick-particles-groupgoal-members.html %%QT_DOCDIR%%/qtquick/qml-qtquick-particles-groupgoal.html @@ -8639,6 +7304,7 @@ %%QT_DOCDIR%%/qtquick/qml-qtquick-systempalette-members.html %%QT_DOCDIR%%/qtquick/qml-qtquick-systempalette.html %%QT_DOCDIR%%/qtquick/qml-qtquick-text-members.html +%%QT_DOCDIR%%/qtquick/qml-qtquick-text-obsolete.html %%QT_DOCDIR%%/qtquick/qml-qtquick-text.html %%QT_DOCDIR%%/qtquick/qml-qtquick-textedit-members.html %%QT_DOCDIR%%/qtquick/qml-qtquick-textedit.html @@ -8647,6 +7313,7 @@ %%QT_DOCDIR%%/qtquick/qml-qtquick-textmetrics-members.html %%QT_DOCDIR%%/qtquick/qml-qtquick-textmetrics.html %%QT_DOCDIR%%/qtquick/qml-qtquick-touchpoint-members.html +%%QT_DOCDIR%%/qtquick/qml-qtquick-touchpoint-obsolete.html %%QT_DOCDIR%%/qtquick/qml-qtquick-touchpoint.html %%QT_DOCDIR%%/qtquick/qml-qtquick-transform-members.html %%QT_DOCDIR%%/qtquick/qml-qtquick-transform.html @@ -8681,6 +7348,8 @@ %%QT_DOCDIR%%/qtquick/qml-qttest-signalspy.html %%QT_DOCDIR%%/qtquick/qml-qttest-testcase-members.html %%QT_DOCDIR%%/qtquick/qml-qttest-testcase.html +%%QT_DOCDIR%%/qtquick/qml-qttest-toucheventsequence-members.html +%%QT_DOCDIR%%/qtquick/qml-qttest-toucheventsequence.html %%QT_DOCDIR%%/qtquick/qml-quaternion.html %%QT_DOCDIR%%/qtquick/qml-tutorial.html %%QT_DOCDIR%%/qtquick/qml-tutorial1.html @@ -8722,6 +7391,7 @@ %%QT_DOCDIR%%/qtquick/qquickwidget-members.html %%QT_DOCDIR%%/qtquick/qquickwidget.html %%QT_DOCDIR%%/qtquick/qquickwindow-members.html +%%QT_DOCDIR%%/qtquick/qquickwindow-obsolete.html %%QT_DOCDIR%%/qtquick/qquickwindow.html %%QT_DOCDIR%%/qtquick/qsgabstractrenderer-members.html %%QT_DOCDIR%%/qtquick/qsgabstractrenderer.html @@ -8749,6 +7419,8 @@ %%QT_DOCDIR%%/qtquick/qsggeometry.html %%QT_DOCDIR%%/qtquick/qsggeometrynode-members.html %%QT_DOCDIR%%/qtquick/qsggeometrynode.html +%%QT_DOCDIR%%/qtquick/qsgimagenode-members.html +%%QT_DOCDIR%%/qtquick/qsgimagenode.html %%QT_DOCDIR%%/qtquick/qsgmaterial-members.html %%QT_DOCDIR%%/qtquick/qsgmaterial.html %%QT_DOCDIR%%/qtquick/qsgmaterialshader-members.html @@ -8762,6 +7434,14 @@ %%QT_DOCDIR%%/qtquick/qsgopacitynode.html %%QT_DOCDIR%%/qtquick/qsgopaquetexturematerial-members.html %%QT_DOCDIR%%/qtquick/qsgopaquetexturematerial.html +%%QT_DOCDIR%%/qtquick/qsgrectanglenode-members.html +%%QT_DOCDIR%%/qtquick/qsgrectanglenode.html +%%QT_DOCDIR%%/qtquick/qsgrendererinterface-members.html +%%QT_DOCDIR%%/qtquick/qsgrendererinterface.html +%%QT_DOCDIR%%/qtquick/qsgrendernode-members.html +%%QT_DOCDIR%%/qtquick/qsgrendernode-renderstate-members.html +%%QT_DOCDIR%%/qtquick/qsgrendernode-renderstate.html +%%QT_DOCDIR%%/qtquick/qsgrendernode.html %%QT_DOCDIR%%/qtquick/qsgsimplematerial-members.html %%QT_DOCDIR%%/qtquick/qsgsimplematerial.html %%QT_DOCDIR%%/qtquick/qsgsimplematerialshader-members.html @@ -8782,6 +7462,7 @@ %%QT_DOCDIR%%/qtquick/qsgvertexcolormaterial.html %%QT_DOCDIR%%/qtquick/qt-labs-folderlistmodel-qmlmodule.html %%QT_DOCDIR%%/qtquick/qt-labs-settings-qmlmodule.html +%%QT_DOCDIR%%/qtquick/qt-labs-sharedimage-qmlmodule.html %%QT_DOCDIR%%/qtquick/qtquick-animation-animation-pro.html %%QT_DOCDIR%%/qtquick/qtquick-animation-animation-qml.html %%QT_DOCDIR%%/qtquick/qtquick-animation-animation-qmlproject.html @@ -8913,8 +7594,6 @@ %%QT_DOCDIR%%/qtquick/qtquick-demos-rssnews-rssnews-qml.html %%QT_DOCDIR%%/qtquick/qtquick-demos-rssnews-rssnews-qmlproject.html %%QT_DOCDIR%%/qtquick/qtquick-demos-rssnews-rssnews-qrc.html -%%QT_DOCDIR%%/qtquick/qtquick-demos-samegame-content-bbsettings-qml.html -%%QT_DOCDIR%%/qtquick/qtquick-demos-samegame-content-blackberry-settings-qml.html %%QT_DOCDIR%%/qtquick/qtquick-demos-samegame-content-block-qml.html %%QT_DOCDIR%%/qtquick/qtquick-demos-samegame-content-blockemitter-qml.html %%QT_DOCDIR%%/qtquick/qtquick-demos-samegame-content-button-qml.html @@ -8947,12 +7626,14 @@ %%QT_DOCDIR%%/qtquick/qtquick-demos-samegame-samegame-qml.html %%QT_DOCDIR%%/qtquick/qtquick-demos-samegame-samegame-qmlproject.html %%QT_DOCDIR%%/qtquick/qtquick-demos-samegame-samegame-qrc.html +%%QT_DOCDIR%%/qtquick/qtquick-demos-stocqt-content-banner-qml.html %%QT_DOCDIR%%/qtquick/qtquick-demos-stocqt-content-button-qml.html %%QT_DOCDIR%%/qtquick/qtquick-demos-stocqt-content-checkbox-qml.html %%QT_DOCDIR%%/qtquick/qtquick-demos-stocqt-content-qmldir.html %%QT_DOCDIR%%/qtquick/qtquick-demos-stocqt-content-settings-qml.html %%QT_DOCDIR%%/qtquick/qtquick-demos-stocqt-content-stockchart-qml.html %%QT_DOCDIR%%/qtquick/qtquick-demos-stocqt-content-stockinfo-qml.html +%%QT_DOCDIR%%/qtquick/qtquick-demos-stocqt-content-stocklistdelegate-qml.html %%QT_DOCDIR%%/qtquick/qtquick-demos-stocqt-content-stocklistmodel-qml.html %%QT_DOCDIR%%/qtquick/qtquick-demos-stocqt-content-stocklistview-qml.html %%QT_DOCDIR%%/qtquick/qtquick-demos-stocqt-content-stockmodel-qml.html @@ -9052,12 +7733,15 @@ %%QT_DOCDIR%%/qtquick/qtquick-layouts-main-cpp.html %%QT_DOCDIR%%/qtquick/qtquick-layouts-qmlmodule.html %%QT_DOCDIR%%/qtquick/qtquick-localstorage-example.html -%%QT_DOCDIR%%/qtquick/qtquick-localstorage-localstorage-hello-qml.html +%%QT_DOCDIR%%/qtquick/qtquick-localstorage-localstorage-database-js.html +%%QT_DOCDIR%%/qtquick/qtquick-localstorage-localstorage-header-qml.html %%QT_DOCDIR%%/qtquick/qtquick-localstorage-localstorage-localstorage-pro.html %%QT_DOCDIR%%/qtquick/qtquick-localstorage-localstorage-localstorage-qml.html -%%QT_DOCDIR%%/qtquick/qtquick-localstorage-localstorage-localstorage-qmlproject.html %%QT_DOCDIR%%/qtquick/qtquick-localstorage-localstorage-localstorage-qrc.html %%QT_DOCDIR%%/qtquick/qtquick-localstorage-localstorage-main-cpp.html +%%QT_DOCDIR%%/qtquick/qtquick-localstorage-localstorage-mybutton-qml.html +%%QT_DOCDIR%%/qtquick/qtquick-localstorage-localstorage-mydelegate-qml.html +%%QT_DOCDIR%%/qtquick/qtquick-localstorage-localstorage-mymodel-qml.html %%QT_DOCDIR%%/qtquick/qtquick-localstorage-localstorage-pro.html %%QT_DOCDIR%%/qtquick/qtquick-localstorage-qmlmodule.html %%QT_DOCDIR%%/qtquick/qtquick-models-abstractitemmodel-abstractitemmodel-pro.html @@ -9177,11 +7861,15 @@ %%QT_DOCDIR%%/qtquick/qtquick-quick-accessibility-example.html %%QT_DOCDIR%%/qtquick/qtquick-quick-accessibility-main-cpp.html %%QT_DOCDIR%%/qtquick/qtquick-quick-accessibility-quick-accessibility-pro.html +%%QT_DOCDIR%%/qtquick/qtquick-quickwidgets-quickwidget-customgl-qml.html %%QT_DOCDIR%%/qtquick/qtquick-quickwidgets-quickwidget-example.html +%%QT_DOCDIR%%/qtquick/qtquick-quickwidgets-quickwidget-fbitem-cpp.html +%%QT_DOCDIR%%/qtquick/qtquick-quickwidgets-quickwidget-fbitem-h.html %%QT_DOCDIR%%/qtquick/qtquick-quickwidgets-quickwidget-main-cpp.html %%QT_DOCDIR%%/qtquick/qtquick-quickwidgets-quickwidget-quickwidget-pro.html %%QT_DOCDIR%%/qtquick/qtquick-quickwidgets-quickwidget-quickwidget-qrc.html %%QT_DOCDIR%%/qtquick/qtquick-quickwidgets-quickwidget-rotatingsquare-qml.html +%%QT_DOCDIR%%/qtquick/qtquick-quickwidgets-quickwidget-rotatingsquaretab-qml.html %%QT_DOCDIR%%/qtquick/qtquick-rendercontrol-cuberenderer-cpp.html %%QT_DOCDIR%%/qtquick/qtquick-rendercontrol-cuberenderer-h.html %%QT_DOCDIR%%/qtquick/qtquick-rendercontrol-demo-qml.html @@ -9391,17 +8079,22 @@ %%QT_DOCDIR%%/qtquick/qtquick-views-visualdatamodel-dragselection-qml.html %%QT_DOCDIR%%/qtquick/qtquick-views-visualdatamodel-slideshow-qml.html %%QT_DOCDIR%%/qtquick/qtquick-views-visualdatamodel-visualdatamodel-qmlproject.html +%%QT_DOCDIR%%/qtquick/qtquick-visualcanvas-adaptations-d3d12.html +%%QT_DOCDIR%%/qtquick/qtquick-visualcanvas-adaptations-openvg.html +%%QT_DOCDIR%%/qtquick/qtquick-visualcanvas-adaptations-software.html +%%QT_DOCDIR%%/qtquick/qtquick-visualcanvas-adaptations.html %%QT_DOCDIR%%/qtquick/qtquick-visualcanvas-coordinates.html %%QT_DOCDIR%%/qtquick/qtquick-visualcanvas-scenegraph-renderer.html %%QT_DOCDIR%%/qtquick/qtquick-visualcanvas-scenegraph.html %%QT_DOCDIR%%/qtquick/qtquick-visualcanvas-topic.html %%QT_DOCDIR%%/qtquick/qtquick-visualcanvas-visualparent.html %%QT_DOCDIR%%/qtquick/qtquick-visualtypes-topic.html +%%QT_DOCDIR%%/qtquick/qtquick-window-allscreens-qml.html +%%QT_DOCDIR%%/qtquick/qtquick-window-currentscreen-qml.html %%QT_DOCDIR%%/qtquick/qtquick-window-example.html %%QT_DOCDIR%%/qtquick/qtquick-window-main-cpp.html %%QT_DOCDIR%%/qtquick/qtquick-window-qmlmodule.html %%QT_DOCDIR%%/qtquick/qtquick-window-resources-icon-svg.html -%%QT_DOCDIR%%/qtquick/qtquick-window-screeninfo-qml.html %%QT_DOCDIR%%/qtquick/qtquick-window-splash-qml.html %%QT_DOCDIR%%/qtquick/qtquick-window-window-pro.html %%QT_DOCDIR%%/qtquick/qtquick-window-window-qml.html @@ -9558,7 +8251,6 @@ %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-stack-members.html %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-stack.html %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-stackview-members.html -@comment %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-stackview-obsolete.html %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-stackview.html %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-stackviewdelegate-members.html %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-stackviewdelegate.html @@ -9621,6 +8313,7 @@ %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-styles-treeviewstyle-members.html %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-styles-treeviewstyle.html %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-styles-tumblerstyle-members.html +%%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-styles-tumblerstyle-obsolete.html %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-styles-tumblerstyle.html %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-switch-members.html %%QT_DOCDIR%%/qtquickcontrols/qml-qtquick-controls-switch.html @@ -9745,12 +8438,6 @@ %%QT_DOCDIR%%/qtquickcontrols2/images/ico_note_attention.png %%QT_DOCDIR%%/qtquickcontrols2/images/ico_out.png %%QT_DOCDIR%%/qtquickcontrols2/images/logo.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtlabscalendar-dayofweekrow-layout.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtlabscalendar-dayofweekrow.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtlabscalendar-monthgrid-layout.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtlabscalendar-monthgrid.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtlabscalendar-weeknumbercolumn-layout.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtlabscalendar-weeknumbercolumn.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-applicationwindow-wireframe.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-busyindicator-custom.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-busyindicator.gif @@ -9759,23 +8446,49 @@ %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-button-flat.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-button-highlighted.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-button.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter1.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter2-listview-header.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter2.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter3-listview-header.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter3.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter4-long-message.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter4.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-checkbox-custom.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-checkbox-tristate.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-checkbox.gif -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-checkbox.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-checkdelegate-custom.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-checkdelegate-tristate.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-checkdelegate.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-combobox-custom.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-combobox.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-combobox.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-contactlist.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-control.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-customize-buttons.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-default-thumbnail.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-default.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-delaybutton-custom.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-delaybutton.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-dial-custom.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-dial-no-wrap.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-dial-wrap.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-dial.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-dialogbuttonbox.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-drawer-expanded-wireframe.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-drawer-wireframe.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-drawer.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-flatstyle-creator.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-flatstyle.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-frame-custom.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-frame.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-gallery-drawer.png @@ -9788,11 +8501,19 @@ %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-itemdelegate.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-label-custom.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-label.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-material-accent.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-material-attributes.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-material-button.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-material-background.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-material-dark.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-material.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-material-elevation.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-material-foreground.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-material-light.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-material-purple.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-material-theme.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-material-thumbnail.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-menu.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-menuseparator-custom.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-menuseparator.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-page-wireframe.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-pageindicator-custom.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-pageindicator.png @@ -9801,56 +8522,69 @@ %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-popup-custom.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-popup-settings.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-popup-transformorigin.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-popup.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-progressbar-custom.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-progressbar-disabled.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-progressbar-indeterminate.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-progressbar-normal.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-radiobutton-checked.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-progressbar-indeterminate.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-progressbar.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-radiobutton-custom.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-radiobutton-disabled.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-radiobutton-focused.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-radiobutton-normal.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-radiobutton.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-radiobutton.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-radiodelegate-custom.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-radiodelegate.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-rangeslider-custom.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-rangeslider.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-roundbutton.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-scrollbar-custom.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-scrollbar-non-attached.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-scrollbar-nosnap.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-scrollbar-snapalways.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-scrollbar-snaponrelease.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-scrollbar.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-scrollindicator-custom.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-scrollindicator.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-scrollindicator-non-attached.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-scrollindicator.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-scrollview-custom.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-scrollview-wireframe.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-scrollview.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-sidepanel-landscape.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-sidepanel-portrait.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-slider-custom.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-slider-disabled.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-slider-focused.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-slider-normal.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-slider-nosnap.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-slider-snapalways.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-slider-snaponrelease.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-slider.gif -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-slider.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-spinbox-custom.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-spinbox-double.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-spinbox-textual.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-spinbox.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-stackview-pop.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-stackview-push.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-stackview-replace.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-stackview-unwind.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-stackview-visible.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-stackview-wireframe.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-styles.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-swipedelegate-behind.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-swipedelegate-custom.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-swipedelegate-leading-trailing.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-swipedelegate.gif +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-swipetoremove.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-swipeview-wireframe.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-switch-checked.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-swipeview.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-switch-custom.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-switch-disabled.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-switch-focused.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-switch-normal.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-switch.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-switch.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-switchdelegate-custom.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-switchdelegate.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-tabbar-custom.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-tabbar-explicit.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-tabbar-flickable.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-tabbar-wireframe.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-tabbutton.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-textarea-custom.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-textarea-flickable.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-textarea-scrollable.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-textarea.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-texteditor-desktop.jpg +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-texteditor-touch.jpg %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-textfield-custom.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-textfield-disabled.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-textfield-focused.png @@ -9860,15 +8594,23 @@ %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-toolbar.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-toolbutton-custom.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-toolbutton.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-toolseparator-custom.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-toolseparator.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-tooltip-slider.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-tooltip.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-tumbler-custom.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-tumbler-wrap.gif %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-tumbler.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-universal-accent.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-universal-attributes.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-universal-button.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-universal-background.png %%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-universal-dark.png -%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-universal.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-universal-foreground.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-universal-light.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-universal-theme.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-universal-thumbnail.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-universal-violet.png +%%QT_DOCDIR%%/qtquickcontrols2/images/qtquickcontrols2-wearable.png %%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/gallery/images/+material/back.png %%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/gallery/images/+material/back@2x.png %%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/gallery/images/+material/back@3x.png @@ -9905,16 +8647,20 @@ %%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/gallery/images/qt-logo@2x.png %%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/gallery/images/qt-logo@3x.png %%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/gallery/images/qt-logo@4x.png -%%QT_DOCDIR%%/qtquickcontrols2/qml-qt-labs-calendar2-calendar-members.html -%%QT_DOCDIR%%/qtquickcontrols2/qml-qt-labs-calendar2-calendar.html -%%QT_DOCDIR%%/qtquickcontrols2/qml-qt-labs-calendar2-calendarmodel-members.html -%%QT_DOCDIR%%/qtquickcontrols2/qml-qt-labs-calendar2-calendarmodel.html -%%QT_DOCDIR%%/qtquickcontrols2/qml-qt-labs-calendar2-dayofweekrow-members.html -%%QT_DOCDIR%%/qtquickcontrols2/qml-qt-labs-calendar2-dayofweekrow.html -%%QT_DOCDIR%%/qtquickcontrols2/qml-qt-labs-calendar2-monthgrid-members.html -%%QT_DOCDIR%%/qtquickcontrols2/qml-qt-labs-calendar2-monthgrid.html -%%QT_DOCDIR%%/qtquickcontrols2/qml-qt-labs-calendar2-weeknumbercolumn-members.html -%%QT_DOCDIR%%/qtquickcontrols2/qml-qt-labs-calendar2-weeknumbercolumn.html +%%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/sidepanel/images/qt-logo.png +%%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/sidepanel/images/qt-logo@2x.png +%%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/sidepanel/images/qt-logo@3x.png +%%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/sidepanel/images/qt-logo@4x.png +%%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/texteditor/images/qt-logo.png +%%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/wearable/images/back.png +%%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/wearable/images/back@2x.png +%%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/wearable/images/back@3x.png +%%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/wearable/images/back@4x.png +%%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/wearable/images/background.png +%%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/wearable/images/home.png +%%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/wearable/images/home@2x.png +%%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/wearable/images/home@3x.png +%%QT_DOCDIR%%/qtquickcontrols2/images/used-in-examples/wearable/images/home@4x.png %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-abstractbutton-members.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-abstractbutton.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-applicationwindow-members.html @@ -9935,8 +8681,14 @@ %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-container.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-control-members.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-control.html +%%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-delaybutton-members.html +%%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-delaybutton.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-dial-members.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-dial.html +%%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-dialog-members.html +%%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-dialog.html +%%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-dialogbuttonbox-members.html +%%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-dialogbuttonbox.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-drawer-members.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-drawer.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-frame-members.html @@ -9951,6 +8703,8 @@ %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-menu.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-menuitem-members.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-menuitem.html +%%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-menuseparator-members.html +%%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-menuseparator.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-page-members.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-page.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-pageindicator-members.html @@ -9967,10 +8721,14 @@ %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-radiodelegate.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-rangeslider-members.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-rangeslider.html +%%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-roundbutton-members.html +%%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-roundbutton.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-scrollbar-members.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-scrollbar.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-scrollindicator-members.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-scrollindicator.html +%%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-scrollview-members.html +%%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-scrollview.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-slider-members.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-slider.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-spinbox-members.html @@ -9997,14 +8755,14 @@ %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-toolbar.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-toolbutton-members.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-toolbutton.html +%%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-toolseparator-members.html +%%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-toolseparator.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-tooltip-members.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-tooltip.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-tumbler-members.html %%QT_DOCDIR%%/qtquickcontrols2/qml-qtquick-controls2-tumbler.html %%QT_DOCDIR%%/qtquickcontrols2/qquickstyle-members.html %%QT_DOCDIR%%/qtquickcontrols2/qquickstyle.html -%%QT_DOCDIR%%/qtquickcontrols2/qt-labs-calendar2-qmlmodule.html -%%QT_DOCDIR%%/qtquickcontrols2/qtlabscalendar-index.html %%QT_DOCDIR%%/qtquickcontrols2/qtquick-controls2-qmlmodule.html %%QT_DOCDIR%%/qtquickcontrols2/qtquick-templates2-qmlmodule.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-buttons.html @@ -10043,31 +8801,54 @@ %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-chattutorial-chattutorial-pro.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-chattutorial-example.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-chattutorial-shared-shared-qrc.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-configuration.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-contactlist-contactdelegate-ui-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-contactlist-contactdialog-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-contactlist-contactform-ui-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-contactlist-contactlist-pro.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-contactlist-contactlist-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-contactlist-contactmodel-cpp.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-contactlist-contactmodel-h.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-contactlist-contactview-ui-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-contactlist-designer-backend-contactmodel-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-contactlist-designer-backend-qmldir.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-contactlist-example.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-contactlist-main-cpp.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-contactlist-sectiondelegate-ui-qml.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-containers.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-customize.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-default.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-delegates.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-deployment.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-differences.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-environment.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-examples.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-fileselectors.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-flatstyle-example.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-flatstyle-flat-button-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-flatstyle-flat-checkbox-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-flatstyle-flat-switch-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-flatstyle-flatstyle-pro.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-flatstyle-flatstyle-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-flatstyle-imports-theme-qmldir.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-flatstyle-imports-theme-theme-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-flatstyle-main-cpp.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-flatstyle-mainform-ui-qml.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-example.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-gallery-cpp.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-gallery-pro.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-gallery-qml.html -%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-gallery-qrc.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-pages-busyindicatorpage-qml.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-pages-buttonpage-qml.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-pages-checkboxpage-qml.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-pages-comboboxpage-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-pages-delaybuttonpage-qml.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-pages-delegatepage-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-pages-dialogpage-qml.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-pages-dialpage-qml.html -%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-pages-drawerpage-qml.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-pages-framepage-qml.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-pages-groupboxpage-qml.html -%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-pages-menupage-qml.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-pages-pageindicatorpage-qml.html -%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-pages-popuppage-qml.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-pages-progressbarpage-qml.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-pages-radiobuttonpage-qml.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-gallery-pages-rangesliderpage-qml.html @@ -10095,8 +8876,50 @@ %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-module.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-navigation.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-popups.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-separators.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-sidepanel-example.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-sidepanel-sidepanel-cpp.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-sidepanel-sidepanel-pro.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-sidepanel-sidepanel-qml.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-styles.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-swipetoremove-example.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-swipetoremove-swipetoremove-cpp.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-swipetoremove-swipetoremove-pro.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-swipetoremove-swipetoremove-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-texteditor-documenthandler-cpp.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-texteditor-documenthandler-h.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-texteditor-example.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-texteditor-qml-texteditor-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-texteditor-qml-touch-texteditor-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-texteditor-texteditor-cpp.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-texteditor-texteditor-pro.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-texteditor-texteditor-qrc.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-universal.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-example.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-alarms-alarmspage-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-fitness-fitness-js.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-fitness-fitnesspage-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-launcherpage-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-navibutton-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-navigation-navigation-js.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-navigation-navigationpage-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-navigation-routeelement-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-notifications-notifications-js.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-notifications-notificationspage-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-settings-settingspage-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-style-pageindicator-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-style-qmldir.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-style-slider-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-style-switch-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-style-uistyle-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-weather-weather-js.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-weather-weatherpage-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-worldclock-clock-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-qml-worldclock-worldclockpage-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-wearable-cpp.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-wearable-pro.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-wearable-qml.html +%%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2-wearable-wearable-qrc.html %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2.index %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2.qhp %%QT_DOCDIR%%/qtquickcontrols2/qtquickcontrols2.qhp.sha1 @@ -10276,129 +9099,6 @@ %%QT_DOCDIR%%/qtquickextras/qtquickextras.qhp.sha1 %%QT_DOCDIR%%/qtquickextras/style/offline-simple.css %%QT_DOCDIR%%/qtquickextras/style/offline.css -%%QT_DOCDIR%%/qtscript.qch -%%QT_DOCDIR%%/qtscript/ecmascript.html -%%QT_DOCDIR%%/qtscript/examples-manifest.xml -%%QT_DOCDIR%%/qtscript/images/arrow_bc.png -%%QT_DOCDIR%%/qtscript/images/bgrContent.png -%%QT_DOCDIR%%/qtscript/images/btn_next.png -%%QT_DOCDIR%%/qtscript/images/btn_prev.png -%%QT_DOCDIR%%/qtscript/images/bullet_dn.png -%%QT_DOCDIR%%/qtscript/images/bullet_sq.png -%%QT_DOCDIR%%/qtscript/images/context2d-example-smileysmile.png -%%QT_DOCDIR%%/qtscript/images/context2d-example.png -%%QT_DOCDIR%%/qtscript/images/defaultprototypes-example.png -%%QT_DOCDIR%%/qtscript/images/home.png -%%QT_DOCDIR%%/qtscript/images/ico_note.png -%%QT_DOCDIR%%/qtscript/images/ico_note_attention.png -%%QT_DOCDIR%%/qtscript/images/ico_out.png -%%QT_DOCDIR%%/qtscript/images/logo.png -%%QT_DOCDIR%%/qtscript/images/qtscript-debugger.png -%%QT_DOCDIR%%/qtscript/qscriptable-members.html -%%QT_DOCDIR%%/qtscript/qscriptable.html -%%QT_DOCDIR%%/qtscript/qscriptclass-members.html -%%QT_DOCDIR%%/qtscript/qscriptclass.html -%%QT_DOCDIR%%/qtscript/qscriptclasspropertyiterator-members.html -%%QT_DOCDIR%%/qtscript/qscriptclasspropertyiterator.html -%%QT_DOCDIR%%/qtscript/qscriptcontext-members.html -%%QT_DOCDIR%%/qtscript/qscriptcontext.html -%%QT_DOCDIR%%/qtscript/qscriptcontextinfo-members.html -%%QT_DOCDIR%%/qtscript/qscriptcontextinfo-obsolete.html -%%QT_DOCDIR%%/qtscript/qscriptcontextinfo.html -%%QT_DOCDIR%%/qtscript/qscriptengine-members.html -%%QT_DOCDIR%%/qtscript/qscriptengine-obsolete.html -%%QT_DOCDIR%%/qtscript/qscriptengine.html -%%QT_DOCDIR%%/qtscript/qscriptengineagent-members.html -%%QT_DOCDIR%%/qtscript/qscriptengineagent.html -%%QT_DOCDIR%%/qtscript/qscriptextensionplugin-members.html -%%QT_DOCDIR%%/qtscript/qscriptextensionplugin.html -%%QT_DOCDIR%%/qtscript/qscriptprogram-members.html -%%QT_DOCDIR%%/qtscript/qscriptprogram.html -%%QT_DOCDIR%%/qtscript/qscriptstring-members.html -%%QT_DOCDIR%%/qtscript/qscriptstring.html -%%QT_DOCDIR%%/qtscript/qscriptsyntaxcheckresult-members.html -%%QT_DOCDIR%%/qtscript/qscriptsyntaxcheckresult.html -%%QT_DOCDIR%%/qtscript/qscriptvalue-members.html -%%QT_DOCDIR%%/qtscript/qscriptvalue-obsolete.html -%%QT_DOCDIR%%/qtscript/qscriptvalue.html -%%QT_DOCDIR%%/qtscript/qscriptvalueiterator-members.html -%%QT_DOCDIR%%/qtscript/qscriptvalueiterator.html -%%QT_DOCDIR%%/qtscript/qtscript-index.html -%%QT_DOCDIR%%/qtscript/qtscript-module.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-context2d-cpp.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-context2d-h.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-context2d-pro.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-context2d-qrc.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-domimage-cpp.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-domimage-h.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-environment-cpp.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-environment-h.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-example.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-main-cpp.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-qcontext2dcanvas-cpp.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-qcontext2dcanvas-h.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-alpha-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-arc-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-bezier-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-clock-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-fill1-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-grad-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-linecap-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-linestye-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-moveto-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-moveto2-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-pacman-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-plasma-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-pong-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-quad-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-rgba-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-rotate-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-scale-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-stroke1-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-scripts-translate-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-window-cpp.html -%%QT_DOCDIR%%/qtscript/qtscript-script-context2d-window-h.html -%%QT_DOCDIR%%/qtscript/qtscript-script-defaultprototypes-code-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-defaultprototypes-defaultprototypes-pro.html -%%QT_DOCDIR%%/qtscript/qtscript-script-defaultprototypes-defaultprototypes-qrc.html -%%QT_DOCDIR%%/qtscript/qtscript-script-defaultprototypes-example.html -%%QT_DOCDIR%%/qtscript/qtscript-script-defaultprototypes-main-cpp.html -%%QT_DOCDIR%%/qtscript/qtscript-script-defaultprototypes-prototypes-cpp.html -%%QT_DOCDIR%%/qtscript/qtscript-script-defaultprototypes-prototypes-h.html -%%QT_DOCDIR%%/qtscript/qtscript-script-helloscript-example.html -%%QT_DOCDIR%%/qtscript/qtscript-script-helloscript-helloscript-js.html -%%QT_DOCDIR%%/qtscript/qtscript-script-helloscript-helloscript-pro.html -%%QT_DOCDIR%%/qtscript/qtscript-script-helloscript-helloscript-qrc.html -%%QT_DOCDIR%%/qtscript/qtscript-script-helloscript-main-cpp.html -%%QT_DOCDIR%%/qtscript/qtscript.index -%%QT_DOCDIR%%/qtscript/qtscript.qhp -%%QT_DOCDIR%%/qtscript/qtscript.qhp.sha1 -%%QT_DOCDIR%%/qtscript/qtscriptdebugger-manual.html -%%QT_DOCDIR%%/qtscript/qtscriptextensions.html -%%QT_DOCDIR%%/qtscript/script.html -%%QT_DOCDIR%%/qtscript/style/offline-simple.css -%%QT_DOCDIR%%/qtscript/style/offline.css -%%QT_DOCDIR%%/qtscripttools.qch -%%QT_DOCDIR%%/qtscripttools/images/arrow_bc.png -%%QT_DOCDIR%%/qtscripttools/images/bgrContent.png -%%QT_DOCDIR%%/qtscripttools/images/btn_next.png -%%QT_DOCDIR%%/qtscripttools/images/btn_prev.png -%%QT_DOCDIR%%/qtscripttools/images/bullet_dn.png -%%QT_DOCDIR%%/qtscripttools/images/bullet_sq.png -%%QT_DOCDIR%%/qtscripttools/images/home.png -%%QT_DOCDIR%%/qtscripttools/images/ico_note.png -%%QT_DOCDIR%%/qtscripttools/images/ico_note_attention.png -%%QT_DOCDIR%%/qtscripttools/images/ico_out.png -%%QT_DOCDIR%%/qtscripttools/images/logo.png -%%QT_DOCDIR%%/qtscripttools/qscriptenginedebugger-members.html -%%QT_DOCDIR%%/qtscripttools/qscriptenginedebugger.html -%%QT_DOCDIR%%/qtscripttools/qtscripttools-index.html -%%QT_DOCDIR%%/qtscripttools/qtscripttools-module.html -%%QT_DOCDIR%%/qtscripttools/qtscripttools.index -%%QT_DOCDIR%%/qtscripttools/qtscripttools.qhp -%%QT_DOCDIR%%/qtscripttools/qtscripttools.qhp.sha1 -%%QT_DOCDIR%%/qtscripttools/style/offline-simple.css -%%QT_DOCDIR%%/qtscripttools/style/offline.css %%QT_DOCDIR%%/qtscxml.qch %%QT_DOCDIR%%/qtscxml/examples-manifest.xml %%QT_DOCDIR%%/qtscxml/examples-qtscxml.html @@ -10410,6 +9110,7 @@ %%QT_DOCDIR%%/qtscxml/images/bullet_sq.png %%QT_DOCDIR%%/qtscxml/images/calculator-qml.png %%QT_DOCDIR%%/qtscxml/images/calculator.png +%%QT_DOCDIR%%/qtscxml/images/ftpclient-statechart.png %%QT_DOCDIR%%/qtscxml/images/home.png %%QT_DOCDIR%%/qtscxml/images/ico_note.png %%QT_DOCDIR%%/qtscxml/images/ico_note_attention.png @@ -10426,32 +9127,60 @@ %%QT_DOCDIR%%/qtscxml/images/pinball-statechart-onstate.png %%QT_DOCDIR%%/qtscxml/images/pinball-statechart-workflow.png %%QT_DOCDIR%%/qtscxml/images/pinball.png +%%QT_DOCDIR%%/qtscxml/images/sudoku.png %%QT_DOCDIR%%/qtscxml/images/trafficlight.png %%QT_DOCDIR%%/qtscxml/qml-mediaplayer-qml-dynamic-members.html %%QT_DOCDIR%%/qtscxml/qml-mediaplayer-qml-dynamic.html -%%QT_DOCDIR%%/qtscxml/qml-scxml-statemachineloader-members.html -%%QT_DOCDIR%%/qtscxml/qml-scxml-statemachineloader.html +%%QT_DOCDIR%%/qtscxml/qml-qtscxml-eventconnection-members.html +%%QT_DOCDIR%%/qtscxml/qml-qtscxml-eventconnection.html +%%QT_DOCDIR%%/qtscxml/qml-qtscxml-invokedservices-members.html +%%QT_DOCDIR%%/qtscxml/qml-qtscxml-invokedservices.html +%%QT_DOCDIR%%/qtscxml/qml-qtscxml-scxmlstatemachine-members.html +%%QT_DOCDIR%%/qtscxml/qml-qtscxml-scxmlstatemachine.html +%%QT_DOCDIR%%/qtscxml/qml-qtscxml-statemachineloader-members.html +%%QT_DOCDIR%%/qtscxml/qml-qtscxml-statemachineloader.html %%QT_DOCDIR%%/qtscxml/qscxmlc.html +%%QT_DOCDIR%%/qtscxml/qscxmlcompiler-loader-members.html +%%QT_DOCDIR%%/qtscxml/qscxmlcompiler-loader.html +%%QT_DOCDIR%%/qtscxml/qscxmlcompiler-members.html +%%QT_DOCDIR%%/qtscxml/qscxmlcompiler.html %%QT_DOCDIR%%/qtscxml/qscxmlcppdatamodel-members.html %%QT_DOCDIR%%/qtscxml/qscxmlcppdatamodel.html +%%QT_DOCDIR%%/qtscxml/qscxmldatamodel-foreachloopbody-members.html +%%QT_DOCDIR%%/qtscxml/qscxmldatamodel-foreachloopbody.html %%QT_DOCDIR%%/qtscxml/qscxmldatamodel-members.html %%QT_DOCDIR%%/qtscxml/qscxmldatamodel.html +%%QT_DOCDIR%%/qtscxml/qscxmldynamicscxmlservicefactory-members.html +%%QT_DOCDIR%%/qtscxml/qscxmldynamicscxmlservicefactory.html %%QT_DOCDIR%%/qtscxml/qscxmlecmascriptdatamodel-members.html %%QT_DOCDIR%%/qtscxml/qscxmlecmascriptdatamodel.html %%QT_DOCDIR%%/qtscxml/qscxmlerror-members.html %%QT_DOCDIR%%/qtscxml/qscxmlerror.html %%QT_DOCDIR%%/qtscxml/qscxmlevent-members.html %%QT_DOCDIR%%/qtscxml/qscxmlevent.html -%%QT_DOCDIR%%/qtscxml/qscxmleventfilter-members.html -%%QT_DOCDIR%%/qtscxml/qscxmleventfilter.html +%%QT_DOCDIR%%/qtscxml/qscxmlexecutablecontent-assignmentinfo-members.html +%%QT_DOCDIR%%/qtscxml/qscxmlexecutablecontent-assignmentinfo.html +%%QT_DOCDIR%%/qtscxml/qscxmlexecutablecontent-evaluatorinfo-members.html +%%QT_DOCDIR%%/qtscxml/qscxmlexecutablecontent-evaluatorinfo.html +%%QT_DOCDIR%%/qtscxml/qscxmlexecutablecontent-foreachinfo-members.html +%%QT_DOCDIR%%/qtscxml/qscxmlexecutablecontent-foreachinfo.html +%%QT_DOCDIR%%/qtscxml/qscxmlexecutablecontent-invokeinfo-members.html +%%QT_DOCDIR%%/qtscxml/qscxmlexecutablecontent-invokeinfo.html +%%QT_DOCDIR%%/qtscxml/qscxmlexecutablecontent-parameterinfo-members.html +%%QT_DOCDIR%%/qtscxml/qscxmlexecutablecontent-parameterinfo.html +%%QT_DOCDIR%%/qtscxml/qscxmlexecutablecontent.html +%%QT_DOCDIR%%/qtscxml/qscxmlinvokableservice-members.html +%%QT_DOCDIR%%/qtscxml/qscxmlinvokableservice.html +%%QT_DOCDIR%%/qtscxml/qscxmlinvokableservicefactory-members.html +%%QT_DOCDIR%%/qtscxml/qscxmlinvokableservicefactory.html %%QT_DOCDIR%%/qtscxml/qscxmlnulldatamodel-members.html %%QT_DOCDIR%%/qtscxml/qscxmlnulldatamodel.html -%%QT_DOCDIR%%/qtscxml/qscxmlparser-loader-members.html -%%QT_DOCDIR%%/qtscxml/qscxmlparser-loader.html -%%QT_DOCDIR%%/qtscxml/qscxmlparser-members.html -%%QT_DOCDIR%%/qtscxml/qscxmlparser.html %%QT_DOCDIR%%/qtscxml/qscxmlstatemachine-members.html %%QT_DOCDIR%%/qtscxml/qscxmlstatemachine.html +%%QT_DOCDIR%%/qtscxml/qscxmlstaticscxmlservicefactory-members.html +%%QT_DOCDIR%%/qtscxml/qscxmlstaticscxmlservicefactory.html +%%QT_DOCDIR%%/qtscxml/qscxmltabledata-members.html +%%QT_DOCDIR%%/qtscxml/qscxmltabledata.html %%QT_DOCDIR%%/qtscxml/qtscxml-calculator-qml-button-qml.html %%QT_DOCDIR%%/qtscxml/qtscxml-calculator-qml-calculator-qml-cpp.html %%QT_DOCDIR%%/qtscxml/qtscxml-calculator-qml-calculator-qml-pro.html @@ -10464,6 +9193,14 @@ %%QT_DOCDIR%%/qtscxml/qtscxml-calculator-widgets-mainwindow-cpp.html %%QT_DOCDIR%%/qtscxml/qtscxml-calculator-widgets-mainwindow-h.html %%QT_DOCDIR%%/qtscxml/qtscxml-calculator-widgets-mainwindow-ui.html +%%QT_DOCDIR%%/qtscxml/qtscxml-ftpclient-example.html +%%QT_DOCDIR%%/qtscxml/qtscxml-ftpclient-ftpclient-pro.html +%%QT_DOCDIR%%/qtscxml/qtscxml-ftpclient-ftpcontrolchannel-cpp.html +%%QT_DOCDIR%%/qtscxml/qtscxml-ftpclient-ftpcontrolchannel-h.html +%%QT_DOCDIR%%/qtscxml/qtscxml-ftpclient-ftpdatachannel-cpp.html +%%QT_DOCDIR%%/qtscxml/qtscxml-ftpclient-ftpdatachannel-h.html +%%QT_DOCDIR%%/qtscxml/qtscxml-ftpclient-main-cpp.html +%%QT_DOCDIR%%/qtscxml/qtscxml-ftpclient-simpleftp-scxml.html %%QT_DOCDIR%%/qtscxml/qtscxml-index.html %%QT_DOCDIR%%/qtscxml/qtscxml-instantiating-state-machines.html %%QT_DOCDIR%%/qtscxml/qtscxml-invoke-dynamic-example.html @@ -10510,12 +9247,27 @@ %%QT_DOCDIR%%/qtscxml/qtscxml-pinball-mainwindow-ui.html %%QT_DOCDIR%%/qtscxml/qtscxml-pinball-pinball-pro.html %%QT_DOCDIR%%/qtscxml/qtscxml-pinball-pinball-scxml.html +%%QT_DOCDIR%%/qtscxml/qtscxml-qmlmodule.html %%QT_DOCDIR%%/qtscxml/qtscxml-scxml-compliance.html +%%QT_DOCDIR%%/qtscxml/qtscxml-sudoku-example.html +%%QT_DOCDIR%%/qtscxml/qtscxml-sudoku-main-cpp.html +%%QT_DOCDIR%%/qtscxml/qtscxml-sudoku-mainwindow-cpp.html +%%QT_DOCDIR%%/qtscxml/qtscxml-sudoku-mainwindow-h.html +%%QT_DOCDIR%%/qtscxml/qtscxml-sudoku-sudoku-js.html +%%QT_DOCDIR%%/qtscxml/qtscxml-sudoku-sudoku-pro.html +%%QT_DOCDIR%%/qtscxml/qtscxml-sudoku-sudoku-qrc.html +%%QT_DOCDIR%%/qtscxml/qtscxml-sudoku-sudoku-scxml.html %%QT_DOCDIR%%/qtscxml/qtscxml-trafficlight-qml-dynamic-example.html %%QT_DOCDIR%%/qtscxml/qtscxml-trafficlight-qml-dynamic-trafficlight-qml-dynamic-cpp.html %%QT_DOCDIR%%/qtscxml/qtscxml-trafficlight-qml-dynamic-trafficlight-qml-dynamic-pro.html %%QT_DOCDIR%%/qtscxml/qtscxml-trafficlight-qml-dynamic-trafficlight-qml-dynamic-qml.html %%QT_DOCDIR%%/qtscxml/qtscxml-trafficlight-qml-dynamic-trafficlight-qml-dynamic-qrc.html +%%QT_DOCDIR%%/qtscxml/qtscxml-trafficlight-qml-simple-example.html +%%QT_DOCDIR%%/qtscxml/qtscxml-trafficlight-qml-simple-light-qml.html +%%QT_DOCDIR%%/qtscxml/qtscxml-trafficlight-qml-simple-trafficlight-qml-simple-cpp.html +%%QT_DOCDIR%%/qtscxml/qtscxml-trafficlight-qml-simple-trafficlight-qml-simple-pro.html +%%QT_DOCDIR%%/qtscxml/qtscxml-trafficlight-qml-simple-trafficlight-qml-simple-qrc.html +%%QT_DOCDIR%%/qtscxml/qtscxml-trafficlight-qml-simple-trafficlight-qml.html %%QT_DOCDIR%%/qtscxml/qtscxml-trafficlight-qml-static-example.html %%QT_DOCDIR%%/qtscxml/qtscxml-trafficlight-qml-static-trafficlight-qml-static-cpp.html %%QT_DOCDIR%%/qtscxml/qtscxml-trafficlight-qml-static-trafficlight-qml-static-pro.html @@ -10533,7 +9285,6 @@ %%QT_DOCDIR%%/qtscxml/qtscxml.qhp %%QT_DOCDIR%%/qtscxml/qtscxml.qhp.sha1 %%QT_DOCDIR%%/qtscxml/qtscxml.tags -%%QT_DOCDIR%%/qtscxml/scxml-qmlmodule.html %%QT_DOCDIR%%/qtscxml/style/offline-simple.css %%QT_DOCDIR%%/qtscxml/style/offline.css %%QT_DOCDIR%%/qtsensors.qch @@ -10633,12 +9384,24 @@ %%QT_DOCDIR%%/qtsensors/qholsterreading.html %%QT_DOCDIR%%/qtsensors/qholstersensor-members.html %%QT_DOCDIR%%/qtsensors/qholstersensor.html +%%QT_DOCDIR%%/qtsensors/qhumidityfilter-members.html +%%QT_DOCDIR%%/qtsensors/qhumidityfilter.html +%%QT_DOCDIR%%/qtsensors/qhumidityreading-members.html +%%QT_DOCDIR%%/qtsensors/qhumidityreading.html +%%QT_DOCDIR%%/qtsensors/qhumiditysensor-members.html +%%QT_DOCDIR%%/qtsensors/qhumiditysensor.html %%QT_DOCDIR%%/qtsensors/qirproximityfilter-members.html %%QT_DOCDIR%%/qtsensors/qirproximityfilter.html %%QT_DOCDIR%%/qtsensors/qirproximityreading-members.html %%QT_DOCDIR%%/qtsensors/qirproximityreading.html %%QT_DOCDIR%%/qtsensors/qirproximitysensor-members.html %%QT_DOCDIR%%/qtsensors/qirproximitysensor.html +%%QT_DOCDIR%%/qtsensors/qlidfilter-members.html +%%QT_DOCDIR%%/qtsensors/qlidfilter.html +%%QT_DOCDIR%%/qtsensors/qlidreading-members.html +%%QT_DOCDIR%%/qtsensors/qlidreading.html +%%QT_DOCDIR%%/qtsensors/qlidsensor-members.html +%%QT_DOCDIR%%/qtsensors/qlidsensor.html %%QT_DOCDIR%%/qtsensors/qlightfilter-members.html %%QT_DOCDIR%%/qtsensors/qlightfilter.html %%QT_DOCDIR%%/qtsensors/qlightreading-members.html @@ -10683,10 +9446,18 @@ %%QT_DOCDIR%%/qtsensors/qml-qtsensors-holsterreading.html %%QT_DOCDIR%%/qtsensors/qml-qtsensors-holstersensor-members.html %%QT_DOCDIR%%/qtsensors/qml-qtsensors-holstersensor.html +%%QT_DOCDIR%%/qtsensors/qml-qtsensors-humidityreading-members.html +%%QT_DOCDIR%%/qtsensors/qml-qtsensors-humidityreading.html +%%QT_DOCDIR%%/qtsensors/qml-qtsensors-humiditysensor-members.html +%%QT_DOCDIR%%/qtsensors/qml-qtsensors-humiditysensor.html %%QT_DOCDIR%%/qtsensors/qml-qtsensors-irproximityreading-members.html %%QT_DOCDIR%%/qtsensors/qml-qtsensors-irproximityreading.html %%QT_DOCDIR%%/qtsensors/qml-qtsensors-irproximitysensor-members.html %%QT_DOCDIR%%/qtsensors/qml-qtsensors-irproximitysensor.html +%%QT_DOCDIR%%/qtsensors/qml-qtsensors-lidreading-members.html +%%QT_DOCDIR%%/qtsensors/qml-qtsensors-lidreading.html +%%QT_DOCDIR%%/qtsensors/qml-qtsensors-lidsensor-members.html +%%QT_DOCDIR%%/qtsensors/qml-qtsensors-lidsensor.html %%QT_DOCDIR%%/qtsensors/qml-qtsensors-lightreading-members.html %%QT_DOCDIR%%/qtsensors/qml-qtsensors-lightreading.html %%QT_DOCDIR%%/qtsensors/qml-qtsensors-lightsensor-members.html @@ -10921,8 +9692,12 @@ %%QT_DOCDIR%%/qtserialbus/qcanbusdevice-filter.html %%QT_DOCDIR%%/qtserialbus/qcanbusdevice-members.html %%QT_DOCDIR%%/qtserialbus/qcanbusdevice.html +%%QT_DOCDIR%%/qtserialbus/qcanbusdeviceinfo-members.html +%%QT_DOCDIR%%/qtserialbus/qcanbusdeviceinfo.html %%QT_DOCDIR%%/qtserialbus/qcanbusfactory-members.html %%QT_DOCDIR%%/qtserialbus/qcanbusfactory.html +%%QT_DOCDIR%%/qtserialbus/qcanbusfactoryv2-members.html +%%QT_DOCDIR%%/qtserialbus/qcanbusfactoryv2.html %%QT_DOCDIR%%/qtserialbus/qcanbusframe-members.html %%QT_DOCDIR%%/qtserialbus/qcanbusframe-timestamp-members.html %%QT_DOCDIR%%/qtserialbus/qcanbusframe-timestamp.html @@ -10957,6 +9732,8 @@ %%QT_DOCDIR%%/qtserialbus/qmodbustcpserver.html %%QT_DOCDIR%%/qtserialbus/qtcanbus-backends.html %%QT_DOCDIR%%/qtserialbus/qtmodbus-backends.html +%%QT_DOCDIR%%/qtserialbus/qtserialbus-can-bitratebox-cpp.html +%%QT_DOCDIR%%/qtserialbus/qtserialbus-can-bitratebox-h.html %%QT_DOCDIR%%/qtserialbus/qtserialbus-can-can-pro.html %%QT_DOCDIR%%/qtserialbus/qtserialbus-can-can-qrc.html %%QT_DOCDIR%%/qtserialbus/qtserialbus-can-connectdialog-cpp.html @@ -10994,7 +9771,9 @@ %%QT_DOCDIR%%/qtserialbus/qtserialbus-module.html %%QT_DOCDIR%%/qtserialbus/qtserialbus-peakcan-overview.html %%QT_DOCDIR%%/qtserialbus/qtserialbus-socketcan-overview.html +%%QT_DOCDIR%%/qtserialbus/qtserialbus-systeccan-overview.html %%QT_DOCDIR%%/qtserialbus/qtserialbus-tinycan-overview.html +%%QT_DOCDIR%%/qtserialbus/qtserialbus-vectorcan-overview.html %%QT_DOCDIR%%/qtserialbus/qtserialbus.index %%QT_DOCDIR%%/qtserialbus/qtserialbus.qhp %%QT_DOCDIR%%/qtserialbus/qtserialbus.qhp.sha1 @@ -11161,6 +9940,7 @@ %%QT_DOCDIR%%/qtsql/qsqlresult.html %%QT_DOCDIR%%/qtsql/qsqltablemodel-members.html %%QT_DOCDIR%%/qtsql/qsqltablemodel.html +%%QT_DOCDIR%%/qtsql/qtsql-attribution-sqlite.html %%QT_DOCDIR%%/qtsql/qtsql-books-bookdelegate-cpp.html %%QT_DOCDIR%%/qtsql/qtsql-books-bookdelegate-h.html %%QT_DOCDIR%%/qtsql/qtsql-books-books-pro.html @@ -11266,6 +10046,7 @@ %%QT_DOCDIR%%/qtsvg/qsvgrenderer.html %%QT_DOCDIR%%/qtsvg/qsvgwidget-members.html %%QT_DOCDIR%%/qtsvg/qsvgwidget.html +%%QT_DOCDIR%%/qtsvg/qtsvg-attribution-xsvg.html %%QT_DOCDIR%%/qtsvg/qtsvg-index.html %%QT_DOCDIR%%/qtsvg/qtsvg-module.html %%QT_DOCDIR%%/qtsvg/qtsvg-richtext-textobject-example.html @@ -11303,7 +10084,6 @@ %%QT_DOCDIR%%/qtsvg/qtsvg.qhp %%QT_DOCDIR%%/qtsvg/qtsvg.qhp.sha1 %%QT_DOCDIR%%/qtsvg/qtsvg.tags -%%QT_DOCDIR%%/qtsvg/qtsvglicense.html %%QT_DOCDIR%%/qtsvg/style/offline-simple.css %%QT_DOCDIR%%/qtsvg/style/offline.css %%QT_DOCDIR%%/qtsvg/svgrendering.html @@ -11332,6 +10112,9 @@ %%QT_DOCDIR%%/qttestlib/qtesteventlist.html %%QT_DOCDIR%%/qttestlib/qttest-index.html %%QT_DOCDIR%%/qttestlib/qttest-module.html +%%QT_DOCDIR%%/qttestlib/qttestlib-attribution-cycle.html +%%QT_DOCDIR%%/qttestlib/qttestlib-attribution-linuxperf.html +%%QT_DOCDIR%%/qttestlib/qttestlib-attribution-valgrind.html %%QT_DOCDIR%%/qttestlib/qttestlib-tutorial1-example.html %%QT_DOCDIR%%/qttestlib/qttestlib-tutorial1-testqstring-cpp.html %%QT_DOCDIR%%/qttestlib/qttestlib-tutorial1-tutorial1-pro.html @@ -11394,138 +10177,152 @@ %%QT_DOCDIR%%/qtuitools/quiloader.html %%QT_DOCDIR%%/qtuitools/style/offline-simple.css %%QT_DOCDIR%%/qtuitools/style/offline.css -%%QT_DOCDIR%%/qtvirtualkeyboard.qch -%%QT_DOCDIR%%/qtvirtualkeyboard/build.html -%%QT_DOCDIR%%/qtvirtualkeyboard/deployment-guide.html -%%QT_DOCDIR%%/qtvirtualkeyboard/examples-manifest.xml -%%QT_DOCDIR%%/qtvirtualkeyboard/images/arrow_bc.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/basic-example.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/bgrContent.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/btn_next.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/btn_prev.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/bullet_dn.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/bullet_sq.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/gesture-double-left.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/gesture-double-up.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/gesture-single-down-left.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/gesture-single-left.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/gesture-single-right.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/gesture-single-up.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/handwriting-mode-icon.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/home.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/ico_note.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/ico_note_attention.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/ico_out.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/language-icon.png -%%QT_DOCDIR%%/qtvirtualkeyboard/images/logo.png -%%QT_DOCDIR%%/qtvirtualkeyboard/inputframework-module.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-backspacekey-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-backspacekey.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-basekey-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-basekey.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-changelanguagekey-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-changelanguagekey.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-enterkey-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-enterkey.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-enterkeyaction-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-enterkeyaction.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-fillerkey-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-fillerkey.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-handwritinginputpanel-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-handwritinginputpanel.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-handwritingmodekey-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-handwritingmodekey.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-hidekeyboardkey-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-hidekeyboardkey.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-inputcontext-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-inputcontext.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-inputengine-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-inputengine.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-inputmethod-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-inputmethod.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-inputpanel-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-inputpanel.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-key-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-key.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-keyboardcolumn-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-keyboardcolumn.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-keyboardlayout-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-keyboardlayout.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-keyboardlayoutloader-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-keyboardlayoutloader.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-keyboardrow-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-keyboardrow.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-modekey-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-modekey.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-numberkey-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-numberkey.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-selectionlistmodel-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-selectionlistmodel.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-settings-virtualkeyboardsettings-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-settings-virtualkeyboardsettings.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-shifthandler-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-shifthandler.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-shiftkey-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-shiftkey.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-spacekey-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-spacekey.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-styles-keyboardstyle-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-styles-keyboardstyle.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-styles-keyicon-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-styles-keyicon.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-styles-keypanel-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-styles-keypanel.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-styles-selectionlistitem-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-styles-selectionlistitem.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-styles-tracecanvas-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-styles-tracecanvas.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-styles-traceinputkeypanel-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-styles-traceinputkeypanel.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-symbolmodekey-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-symbolmodekey.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-trace-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-trace.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-traceinputarea-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-traceinputarea.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-traceinputkey-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qml-qtquick-virtualkeyboard-traceinputkey.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qt-virtual-keyboard-qmltypes.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtquick-virtualkeyboard-qmlmodule.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtquick-virtualkeyboard-settings-qmlmodule.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtquick-virtualkeyboard-styles-qmlmodule.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-basic-basic-b2qt-qml.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-basic-basic-pro.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-basic-basic-qml.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-basic-content-autoscroller-qml.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-basic-content-floatingbutton-active-svg.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-basic-content-floatingbutton-available-svg.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-basic-content-floatingbutton-unavailable-svg.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-basic-content-handwritingmodebutton-qml.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-basic-content-scrollbar-qml.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-basic-content-textarea-qml.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-basic-content-textbase-qml.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-basic-content-textfield-qml.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-basic-demo-qrc.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-basic-example.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-basic-main-cpp.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-examples.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-index.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-inputcontext-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-inputcontext.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-inputengine-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-inputengine.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-selectionlistmodel-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-selectionlistmodel.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-shifthandler-members.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-shifthandler.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard-user-guide.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard.html -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard.index -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard.qhp -%%QT_DOCDIR%%/qtvirtualkeyboard/qtvirtualkeyboard.qhp.sha1 -%%QT_DOCDIR%%/qtvirtualkeyboard/style/offline-simple.css -%%QT_DOCDIR%%/qtvirtualkeyboard/style/offline.css -%%QT_DOCDIR%%/qtvirtualkeyboard/technical-guide.html +%%QT_DOCDIR%%/qtwaylandcompositor.qch +%%QT_DOCDIR%%/qtwaylandcompositor/examples-manifest.xml +%%QT_DOCDIR%%/qtwaylandcompositor/images/arrow_bc.png +%%QT_DOCDIR%%/qtwaylandcompositor/images/bgrContent.png +%%QT_DOCDIR%%/qtwaylandcompositor/images/btn_next.png +%%QT_DOCDIR%%/qtwaylandcompositor/images/btn_prev.png +%%QT_DOCDIR%%/qtwaylandcompositor/images/bullet_dn.png +%%QT_DOCDIR%%/qtwaylandcompositor/images/bullet_sq.png +%%QT_DOCDIR%%/qtwaylandcompositor/images/home.png +%%QT_DOCDIR%%/qtwaylandcompositor/images/ico_note.png +%%QT_DOCDIR%%/qtwaylandcompositor/images/ico_note_attention.png +%%QT_DOCDIR%%/qtwaylandcompositor/images/ico_out.png +%%QT_DOCDIR%%/qtwaylandcompositor/images/logo.png +%%QT_DOCDIR%%/qtwaylandcompositor/images/used-in-examples/multi-output/images/background.jpg +%%QT_DOCDIR%%/qtwaylandcompositor/images/used-in-examples/pure-qml/images/background.jpg +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-iviapplication-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-iviapplication.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-ivisurface-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-ivisurface.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-shellsurfaceitem-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-shellsurfaceitem.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-waylandclient-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-waylandclient.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-waylandcompositor-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-waylandcompositor.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-waylandoutput-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-waylandoutput.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-waylandquickitem-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-waylandquickitem.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-waylandseat-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-waylandseat.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-waylandsurface-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-waylandsurface.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-waylandview-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-waylandview.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-wlshell-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-wlshell.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-wlshellsurface-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-wlshellsurface.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-xdgpopupv5-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-xdgpopupv5.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-xdgshellv5-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-xdgshellv5.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-xdgsurfacev5-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qml-qtwayland-compositor-xdgsurfacev5.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwayland-compositor-qmlmodule.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-attribution-wayland-ivi-extension-protocol.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-attribution-wayland-protocol.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-attribution-wayland-txt-input-unstable.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-attribution-wayland-xdg-shell-protocol.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-examples.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-index.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-ivi-compositor-example.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-ivi-compositor-ivi-compositor-pro.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-ivi-compositor-ivi-compositor-qrc.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-ivi-compositor-main-cpp.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-ivi-compositor-main-qml.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-minimal-qml-example.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-minimal-qml-main-cpp.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-minimal-qml-main-qml.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-minimal-qml-minimal-qml-pro.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-minimal-qml-minimal-qml-qrc.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-module.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-multi-output-example.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-multi-output-main-cpp.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-multi-output-multi-output-pro.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-multi-output-multi-output-qrc.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-multi-output-qml-gridscreen-qml.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-multi-output-qml-main-qml.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-multi-output-qml-shellchrome-qml.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-multi-output-qml-shellscreen-qml.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-multi-screen-example.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-multi-screen-main-cpp.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-multi-screen-multi-screen-pro.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-multi-screen-multi-screen-qrc.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-multi-screen-qml-chrome-qml.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-multi-screen-qml-main-qml.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-multi-screen-qml-screen-qml.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-pure-qml-example.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-pure-qml-main-cpp.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-pure-qml-pure-qml-pro.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-pure-qml-pure-qml-qrc.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-pure-qml-qml-chrome-qml.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-pure-qml-qml-keyboard-qml.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-pure-qml-qml-main-qml.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-pure-qml-qml-screen-qml.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-qwindow-compositor-compositor-cpp.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-qwindow-compositor-compositor-h.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-qwindow-compositor-example.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-qwindow-compositor-main-cpp.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-qwindow-compositor-qwindow-compositor-pro.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-qwindow-compositor-qwindow-compositor-qrc.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-qwindow-compositor-window-cpp.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-qwindow-compositor-window-h.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-spanning-screens-example.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-spanning-screens-main-cpp.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-spanning-screens-main-qml.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-spanning-screens-spanning-screens-pro.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor-spanning-screens-spanning-screens-qrc.html +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor.index +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor.qhp +%%QT_DOCDIR%%/qtwaylandcompositor/qtwaylandcompositor.qhp.sha1 +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandbufferref-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandbufferref.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandclient-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandclient.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandcompositor-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandcompositor.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandiviapplication-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandiviapplication.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandivisurface-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandivisurface.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandkeyboard-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandkeyboard.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandoutput-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandoutput.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandoutputmode-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandoutputmode.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandpointer-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandpointer.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandquickitem-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandquickitem.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandquickshellsurfaceitem-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandquickshellsurfaceitem.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandseat-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandseat.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandsurface-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandsurface.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandsurfacegrabber-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandsurfacegrabber.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandtouch-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandtouch.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandview-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandview.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandwlshell-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandwlshell.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandwlshellsurface-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandwlshellsurface.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandxdgpopupv5-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandxdgpopupv5.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandxdgshellv5-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandxdgshellv5.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandxdgsurfacev5-members.html +%%QT_DOCDIR%%/qtwaylandcompositor/qwaylandxdgsurfacev5.html +%%QT_DOCDIR%%/qtwaylandcompositor/style/offline-simple.css +%%QT_DOCDIR%%/qtwaylandcompositor/style/offline.css %%QT_DOCDIR%%/qtwebchannel.qch %%QT_DOCDIR%%/qtwebchannel/examples-manifest.xml %%QT_DOCDIR%%/qtwebchannel/images/arrow_bc.png @@ -11550,6 +10347,8 @@ %%QT_DOCDIR%%/qtwebchannel/qtwebchannel-chatclient-html-example.html %%QT_DOCDIR%%/qtwebchannel/qtwebchannel-chatclient-qml-chatclient-qml-pro.html %%QT_DOCDIR%%/qtwebchannel/qtwebchannel-chatclient-qml-example.html +%%QT_DOCDIR%%/qtwebchannel/qtwebchannel-chatclient-qml-loginform-ui-qml.html +%%QT_DOCDIR%%/qtwebchannel/qtwebchannel-chatclient-qml-mainform-ui-qml.html %%QT_DOCDIR%%/qtwebchannel/qtwebchannel-chatclient-qml-qmlchatclient-qml.html %%QT_DOCDIR%%/qtwebchannel/qtwebchannel-chatserver-cpp-chatserver-cpp-pro.html %%QT_DOCDIR%%/qtwebchannel/qtwebchannel-chatserver-cpp-chatserver-cpp.html @@ -11561,6 +10360,9 @@ %%QT_DOCDIR%%/qtwebchannel/qtwebchannel-javascript.html %%QT_DOCDIR%%/qtwebchannel/qtwebchannel-module.html %%QT_DOCDIR%%/qtwebchannel/qtwebchannel-qmlmodule.html +%%QT_DOCDIR%%/qtwebchannel/qtwebchannel-standalone-core-h.html +%%QT_DOCDIR%%/qtwebchannel/qtwebchannel-standalone-dialog-cpp.html +%%QT_DOCDIR%%/qtwebchannel/qtwebchannel-standalone-dialog-h.html %%QT_DOCDIR%%/qtwebchannel/qtwebchannel-standalone-dialog-ui.html %%QT_DOCDIR%%/qtwebchannel/qtwebchannel-standalone-example.html %%QT_DOCDIR%%/qtwebchannel/qtwebchannel-standalone-index-html.html @@ -11657,6 +10459,45 @@ %%QT_DOCDIR%%/qtwebsockets/style/offline-simple.css %%QT_DOCDIR%%/qtwebsockets/style/offline.css %%QT_DOCDIR%%/qtwebsockets/websockets-overview.html +%%QT_DOCDIR%%/qtwebview.qch +%%QT_DOCDIR%%/qtwebview/examples-manifest.xml +%%QT_DOCDIR%%/qtwebview/images/arrow_bc.png +%%QT_DOCDIR%%/qtwebview/images/bgrContent.png +%%QT_DOCDIR%%/qtwebview/images/btn_next.png +%%QT_DOCDIR%%/qtwebview/images/btn_prev.png +%%QT_DOCDIR%%/qtwebview/images/bullet_dn.png +%%QT_DOCDIR%%/qtwebview/images/bullet_sq.png +%%QT_DOCDIR%%/qtwebview/images/home.png +%%QT_DOCDIR%%/qtwebview/images/ico_note.png +%%QT_DOCDIR%%/qtwebview/images/ico_note_attention.png +%%QT_DOCDIR%%/qtwebview/images/ico_out.png +%%QT_DOCDIR%%/qtwebview/images/logo.png +%%QT_DOCDIR%%/qtwebview/images/used-in-examples/minibrowser/images/left-32.png +%%QT_DOCDIR%%/qtwebview/images/used-in-examples/minibrowser/images/refresh-32.png +%%QT_DOCDIR%%/qtwebview/images/used-in-examples/minibrowser/images/right-32.png +%%QT_DOCDIR%%/qtwebview/images/used-in-examples/minibrowser/images/stop-32.png +%%QT_DOCDIR%%/qtwebview/images/webview-example.jpg +%%QT_DOCDIR%%/qtwebview/qml-qtwebview-webview-members.html +%%QT_DOCDIR%%/qtwebview/qml-qtwebview-webview.html +%%QT_DOCDIR%%/qtwebview/qml-qtwebview-webviewloadrequest-members.html +%%QT_DOCDIR%%/qtwebview/qml-qtwebview-webviewloadrequest.html +%%QT_DOCDIR%%/qtwebview/qtwebview-examples.html +%%QT_DOCDIR%%/qtwebview/qtwebview-index.html +%%QT_DOCDIR%%/qtwebview/qtwebview-minibrowser-android-loadprogressstyle-qml.html +%%QT_DOCDIR%%/qtwebview/qtwebview-minibrowser-example.html +%%QT_DOCDIR%%/qtwebview/qtwebview-minibrowser-loadprogressstyle-qml.html +%%QT_DOCDIR%%/qtwebview/qtwebview-minibrowser-main-cpp.html +%%QT_DOCDIR%%/qtwebview/qtwebview-minibrowser-main-qml.html +%%QT_DOCDIR%%/qtwebview/qtwebview-minibrowser-minibrowser-pro.html +%%QT_DOCDIR%%/qtwebview/qtwebview-minibrowser-qml-qrc.html +%%QT_DOCDIR%%/qtwebview/qtwebview-module.html +%%QT_DOCDIR%%/qtwebview/qtwebview-qmlmodule.html +%%QT_DOCDIR%%/qtwebview/qtwebview.html +%%QT_DOCDIR%%/qtwebview/qtwebview.index +%%QT_DOCDIR%%/qtwebview/qtwebview.qhp +%%QT_DOCDIR%%/qtwebview/qtwebview.qhp.sha1 +%%QT_DOCDIR%%/qtwebview/style/offline-simple.css +%%QT_DOCDIR%%/qtwebview/style/offline.css %%QT_DOCDIR%%/qtwidgets.qch %%QT_DOCDIR%%/qtwidgets/application-windows.html %%QT_DOCDIR%%/qtwidgets/dialogs.html @@ -11670,11 +10511,6 @@ %%QT_DOCDIR%%/qtwidgets/examples-richtext.html %%QT_DOCDIR%%/qtwidgets/examples-widgets.html %%QT_DOCDIR%%/qtwidgets/focus.html -%%QT_DOCDIR%%/qtwidgets/gallery-fusion.html -%%QT_DOCDIR%%/qtwidgets/gallery-macintosh.html -%%QT_DOCDIR%%/qtwidgets/gallery-windows.html -%%QT_DOCDIR%%/qtwidgets/gallery-windowsvista.html -%%QT_DOCDIR%%/qtwidgets/gallery-windowsxp.html %%QT_DOCDIR%%/qtwidgets/gallery.html %%QT_DOCDIR%%/qtwidgets/gestures-overview.html %%QT_DOCDIR%%/qtwidgets/graphicsview.html @@ -11816,40 +10652,18 @@ %%QT_DOCDIR%%/qtwidgets/images/frozencolumn-example.png %%QT_DOCDIR%%/qtwidgets/images/frozencolumn-tableview.png %%QT_DOCDIR%%/qtwidgets/images/fusion-calendarwidget.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-checkbox.png %%QT_DOCDIR%%/qtwidgets/images/fusion-colordialog.png %%QT_DOCDIR%%/qtwidgets/images/fusion-combobox.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-dateedit.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-datetimeedit.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-dial.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-doublespinbox.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-fontcombobox.png %%QT_DOCDIR%%/qtwidgets/images/fusion-fontdialog.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-frame.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-groupbox.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-horizontalscrollbar.png %%QT_DOCDIR%%/qtwidgets/images/fusion-label.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-lcdnumber.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-lineedit.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-listview.png %%QT_DOCDIR%%/qtwidgets/images/fusion-menu.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-progressbar.png %%QT_DOCDIR%%/qtwidgets/images/fusion-progressdialog.png %%QT_DOCDIR%%/qtwidgets/images/fusion-pushbutton-menu.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-pushbutton.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-radiobutton.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-slider.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-spinbox.png %%QT_DOCDIR%%/qtwidgets/images/fusion-statusbar-sizegrip.png +%%QT_DOCDIR%%/qtwidgets/images/fusion-style.png %%QT_DOCDIR%%/qtwidgets/images/fusion-tabbar-truncated.png %%QT_DOCDIR%%/qtwidgets/images/fusion-tabbar.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-tableview.png %%QT_DOCDIR%%/qtwidgets/images/fusion-tabwidget.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-textedit.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-timeedit.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-toolbox.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-toolbutton.png -%%QT_DOCDIR%%/qtwidgets/images/fusion-treeview.png %%QT_DOCDIR%%/qtwidgets/images/geometry.png %%QT_DOCDIR%%/qtwidgets/images/gradients-demo.png %%QT_DOCDIR%%/qtwidgets/images/graphicsanchorlayout-example.png @@ -11930,34 +10744,11 @@ %%QT_DOCDIR%%/qtwidgets/images/list_table_tree.png %%QT_DOCDIR%%/qtwidgets/images/listview.png %%QT_DOCDIR%%/qtwidgets/images/logo.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-calendarwidget.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-checkbox.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-combobox.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-dateedit.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-datetimeedit.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-dial.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-doublespinbox.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-fontcombobox.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-frame.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-groupbox.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-horizontalscrollbar.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-label.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-lcdnumber.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-lineedit.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-listview.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-menu.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-progressbar.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-pushbutton.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-radiobutton.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-slider.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-spinbox.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-tableview.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-tabwidget.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-textedit.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-timeedit.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-toolbox.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-toolbutton.png -%%QT_DOCDIR%%/qtwidgets/images/macintosh-treeview.png +%%QT_DOCDIR%%/qtwidgets/images/macos-lineedit.png +%%QT_DOCDIR%%/qtwidgets/images/macos-progressbar.png +%%QT_DOCDIR%%/qtwidgets/images/macos-style.png +%%QT_DOCDIR%%/qtwidgets/images/macos-style2.png +%%QT_DOCDIR%%/qtwidgets/images/macos-tabwidget.png %%QT_DOCDIR%%/qtwidgets/images/mainwindow-demo.png %%QT_DOCDIR%%/qtwidgets/images/mainwindow-docks-example.png %%QT_DOCDIR%%/qtwidgets/images/mainwindow-docks.png @@ -12083,8 +10874,6 @@ %%QT_DOCDIR%%/qtwidgets/images/simpledommodel-example.png %%QT_DOCDIR%%/qtwidgets/images/simpletreemodel-example.png %%QT_DOCDIR%%/qtwidgets/images/simplewidgetmapper-example.png -%%QT_DOCDIR%%/qtwidgets/images/sipdialog-closed.png -%%QT_DOCDIR%%/qtwidgets/images/sipdialog-opened.png %%QT_DOCDIR%%/qtwidgets/images/sizegrip.png %%QT_DOCDIR%%/qtwidgets/images/sizegripimage.png %%QT_DOCDIR%%/qtwidgets/images/slider.png @@ -12381,88 +11170,33 @@ %%QT_DOCDIR%%/qtwidgets/images/windowflags-example.png %%QT_DOCDIR%%/qtwidgets/images/windowflags_controllerwindow.png %%QT_DOCDIR%%/qtwidgets/images/windowflags_previewwindow.png -%%QT_DOCDIR%%/qtwidgets/images/windows-calendarwidget.png %%QT_DOCDIR%%/qtwidgets/images/windows-checkbox.png %%QT_DOCDIR%%/qtwidgets/images/windows-combobox.png %%QT_DOCDIR%%/qtwidgets/images/windows-dateedit.png %%QT_DOCDIR%%/qtwidgets/images/windows-datetimeedit.png %%QT_DOCDIR%%/qtwidgets/images/windows-dial.png -%%QT_DOCDIR%%/qtwidgets/images/windows-doublespinbox.png -%%QT_DOCDIR%%/qtwidgets/images/windows-fontcombobox.png -%%QT_DOCDIR%%/qtwidgets/images/windows-frame.png %%QT_DOCDIR%%/qtwidgets/images/windows-groupbox.png -%%QT_DOCDIR%%/qtwidgets/images/windows-horizontalscrollbar.png %%QT_DOCDIR%%/qtwidgets/images/windows-label.png %%QT_DOCDIR%%/qtwidgets/images/windows-lcdnumber.png %%QT_DOCDIR%%/qtwidgets/images/windows-lineedit.png %%QT_DOCDIR%%/qtwidgets/images/windows-listview.png %%QT_DOCDIR%%/qtwidgets/images/windows-progressbar.png -%%QT_DOCDIR%%/qtwidgets/images/windows-pushbutton.png %%QT_DOCDIR%%/qtwidgets/images/windows-radiobutton.png %%QT_DOCDIR%%/qtwidgets/images/windows-slider.png %%QT_DOCDIR%%/qtwidgets/images/windows-spinbox.png +%%QT_DOCDIR%%/qtwidgets/images/windows-style.png +%%QT_DOCDIR%%/qtwidgets/images/windows-style2.png %%QT_DOCDIR%%/qtwidgets/images/windows-tableview.png %%QT_DOCDIR%%/qtwidgets/images/windows-tabwidget.png -%%QT_DOCDIR%%/qtwidgets/images/windows-textedit.png %%QT_DOCDIR%%/qtwidgets/images/windows-timeedit.png -%%QT_DOCDIR%%/qtwidgets/images/windows-toolbox.png -%%QT_DOCDIR%%/qtwidgets/images/windows-toolbutton.png %%QT_DOCDIR%%/qtwidgets/images/windows-treeview.png +%%QT_DOCDIR%%/qtwidgets/images/windows-vista-style.png +%%QT_DOCDIR%%/qtwidgets/images/windows-xp-style.png %%QT_DOCDIR%%/qtwidgets/images/windowstabimage.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-calendarwidget.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-checkbox.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-combobox.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-dateedit.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-datetimeedit.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-dial.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-doublespinbox.png %%QT_DOCDIR%%/qtwidgets/images/windowsvista-fontcombobox.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-frame.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-groupbox.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-horizontalscrollbar.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-label.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-lcdnumber.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-lineedit.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-listview.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-progressbar.png %%QT_DOCDIR%%/qtwidgets/images/windowsvista-pushbutton.png %%QT_DOCDIR%%/qtwidgets/images/windowsvista-radiobutton.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-slider.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-spinbox.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-tableview.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-tabwidget.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-textedit.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-timeedit.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-toolbox.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-toolbutton.png -%%QT_DOCDIR%%/qtwidgets/images/windowsvista-treeview.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-calendarwidget.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-checkbox.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-combobox.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-dateedit.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-datetimeedit.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-dial.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-doublespinbox.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-fontcombobox.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-frame.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-groupbox.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-horizontalscrollbar.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-label.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-lcdnumber.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-lineedit.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-listview.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-menu.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-progressbar.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-pushbutton.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-radiobutton.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-slider.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-spinbox.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-tableview.png %%QT_DOCDIR%%/qtwidgets/images/windowsxp-tabwidget.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-textedit.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-timeedit.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-toolbox.png -%%QT_DOCDIR%%/qtwidgets/images/windowsxp-toolbutton.png %%QT_DOCDIR%%/qtwidgets/images/windowsxp-treeview.png %%QT_DOCDIR%%/qtwidgets/images/woodbackground.png %%QT_DOCDIR%%/qtwidgets/images/woodbutton.png @@ -12559,6 +11293,8 @@ %%QT_DOCDIR%%/qtwidgets/qfontdialog-members.html %%QT_DOCDIR%%/qtwidgets/qfontdialog.html %%QT_DOCDIR%%/qtwidgets/qformlayout-members.html +%%QT_DOCDIR%%/qtwidgets/qformlayout-takerowresult-members.html +%%QT_DOCDIR%%/qtwidgets/qformlayout-takerowresult.html %%QT_DOCDIR%%/qtwidgets/qformlayout.html %%QT_DOCDIR%%/qtwidgets/qframe-members.html %%QT_DOCDIR%%/qtwidgets/qframe.html @@ -13019,11 +11755,6 @@ %%QT_DOCDIR%%/qtwidgets/qtwidgets-dialogs-licensewizard-licensewizard-pro.html %%QT_DOCDIR%%/qtwidgets/qtwidgets-dialogs-licensewizard-licensewizard-qrc.html %%QT_DOCDIR%%/qtwidgets/qtwidgets-dialogs-licensewizard-main-cpp.html -%%QT_DOCDIR%%/qtwidgets/qtwidgets-dialogs-sipdialog-dialog-cpp.html -%%QT_DOCDIR%%/qtwidgets/qtwidgets-dialogs-sipdialog-dialog-h.html -%%QT_DOCDIR%%/qtwidgets/qtwidgets-dialogs-sipdialog-example.html -%%QT_DOCDIR%%/qtwidgets/qtwidgets-dialogs-sipdialog-main-cpp.html -%%QT_DOCDIR%%/qtwidgets/qtwidgets-dialogs-sipdialog-sipdialog-pro.html %%QT_DOCDIR%%/qtwidgets/qtwidgets-dialogs-standarddialogs-dialog-cpp.html %%QT_DOCDIR%%/qtwidgets/qtwidgets-dialogs-standarddialogs-dialog-h.html %%QT_DOCDIR%%/qtwidgets/qtwidgets-dialogs-standarddialogs-example.html diff --git a/misc/qt5-examples/Makefile b/misc/qt5-examples/Makefile index 26176f5294e0..9e597c1816f8 100644 --- a/misc/qt5-examples/Makefile +++ b/misc/qt5-examples/Makefile @@ -19,7 +19,7 @@ USES= tar:xz USE_QT5= # DESCR= ${.CURDIR:H:H}/devel/qt5/pkg-descr -DISTINFO_FILE= ${.CURDIR:H:H}/misc/qt5-doc/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo EXAMPLESDIR= ${PREFIX}/share/examples/qt5 # The destination location depends on the values given in diff --git a/misc/qt5-examples/distinfo b/misc/qt5-examples/distinfo new file mode 100644 index 000000000000..5a1cbadca899 --- /dev/null +++ b/misc/qt5-examples/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1513368388 +SHA256 (KDE/Qt/5.9.3/qt-everywhere-opensource-src-5.9.3.tar.xz) = 57acd8f03f830c2d7dc29fbe28aaa96781b2b9bdddce94196e6761a0f88c6046 +SIZE (KDE/Qt/5.9.3/qt-everywhere-opensource-src-5.9.3.tar.xz) = 407364020 diff --git a/misc/qt5-examples/pkg-plist b/misc/qt5-examples/pkg-plist index bb4b001127c0..88f26b25ca76 100644 --- a/misc/qt5-examples/pkg-plist +++ b/misc/qt5-examples/pkg-plist @@ -97,29 +97,44 @@ %%QT_EXAMPLEDIR%%/bluetooth/chat/images/default.png %%QT_EXAMPLEDIR%%/bluetooth/chat/images/lineedit-bg.png %%QT_EXAMPLEDIR%%/bluetooth/chat/qmlchat.cpp -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/assets/Button.qml -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/assets/Point.qml -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/assets/blue_heart.png -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/assets/blue_heart_small.png -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/assets/busy_dark.png -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/assets/dialog.qml -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/assets/draw.js -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/assets/home.qml -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/assets/main.qml -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/assets/monitor.qml -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/assets/results.qml -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/assets/star.png -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/deviceinfo.cpp -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/deviceinfo.h -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/doc/images/heartratefound.png -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/doc/images/heartratemonitor.png -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/doc/images/heartrateresults.png -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/doc/src/heartlistener.qdoc -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/heartlistener.pro -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/heartrate.cpp -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/heartrate.h -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/main.cpp -%%QT_EXAMPLEDIR%%/bluetooth/heartlistener/resources.qrc +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/README.md +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/bluetoothbaseclass.cpp +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/bluetoothbaseclass.h +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/connectionhandler.cpp +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/connectionhandler.h +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/devicefinder.cpp +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/devicefinder.h +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/devicehandler.cpp +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/devicehandler.h +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/deviceinfo.cpp +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/deviceinfo.h +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/doc/images/heartgame-result.png +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/doc/images/heartgame-running.png +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/doc/images/heartgame-search.png +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/doc/images/heartgame-start.png +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/doc/src/heartrate-game.qdoc +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/heartrate-game.pro +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/heartrate-global.h +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/images.qrc +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/main.cpp +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml.qrc +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/App.qml +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/BluetoothAlarmDialog.qml +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/BottomLine.qml +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/Connect.qml +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/GameButton.qml +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/GamePage.qml +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/GameSettings.qml +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/Measure.qml +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/SplashScreen.qml +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/Stats.qml +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/StatsLabel.qml +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/TitleBar.qml +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/images/bt_off_to_on.png +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/images/heart.png +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/images/logo.png +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/main.qml +%%QT_EXAMPLEDIR%%/bluetooth/heartrate-game/qml/qmldir %%QT_EXAMPLEDIR%%/bluetooth/heartrate-server/doc/src/heartrate-server.qdoc %%QT_EXAMPLEDIR%%/bluetooth/heartrate-server/heartrate-server.pro %%QT_EXAMPLEDIR%%/bluetooth/heartrate-server/main.cpp @@ -397,6 +412,12 @@ %%QT_EXAMPLEDIR%%/charts/callout/main.cpp %%QT_EXAMPLEDIR%%/charts/callout/view.cpp %%QT_EXAMPLEDIR%%/charts/callout/view.h +%%QT_EXAMPLEDIR%%/charts/candlestickchart/acme_data.txt +%%QT_EXAMPLEDIR%%/charts/candlestickchart/candlestickchart.pro +%%QT_EXAMPLEDIR%%/charts/candlestickchart/candlestickdata.qrc +%%QT_EXAMPLEDIR%%/charts/candlestickchart/candlestickdatareader.cpp +%%QT_EXAMPLEDIR%%/charts/candlestickchart/candlestickdatareader.h +%%QT_EXAMPLEDIR%%/charts/candlestickchart/main.cpp %%QT_EXAMPLEDIR%%/charts/chartinteractions/chart.cpp %%QT_EXAMPLEDIR%%/charts/chartinteractions/chart.h %%QT_EXAMPLEDIR%%/charts/chartinteractions/chartinteractions.pro @@ -497,6 +518,10 @@ %%QT_EXAMPLEDIR%%/charts/qmlboxplot/qml/qmlboxplot/main.qml %%QT_EXAMPLEDIR%%/charts/qmlboxplot/qmlboxplot.pro %%QT_EXAMPLEDIR%%/charts/qmlboxplot/resources.qrc +%%QT_EXAMPLEDIR%%/charts/qmlcandlestick/main.cpp +%%QT_EXAMPLEDIR%%/charts/qmlcandlestick/qml/qmlcandlestick/main.qml +%%QT_EXAMPLEDIR%%/charts/qmlcandlestick/qmlcandlestick.pro +%%QT_EXAMPLEDIR%%/charts/qmlcandlestick/resources.qrc %%QT_EXAMPLEDIR%%/charts/qmlchart/main.cpp %%QT_EXAMPLEDIR%%/charts/qmlchart/qml/qmlchart/View1.qml %%QT_EXAMPLEDIR%%/charts/qmlchart/qml/qmlchart/View10.qml @@ -980,6 +1005,7 @@ %%QT_EXAMPLEDIR%%/location/mapviewer/map/CircleItem.qml %%QT_EXAMPLEDIR%%/location/mapviewer/map/ImageItem.qml %%QT_EXAMPLEDIR%%/location/mapviewer/map/MapComponent.qml +%%QT_EXAMPLEDIR%%/location/mapviewer/map/MapSliders.qml %%QT_EXAMPLEDIR%%/location/mapviewer/map/Marker.qml %%QT_EXAMPLEDIR%%/location/mapviewer/map/MiniMap.qml %%QT_EXAMPLEDIR%%/location/mapviewer/map/PolygonItem.qml @@ -1116,6 +1142,7 @@ %%QT_EXAMPLEDIR%%/multimedia/declarative-camera/CameraPropertyButton.qml %%QT_EXAMPLEDIR%%/multimedia/declarative-camera/CameraPropertyPopup.qml %%QT_EXAMPLEDIR%%/multimedia/declarative-camera/FocusButton.qml +%%QT_EXAMPLEDIR%%/multimedia/declarative-camera/Info.plist %%QT_EXAMPLEDIR%%/multimedia/declarative-camera/PhotoCaptureControls.qml %%QT_EXAMPLEDIR%%/multimedia/declarative-camera/PhotoPreview.qml %%QT_EXAMPLEDIR%%/multimedia/declarative-camera/Popup.qml @@ -1411,9 +1438,11 @@ %%QT_EXAMPLEDIR%%/multimediawidgets/camera/camera.cpp %%QT_EXAMPLEDIR%%/multimediawidgets/camera/camera.h %%QT_EXAMPLEDIR%%/multimediawidgets/camera/camera.pro +%%QT_EXAMPLEDIR%%/multimediawidgets/camera/camera.qrc %%QT_EXAMPLEDIR%%/multimediawidgets/camera/camera.ui %%QT_EXAMPLEDIR%%/multimediawidgets/camera/doc/images/camera-example.png %%QT_EXAMPLEDIR%%/multimediawidgets/camera/doc/src/camera.qdoc +%%QT_EXAMPLEDIR%%/multimediawidgets/camera/images/shutter.svg %%QT_EXAMPLEDIR%%/multimediawidgets/camera/imagesettings.cpp %%QT_EXAMPLEDIR%%/multimediawidgets/camera/imagesettings.h %%QT_EXAMPLEDIR%%/multimediawidgets/camera/imagesettings.ui @@ -1560,6 +1589,29 @@ %%QT_EXAMPLEDIR%%/network/multicastsender/multicastsender.pro %%QT_EXAMPLEDIR%%/network/multicastsender/sender.cpp %%QT_EXAMPLEDIR%%/network/multicastsender/sender.h +%%QT_EXAMPLEDIR%%/network/multistreamclient/chatconsumer.cpp +%%QT_EXAMPLEDIR%%/network/multistreamclient/chatconsumer.h +%%QT_EXAMPLEDIR%%/network/multistreamclient/client.cpp +%%QT_EXAMPLEDIR%%/network/multistreamclient/client.h +%%QT_EXAMPLEDIR%%/network/multistreamclient/consumer.h +%%QT_EXAMPLEDIR%%/network/multistreamclient/main.cpp +%%QT_EXAMPLEDIR%%/network/multistreamclient/movieconsumer.cpp +%%QT_EXAMPLEDIR%%/network/multistreamclient/movieconsumer.h +%%QT_EXAMPLEDIR%%/network/multistreamclient/multistreamclient.pro +%%QT_EXAMPLEDIR%%/network/multistreamclient/timeconsumer.cpp +%%QT_EXAMPLEDIR%%/network/multistreamclient/timeconsumer.h +%%QT_EXAMPLEDIR%%/network/multistreamserver/animation.gif +%%QT_EXAMPLEDIR%%/network/multistreamserver/chatprovider.cpp +%%QT_EXAMPLEDIR%%/network/multistreamserver/chatprovider.h +%%QT_EXAMPLEDIR%%/network/multistreamserver/main.cpp +%%QT_EXAMPLEDIR%%/network/multistreamserver/movieprovider.cpp +%%QT_EXAMPLEDIR%%/network/multistreamserver/movieprovider.h +%%QT_EXAMPLEDIR%%/network/multistreamserver/multistreamserver.pro +%%QT_EXAMPLEDIR%%/network/multistreamserver/provider.h +%%QT_EXAMPLEDIR%%/network/multistreamserver/server.cpp +%%QT_EXAMPLEDIR%%/network/multistreamserver/server.h +%%QT_EXAMPLEDIR%%/network/multistreamserver/timeprovider.cpp +%%QT_EXAMPLEDIR%%/network/multistreamserver/timeprovider.h %%QT_EXAMPLEDIR%%/network/network-chat/chatdialog.cpp %%QT_EXAMPLEDIR%%/network/network-chat/chatdialog.h %%QT_EXAMPLEDIR%%/network/network-chat/chatdialog.ui @@ -1585,6 +1637,7 @@ %%QT_EXAMPLEDIR%%/network/securesocketclient/sslclient.h %%QT_EXAMPLEDIR%%/network/securesocketclient/sslclient.ui %%QT_EXAMPLEDIR%%/network/securesocketclient/sslerrors.ui +%%QT_EXAMPLEDIR%%/network/shared/sctpchannels.h %%QT_EXAMPLEDIR%%/network/threadedfortuneserver/dialog.cpp %%QT_EXAMPLEDIR%%/network/threadedfortuneserver/dialog.h %%QT_EXAMPLEDIR%%/network/threadedfortuneserver/fortuneserver.cpp @@ -1686,6 +1739,12 @@ %%QT_EXAMPLEDIR%%/opengl/2dpainting/window.cpp %%QT_EXAMPLEDIR%%/opengl/2dpainting/window.h %%QT_EXAMPLEDIR%%/opengl/README +%%QT_EXAMPLEDIR%%/opengl/computegles31/Qt-logo-medium.png +%%QT_EXAMPLEDIR%%/opengl/computegles31/computegles31.pro +%%QT_EXAMPLEDIR%%/opengl/computegles31/computegles31.qrc +%%QT_EXAMPLEDIR%%/opengl/computegles31/glwindow.cpp +%%QT_EXAMPLEDIR%%/opengl/computegles31/glwindow.h +%%QT_EXAMPLEDIR%%/opengl/computegles31/main.cpp %%QT_EXAMPLEDIR%%/opengl/contextinfo/contextinfo.pro %%QT_EXAMPLEDIR%%/opengl/contextinfo/main.cpp %%QT_EXAMPLEDIR%%/opengl/contextinfo/renderwindow.cpp @@ -1901,6 +1960,7 @@ %%QT_EXAMPLEDIR%%/purchasing/qthangman/hangmangame.cpp %%QT_EXAMPLEDIR%%/purchasing/qthangman/hangmangame.h %%QT_EXAMPLEDIR%%/purchasing/qthangman/main.cpp +%%QT_EXAMPLEDIR%%/purchasing/qthangman/qml/qthangman/+windows/Settings.qml %%QT_EXAMPLEDIR%%/purchasing/qthangman/qml/qthangman/GameView.qml %%QT_EXAMPLEDIR%%/purchasing/qthangman/qml/qthangman/GuessWordView.qml %%QT_EXAMPLEDIR%%/purchasing/qthangman/qml/qthangman/Hangman.qml @@ -1911,14 +1971,18 @@ %%QT_EXAMPLEDIR%%/purchasing/qthangman/qml/qthangman/MainView.qml %%QT_EXAMPLEDIR%%/purchasing/qthangman/qml/qthangman/PageHeader.qml %%QT_EXAMPLEDIR%%/purchasing/qthangman/qml/qthangman/ScoreItem.qml +%%QT_EXAMPLEDIR%%/purchasing/qthangman/qml/qthangman/Settings.qml %%QT_EXAMPLEDIR%%/purchasing/qthangman/qml/qthangman/SimpleButton.qml %%QT_EXAMPLEDIR%%/purchasing/qthangman/qml/qthangman/SplashScreen.qml %%QT_EXAMPLEDIR%%/purchasing/qthangman/qml/qthangman/StoreItem.qml %%QT_EXAMPLEDIR%%/purchasing/qthangman/qml/qthangman/StoreView.qml %%QT_EXAMPLEDIR%%/purchasing/qthangman/qml/qthangman/Word.qml %%QT_EXAMPLEDIR%%/purchasing/qthangman/qml/qthangman/main.qml +%%QT_EXAMPLEDIR%%/purchasing/qthangman/qml/qthangman/qmldir %%QT_EXAMPLEDIR%%/purchasing/qthangman/qthangman.pro %%QT_EXAMPLEDIR%%/purchasing/qthangman/resources.qrc +%%QT_EXAMPLEDIR%%/purchasing/qthangman/winrt/QtStoreSimulation.xml +%%QT_EXAMPLEDIR%%/purchasing/qthangman/winrt/winrt.qrc %%QT_EXAMPLEDIR%%/qmake/precompile/main.cpp %%QT_EXAMPLEDIR%%/qmake/precompile/mydialog.cpp %%QT_EXAMPLEDIR%%/qmake/precompile/mydialog.h @@ -2120,11 +2184,13 @@ %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/main.cpp %%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/extending-qml.pro %%QT_EXAMPLEDIR%%/qml/tutorials/tutorials.pro +%%QT_EXAMPLEDIR%%/qml/xmlhttprequest/Get.qml +%%QT_EXAMPLEDIR%%/qml/xmlhttprequest/GetForm.ui.qml %%QT_EXAMPLEDIR%%/qml/xmlhttprequest/data.xml %%QT_EXAMPLEDIR%%/qml/xmlhttprequest/doc/images/qml-xmlhttprequest-example.png %%QT_EXAMPLEDIR%%/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc -%%QT_EXAMPLEDIR%%/qml/xmlhttprequest/get.qml %%QT_EXAMPLEDIR%%/qml/xmlhttprequest/main.cpp +%%QT_EXAMPLEDIR%%/qml/xmlhttprequest/methods.js %%QT_EXAMPLEDIR%%/qml/xmlhttprequest/xmlhttprequest.pro %%QT_EXAMPLEDIR%%/qml/xmlhttprequest/xmlhttprequest.qml %%QT_EXAMPLEDIR%%/qml/xmlhttprequest/xmlhttprequest.qmlproject @@ -2141,6 +2207,31 @@ %%QT_EXAMPLEDIR%%/qpa/windows/window.cpp %%QT_EXAMPLEDIR%%/qpa/windows/window.h %%QT_EXAMPLEDIR%%/qpa/windows/windows.pro +%%QT_EXAMPLEDIR%%/qt3d/3d-text/3d-text.pro +%%QT_EXAMPLEDIR%%/qt3d/3d-text/main.cpp +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/SceneRoot.qml +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/Water.qml +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/WaterMaterial.qml +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/advancedcustommaterial.pro +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/doc/images/advanced-custom-material.jpg +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/doc/src/advancedcustommaterial.qdoc +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/main.cpp +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/main.qml +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/models.qrc +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/models/waterPlane.obj +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/qml.qrc +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/shaders.qrc +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/shaders/es2/water.frag +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/shaders/es2/water.vert +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/shaders/gl3/water.frag +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/shaders/gl3/water.vert +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/textures.qrc +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/textures/WaterDiffuse.jpg +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/textures/WaterNormal.jpg +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/textures/WaterSpecular.jpg +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/textures/Waterwave.jpg +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/textures/foam.jpg +%%QT_EXAMPLEDIR%%/qt3d/advancedcustommaterial/textures/sky.jpg %%QT_EXAMPLEDIR%%/qt3d/anaglyph-rendering/StereoCamera.qml %%QT_EXAMPLEDIR%%/qt3d/anaglyph-rendering/StereoFrameGraph.qml %%QT_EXAMPLEDIR%%/qt3d/anaglyph-rendering/anaglyph-rendering.pro @@ -2194,25 +2285,6 @@ %%QT_EXAMPLEDIR%%/qt3d/controls/controls.qrc %%QT_EXAMPLEDIR%%/qt3d/controls/main.cpp %%QT_EXAMPLEDIR%%/qt3d/controls/main.qml -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.pro -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/deferred-renderer-cpp.qrc -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/doc/src/deferred-renderer-cpp.qdoc -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/final_gl2.frag -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/final_gl2.vert -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/final_gl3.frag -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/final_gl3.vert -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/finaleffect.cpp -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/finaleffect.h -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/gbuffer.cpp -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/gbuffer.h -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/geometry_gl2.frag -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/geometry_gl2.vert -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/geometry_gl3.frag -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/geometry_gl3.vert -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/pointlightblock.cpp -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/pointlightblock.h -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/sceneeffect.cpp -%%QT_EXAMPLEDIR%%/qt3d/deferred-renderer-cpp/sceneeffect.h %%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/LICENSE %%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/chest/Chest.obj %%QT_EXAMPLEDIR%%/qt3d/exampleresources/assets/chest/diffuse.webp @@ -2334,6 +2406,7 @@ %%QT_EXAMPLEDIR%%/qt3d/instanced-arrays-qml/main.cpp %%QT_EXAMPLEDIR%%/qt3d/instanced-arrays-qml/main.qml %%QT_EXAMPLEDIR%%/qt3d/lights/PlaneEntity.qml +%%QT_EXAMPLEDIR%%/qt3d/lights/SimpleForwardRenderer.qml %%QT_EXAMPLEDIR%%/qt3d/lights/lights.pro %%QT_EXAMPLEDIR%%/qt3d/lights/lights.qrc %%QT_EXAMPLEDIR%%/qt3d/lights/main.cpp @@ -2358,6 +2431,7 @@ %%QT_EXAMPLEDIR%%/qt3d/materials/BasicCamera.qml %%QT_EXAMPLEDIR%%/qt3d/materials/Chest.qml %%QT_EXAMPLEDIR%%/qt3d/materials/HousePlant.qml +%%QT_EXAMPLEDIR%%/qt3d/materials/Lights.qml %%QT_EXAMPLEDIR%%/qt3d/materials/PlaneEntity.qml %%QT_EXAMPLEDIR%%/qt3d/materials/RenderableEntity.qml %%QT_EXAMPLEDIR%%/qt3d/materials/SortedForwardRenderer.qml @@ -2368,14 +2442,16 @@ %%QT_EXAMPLEDIR%%/qt3d/materials/main.qml %%QT_EXAMPLEDIR%%/qt3d/materials/materials.pro %%QT_EXAMPLEDIR%%/qt3d/materials/materials.qrc +%%QT_EXAMPLEDIR%%/qt3d/multiviewport/Gear_scene.dae %%QT_EXAMPLEDIR%%/qt3d/multiviewport/QuadViewportFrameGraph.qml %%QT_EXAMPLEDIR%%/qt3d/multiviewport/SimpleCamera.qml -%%QT_EXAMPLEDIR%%/qt3d/multiviewport/doc/images/multiviewport-qml-example.png +%%QT_EXAMPLEDIR%%/qt3d/multiviewport/doc/images/multiviewport-qml-example.jpg %%QT_EXAMPLEDIR%%/qt3d/multiviewport/doc/src/multiviewport.qdoc %%QT_EXAMPLEDIR%%/qt3d/multiviewport/main.cpp %%QT_EXAMPLEDIR%%/qt3d/multiviewport/main.qml %%QT_EXAMPLEDIR%%/qt3d/multiviewport/multiviewport.pro %%QT_EXAMPLEDIR%%/qt3d/multiviewport/multiviewport.qrc +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/AppleTVInput.qml %%QT_EXAMPLEDIR%%/qt3d/planets-qml/FpsDisplay.qml %%QT_EXAMPLEDIR%%/qt3d/planets-qml/InfoSheet.qml %%QT_EXAMPLEDIR%%/qt3d/planets-qml/Planet.qml @@ -2397,41 +2473,75 @@ %%QT_EXAMPLEDIR%%/qt3d/planets-qml/doc/images/planets-qml-example.jpg %%QT_EXAMPLEDIR%%/qt3d/planets-qml/doc/src/planets-qml.qdoc %%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/earth.png -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/earthcloudmapcolortrans.png -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/earthcloudmapspec.jpg -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/earthmap1k.jpg -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/earthnormal1k.jpg -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/earthspec1k.jpg -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/galaxy_starfield.png %%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/jupiter.png -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/jupitermap.jpg %%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/mars.png -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/marsmap1k.jpg -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/marsnormal1k.jpg %%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/mercury.png -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/mercurymap.jpg -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/mercurynormal.jpg -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/moonmap1k.jpg -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/moonnormal1k.jpg +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/nasa/license.txt +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/nasa/qt_attribution.json +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/nasa/uranusringcolortrans.png %%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/neptune.png -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/neptunemap.jpg %%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/saturn.png -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/saturnmap.jpg -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/saturnringcolortrans.png +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/earthcloudmapcolortrans.png +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/earthcloudmapspec.jpg +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/earthmap2k.jpg +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/earthnormal2k.jpg +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/earthspec2k.jpg +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/galaxy_starfield.jpg +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/jupitermap.jpg +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/license.txt +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/marsmap2k.jpg +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/marsnormal2k.jpg +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/mercurymap.jpg +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/mercurynormal.jpg +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/moonmap2k.jpg +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/moonnormal2k.jpg +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/neptunemap.jpg +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/qt_attribution.json +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/saturnmap.jpg +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/saturnringcolortrans.png +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/sunmap.jpg +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/uranusmap.jpg +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/venusmap.jpg +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/solarsystemscope/venusnormal.jpg %%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/sun.png -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/sunmap.jpg %%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/uranus.png -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/uranusmap.jpg -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/uranusringcolortrans.png %%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/venus.png -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/venusmap.jpg -%%QT_EXAMPLEDIR%%/qt3d/planets-qml/images/venusnormal.jpg %%QT_EXAMPLEDIR%%/qt3d/planets-qml/main.cpp %%QT_EXAMPLEDIR%%/qt3d/planets-qml/meshes/ring.obj %%QT_EXAMPLEDIR%%/qt3d/planets-qml/meshes/starfield.obj +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/networkcontroller.cpp +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/networkcontroller.h %%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-qml-images.qrc %%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-qml.pro %%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-qml.qrc +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient WatchKit App/Assets.xcassets/AppIcon.appiconset/Contents.json +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient WatchKit App/Assets.xcassets/AppIcon.appiconset/home_icon.png +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient WatchKit App/Assets.xcassets/Contents.json +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient WatchKit App/Base.lproj/Interface.storyboard +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient WatchKit App/Info.plist +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/Assets.xcassets/Complication.complicationset/Contents.json +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/ExtensionDelegate.h +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/ExtensionDelegate.m +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/Info.plist +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/InterfaceController.h +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient WatchKit Extension/InterfaceController.m +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient.xcodeproj/project.pbxproj +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient/AppDelegate.h +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient/AppDelegate.m +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient/Assets.xcassets/AppIcon.appiconset/Contents.json +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient/Assets.xcassets/AppIcon.appiconset/icon120.png +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient/Assets.xcassets/AppIcon.appiconset/icon180.png +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient/Base.lproj/LaunchScreen.storyboard +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient/Base.lproj/Main.storyboard +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient/Info.plist +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient/ViewController.h +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient/ViewController.m +%%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets-watchos/PlanetsClient/main.m %%QT_EXAMPLEDIR%%/qt3d/planets-qml/planets.js %%QT_EXAMPLEDIR%%/qt3d/planets-qml/shaders/es2/planetD.frag %%QT_EXAMPLEDIR%%/qt3d/planets-qml/shaders/es2/planetD.vert @@ -2453,12 +2563,38 @@ %%QT_EXAMPLEDIR%%/qt3d/planets-qml/shaders/gl3/shadowmap.vert %%QT_EXAMPLEDIR%%/qt3d/planets-qml/shaders/gl3/sun.frag %%QT_EXAMPLEDIR%%/qt3d/planets-qml/shaders/gl3/sun.vert +%%QT_EXAMPLEDIR%%/qt3d/qardboard/Info.plist +%%QT_EXAMPLEDIR%%/qt3d/qardboard/PlacedEntity.qml +%%QT_EXAMPLEDIR%%/qt3d/qardboard/QardboardCamera.qml +%%QT_EXAMPLEDIR%%/qt3d/qardboard/QardboardFrameGraph.qml +%%QT_EXAMPLEDIR%%/qt3d/qardboard/QardboardRootEntity.qml +%%QT_EXAMPLEDIR%%/qt3d/qardboard/QardboardScene3D.qml +%%QT_EXAMPLEDIR%%/qt3d/qardboard/abstractdeviceorientation.cpp +%%QT_EXAMPLEDIR%%/qt3d/qardboard/abstractdeviceorientation.h +%%QT_EXAMPLEDIR%%/qt3d/qardboard/dummydeviceorientation.cpp +%%QT_EXAMPLEDIR%%/qt3d/qardboard/dummydeviceorientation.h +%%QT_EXAMPLEDIR%%/qt3d/qardboard/iosdeviceorientation.h +%%QT_EXAMPLEDIR%%/qt3d/qardboard/iosdeviceorientation.mm +%%QT_EXAMPLEDIR%%/qt3d/qardboard/iosdeviceorientation_p.h +%%QT_EXAMPLEDIR%%/qt3d/qardboard/iosdeviceorientation_p.mm +%%QT_EXAMPLEDIR%%/qt3d/qardboard/main.cpp +%%QT_EXAMPLEDIR%%/qt3d/qardboard/main.qml +%%QT_EXAMPLEDIR%%/qt3d/qardboard/qardboard.pro +%%QT_EXAMPLEDIR%%/qt3d/qardboard/resources.qrc %%QT_EXAMPLEDIR%%/qt3d/qgltf/Scene.qml %%QT_EXAMPLEDIR%%/qt3d/qgltf/main.cpp %%QT_EXAMPLEDIR%%/qt3d/qgltf/main.qml %%QT_EXAMPLEDIR%%/qt3d/qgltf/qgltf.pro %%QT_EXAMPLEDIR%%/qt3d/qgltf/qgltf_example.qrc %%QT_EXAMPLEDIR%%/qt3d/qt3d.pro +%%QT_EXAMPLEDIR%%/qt3d/scene2d/LogoControls.qml +%%QT_EXAMPLEDIR%%/qt3d/scene2d/Qt_logo.obj +%%QT_EXAMPLEDIR%%/qt3d/scene2d/doc/images/scene2d.png +%%QT_EXAMPLEDIR%%/qt3d/scene2d/doc/src/scene2d.qdoc +%%QT_EXAMPLEDIR%%/qt3d/scene2d/main.cpp +%%QT_EXAMPLEDIR%%/qt3d/scene2d/main.qml +%%QT_EXAMPLEDIR%%/qt3d/scene2d/scene2d.pro +%%QT_EXAMPLEDIR%%/qt3d/scene2d/scene2d.qrc %%QT_EXAMPLEDIR%%/qt3d/scene3d/AnimatedEntity.qml %%QT_EXAMPLEDIR%%/qt3d/scene3d/doc/images/scene3d.png %%QT_EXAMPLEDIR%%/qt3d/scene3d/doc/src/scene3d.qdoc @@ -2501,6 +2637,22 @@ %%QT_EXAMPLEDIR%%/qt3d/simple-qml/main.qml %%QT_EXAMPLEDIR%%/qt3d/simple-qml/simple-qml.pro %%QT_EXAMPLEDIR%%/qt3d/simple-qml/simple-qml.qrc +%%QT_EXAMPLEDIR%%/qt3d/simplecustommaterial/PlaneModel.qml +%%QT_EXAMPLEDIR%%/qt3d/simplecustommaterial/SceneRoot.qml +%%QT_EXAMPLEDIR%%/qt3d/simplecustommaterial/SimpleMaterial.qml +%%QT_EXAMPLEDIR%%/qt3d/simplecustommaterial/doc/images/simple-custom-material.jpg +%%QT_EXAMPLEDIR%%/qt3d/simplecustommaterial/doc/src/simplecustommaterial.qdoc +%%QT_EXAMPLEDIR%%/qt3d/simplecustommaterial/main.cpp +%%QT_EXAMPLEDIR%%/qt3d/simplecustommaterial/main.qml +%%QT_EXAMPLEDIR%%/qt3d/simplecustommaterial/models.qrc +%%QT_EXAMPLEDIR%%/qt3d/simplecustommaterial/qml.qrc +%%QT_EXAMPLEDIR%%/qt3d/simplecustommaterial/shaders.qrc +%%QT_EXAMPLEDIR%%/qt3d/simplecustommaterial/shaders/es2/simpleColor.frag +%%QT_EXAMPLEDIR%%/qt3d/simplecustommaterial/shaders/es2/simpleColor.vert +%%QT_EXAMPLEDIR%%/qt3d/simplecustommaterial/shaders/gl3/simpleColor.frag +%%QT_EXAMPLEDIR%%/qt3d/simplecustommaterial/shaders/gl3/simpleColor.vert +%%QT_EXAMPLEDIR%%/qt3d/simplecustommaterial/simplecustommaterial.pro +%%QT_EXAMPLEDIR%%/qt3d/simplecustommaterial/textures.qrc %%QT_EXAMPLEDIR%%/qt3d/torus-qml/main.qml %%QT_EXAMPLEDIR%%/qt3d/wave/Background.qml %%QT_EXAMPLEDIR%%/qt3d/wave/BackgroundEffect.qml @@ -2521,6 +2673,11 @@ %%QT_EXAMPLEDIR%%/qt3d/wave/shaders/robustwireframe.geom %%QT_EXAMPLEDIR%%/qt3d/wave/wave.pro %%QT_EXAMPLEDIR%%/qt3d/wave/wave.qrc +%%QT_EXAMPLEDIR%%/qt3d/widgets-scene3d/doc/images/widgets-scene3d.png +%%QT_EXAMPLEDIR%%/qt3d/widgets-scene3d/doc/src/widgets-scene3d.qdoc +%%QT_EXAMPLEDIR%%/qt3d/widgets-scene3d/main.cpp +%%QT_EXAMPLEDIR%%/qt3d/widgets-scene3d/widgets-scene3d.pro +%%QT_EXAMPLEDIR%%/qt3d/widgets-scene3d/widgets-scene3d.qrc %%QT_EXAMPLEDIR%%/qt3d/wireframe/BasicCamera.qml %%QT_EXAMPLEDIR%%/qt3d/wireframe/TrefoilKnot.qml %%QT_EXAMPLEDIR%%/qt3d/wireframe/WireframeEffect.qml @@ -2854,8 +3011,6 @@ %%QT_EXAMPLEDIR%%/quick/demos/rssnews/rssnews.qml %%QT_EXAMPLEDIR%%/quick/demos/rssnews/rssnews.qmlproject %%QT_EXAMPLEDIR%%/quick/demos/rssnews/rssnews.qrc -%%QT_EXAMPLEDIR%%/quick/demos/samegame/content/+blackberry/Settings.qml -%%QT_EXAMPLEDIR%%/quick/demos/samegame/content/BBSettings.qml %%QT_EXAMPLEDIR%%/quick/demos/samegame/content/Block.qml %%QT_EXAMPLEDIR%%/quick/demos/samegame/content/BlockEmitter.qml %%QT_EXAMPLEDIR%%/quick/demos/samegame/content/Button.qml @@ -2933,11 +3088,13 @@ %%QT_EXAMPLEDIR%%/quick/demos/samegame/samegame.qmlproject %%QT_EXAMPLEDIR%%/quick/demos/samegame/samegame.qrc %%QT_EXAMPLEDIR%%/quick/demos/stocqt/content/+windows/Settings.qml +%%QT_EXAMPLEDIR%%/quick/demos/stocqt/content/Banner.qml %%QT_EXAMPLEDIR%%/quick/demos/stocqt/content/Button.qml %%QT_EXAMPLEDIR%%/quick/demos/stocqt/content/CheckBox.qml %%QT_EXAMPLEDIR%%/quick/demos/stocqt/content/Settings.qml %%QT_EXAMPLEDIR%%/quick/demos/stocqt/content/StockChart.qml %%QT_EXAMPLEDIR%%/quick/demos/stocqt/content/StockInfo.qml +%%QT_EXAMPLEDIR%%/quick/demos/stocqt/content/StockListDelegate.qml %%QT_EXAMPLEDIR%%/quick/demos/stocqt/content/StockListModel.qml %%QT_EXAMPLEDIR%%/quick/demos/stocqt/content/StockListView.qml %%QT_EXAMPLEDIR%%/quick/demos/stocqt/content/StockModel.qml @@ -3061,10 +3218,13 @@ %%QT_EXAMPLEDIR%%/quick/layouts/main.cpp %%QT_EXAMPLEDIR%%/quick/localstorage/doc/src/localstorage.qdoc %%QT_EXAMPLEDIR%%/quick/localstorage/localstorage.pro -%%QT_EXAMPLEDIR%%/quick/localstorage/localstorage/hello.qml +%%QT_EXAMPLEDIR%%/quick/localstorage/localstorage/Database.js +%%QT_EXAMPLEDIR%%/quick/localstorage/localstorage/Header.qml +%%QT_EXAMPLEDIR%%/quick/localstorage/localstorage/MyButton.qml +%%QT_EXAMPLEDIR%%/quick/localstorage/localstorage/MyDelegate.qml +%%QT_EXAMPLEDIR%%/quick/localstorage/localstorage/MyModel.qml %%QT_EXAMPLEDIR%%/quick/localstorage/localstorage/localstorage.pro %%QT_EXAMPLEDIR%%/quick/localstorage/localstorage/localstorage.qml -%%QT_EXAMPLEDIR%%/quick/localstorage/localstorage/localstorage.qmlproject %%QT_EXAMPLEDIR%%/quick/localstorage/localstorage/localstorage.qrc %%QT_EXAMPLEDIR%%/quick/localstorage/localstorage/main.cpp %%QT_EXAMPLEDIR%%/quick/models/abstractitemmodel/abstractitemmodel.pro @@ -3236,12 +3396,16 @@ %%QT_EXAMPLEDIR%%/quick/quickwidgets/qquickviewcomparison/qquickviewcomparison.pro %%QT_EXAMPLEDIR%%/quick/quickwidgets/qquickviewcomparison/qquickviewcomparison.qrc %%QT_EXAMPLEDIR%%/quick/quickwidgets/qquickviewcomparison/test.qml +%%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/customgl.qml %%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/doc/images/qtquickwidgets-example.png %%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/doc/src/quickwidget.qdoc +%%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/fbitem.cpp +%%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/fbitem.h %%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/main.cpp %%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/quickwidget.pro %%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/quickwidget.qrc %%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/rotatingsquare.qml +%%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidget/rotatingsquaretab.qml %%QT_EXAMPLEDIR%%/quick/quickwidgets/quickwidgets.pro %%QT_EXAMPLEDIR%%/quick/rendercontrol/cuberenderer.cpp %%QT_EXAMPLEDIR%%/quick/rendercontrol/cuberenderer.h @@ -3302,6 +3466,21 @@ %%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/openglunderqml.qrc %%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/squircle.cpp %%QT_EXAMPLEDIR%%/quick/scenegraph/openglunderqml/squircle.h +%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/customrenderitem.cpp +%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/customrenderitem.h +%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/d3d12renderer.cpp +%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/d3d12renderer.h +%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/main.cpp +%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/main.qml +%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/openglrenderer.cpp +%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/openglrenderer.h +%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/rendernode.pro +%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/rendernode.qrc +%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/shader.hlsl +%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/shader_frag.cso +%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/shader_vert.cso +%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/softwarerenderer.cpp +%%QT_EXAMPLEDIR%%/quick/scenegraph/rendernode/softwarerenderer.h %%QT_EXAMPLEDIR%%/quick/scenegraph/scenegraph.pro %%QT_EXAMPLEDIR%%/quick/scenegraph/sgengine/face-smile.png %%QT_EXAMPLEDIR%%/quick/scenegraph/sgengine/main.cpp @@ -3352,6 +3531,18 @@ %%QT_EXAMPLEDIR%%/quick/shadereffects/content/Slider.qml %%QT_EXAMPLEDIR%%/quick/shadereffects/content/face-smile.png %%QT_EXAMPLEDIR%%/quick/shadereffects/content/qt-logo.png +%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+hlsl/blur.frag +%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+hlsl/colorize.frag +%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+hlsl/genie.vert +%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+hlsl/outline.frag +%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+hlsl/shadow.frag +%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/+hlsl/wobble.frag +%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/blur.frag +%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/colorize.frag +%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/genie.vert +%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/outline.frag +%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/shadow.frag +%%QT_EXAMPLEDIR%%/quick/shadereffects/content/shaders/wobble.frag %%QT_EXAMPLEDIR%%/quick/shadereffects/doc/images/qml-shadereffects-example.png %%QT_EXAMPLEDIR%%/quick/shadereffects/doc/src/shadereffects.qdoc %%QT_EXAMPLEDIR%%/quick/shadereffects/main.cpp @@ -3361,6 +3552,7 @@ %%QT_EXAMPLEDIR%%/quick/shadereffects/shadereffects.qrc %%QT_EXAMPLEDIR%%/quick/shared/Button.qml %%QT_EXAMPLEDIR%%/quick/shared/CheckBox.qml +%%QT_EXAMPLEDIR%%/quick/shared/Label.qml %%QT_EXAMPLEDIR%%/quick/shared/LauncherList.qml %%QT_EXAMPLEDIR%%/quick/shared/README %%QT_EXAMPLEDIR%%/quick/shared/SimpleLauncherDelegate.qml @@ -3602,7 +3794,8 @@ %%QT_EXAMPLEDIR%%/quick/views/visualdatamodel/dragselection.qml %%QT_EXAMPLEDIR%%/quick/views/visualdatamodel/slideshow.qml %%QT_EXAMPLEDIR%%/quick/views/visualdatamodel/visualdatamodel.qmlproject -%%QT_EXAMPLEDIR%%/quick/window/ScreenInfo.qml +%%QT_EXAMPLEDIR%%/quick/window/AllScreens.qml +%%QT_EXAMPLEDIR%%/quick/window/CurrentScreen.qml %%QT_EXAMPLEDIR%%/quick/window/Splash.qml %%QT_EXAMPLEDIR%%/quick/window/doc/images/qml-window-example.png %%QT_EXAMPLEDIR%%/quick/window/doc/src/window.qdoc @@ -3868,19 +4061,46 @@ %%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png %%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png %%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc -%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Albert Einstein.png -%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Albert Einstein@2x.png -%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Albert Einstein@3x.png -%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Albert Einstein@4x.png -%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Ernest Hemingway.png -%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Ernest Hemingway@2x.png -%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Ernest Hemingway@3x.png -%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Ernest Hemingway@4x.png -%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Hans Gude.png -%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Hans Gude@2x.png -%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Hans Gude@3x.png -%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Hans Gude@4x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Albert_Einstein.png +%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Albert_Einstein@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Albert_Einstein@3x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Albert_Einstein@4x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Ernest_Hemingway.png +%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Ernest_Hemingway@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Ernest_Hemingway@3x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Ernest_Hemingway@4x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Hans_Gude.png +%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Hans_Gude@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Hans_Gude@3x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/Hans_Gude@4x.png %%QT_EXAMPLEDIR%%/quickcontrols2/chattutorial/shared/shared.qrc +%%QT_EXAMPLEDIR%%/quickcontrols2/contactlist/ContactDelegate.ui.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/contactlist/ContactDialog.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/contactlist/ContactForm.ui.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/contactlist/ContactView.ui.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/contactlist/SectionDelegate.ui.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/contactlist/contactlist.pro +%%QT_EXAMPLEDIR%%/quickcontrols2/contactlist/contactlist.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/contactlist/contactmodel.cpp +%%QT_EXAMPLEDIR%%/quickcontrols2/contactlist/contactmodel.h +%%QT_EXAMPLEDIR%%/quickcontrols2/contactlist/designer/Backend/ContactModel.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/contactlist/designer/Backend/qmldir +%%QT_EXAMPLEDIR%%/quickcontrols2/contactlist/doc/images/qtquickcontrols2-contactlist.png +%%QT_EXAMPLEDIR%%/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc +%%QT_EXAMPLEDIR%%/quickcontrols2/contactlist/main.cpp +%%QT_EXAMPLEDIR%%/quickcontrols2/flatstyle/Flat/Button.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/flatstyle/Flat/CheckBox.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/flatstyle/Flat/Switch.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/flatstyle/MainForm.ui.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/flatstyle/doc/images/qtquickcontrols2-flatstyle-creator.png +%%QT_EXAMPLEDIR%%/quickcontrols2/flatstyle/doc/images/qtquickcontrols2-flatstyle.png +%%QT_EXAMPLEDIR%%/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc +%%QT_EXAMPLEDIR%%/quickcontrols2/flatstyle/flatstyle.pro +%%QT_EXAMPLEDIR%%/quickcontrols2/flatstyle/flatstyle.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/flatstyle/imports/Theme/Theme.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/flatstyle/imports/Theme/qmldir +%%QT_EXAMPLEDIR%%/quickcontrols2/flatstyle/main.cpp +%%QT_EXAMPLEDIR%%/quickcontrols2/flatstyle/qtquickcontrols2.conf %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-drawer.png %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-menu.png %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/doc/images/qtquickcontrols2-gallery-welcome.png @@ -3888,7 +4108,10 @@ %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/gallery.cpp %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/gallery.pro %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/gallery.qml -%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/gallery.qrc +%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/+material/back.png +%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/+material/back@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/+material/back@3x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/+material/back@4x.png %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/+material/drawer.png %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/+material/drawer@2x.png %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/+material/drawer@3x.png @@ -3905,6 +4128,10 @@ %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/arrows@2x.png %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/arrows@3x.png %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/arrows@4x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/back.png +%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/back@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/back@3x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/back@4x.png %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/drawer.png %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/drawer@2x.png %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/drawer@3x.png @@ -3921,19 +4148,19 @@ %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/ButtonPage.qml %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/CheckBoxPage.qml %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/ComboBoxPage.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/DelayButtonPage.qml %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/DelegatePage.qml %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/DialPage.qml -%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/DrawerPage.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/DialogPage.qml %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/FramePage.qml %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/GroupBoxPage.qml -%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/MenuPage.qml %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/PageIndicatorPage.qml -%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/PopupPage.qml %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/ProgressBarPage.qml %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/RadioButtonPage.qml %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/RangeSliderPage.qml %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/ScrollBarPage.qml %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/ScrollIndicatorPage.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/ScrollablePage.qml %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/SliderPage.qml %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/SpinBoxPage.qml %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/StackViewPage.qml @@ -3946,6 +4173,152 @@ %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/TumblerPage.qml %%QT_EXAMPLEDIR%%/quickcontrols2/gallery/qtquickcontrols2.conf %%QT_EXAMPLEDIR%%/quickcontrols2/quickcontrols2.pro +%%QT_EXAMPLEDIR%%/quickcontrols2/sidepanel/doc/images/qtquickcontrols2-sidepanel-landscape.png +%%QT_EXAMPLEDIR%%/quickcontrols2/sidepanel/doc/images/qtquickcontrols2-sidepanel-portrait.png +%%QT_EXAMPLEDIR%%/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc +%%QT_EXAMPLEDIR%%/quickcontrols2/sidepanel/images/qt-logo.png +%%QT_EXAMPLEDIR%%/quickcontrols2/sidepanel/images/qt-logo@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/sidepanel/images/qt-logo@3x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/sidepanel/images/qt-logo@4x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/sidepanel/sidepanel.cpp +%%QT_EXAMPLEDIR%%/quickcontrols2/sidepanel/sidepanel.pro +%%QT_EXAMPLEDIR%%/quickcontrols2/sidepanel/sidepanel.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/swipetoremove/doc/images/qtquickcontrols2-swipetoremove.png +%%QT_EXAMPLEDIR%%/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc +%%QT_EXAMPLEDIR%%/quickcontrols2/swipetoremove/fonts/LICENSE.txt +%%QT_EXAMPLEDIR%%/quickcontrols2/swipetoremove/fonts/fontello.ttf +%%QT_EXAMPLEDIR%%/quickcontrols2/swipetoremove/swipetoremove.cpp +%%QT_EXAMPLEDIR%%/quickcontrols2/swipetoremove/swipetoremove.pro +%%QT_EXAMPLEDIR%%/quickcontrols2/swipetoremove/swipetoremove.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/+touch/texteditor.html +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/doc/images/qtquickcontrols2-texteditor-desktop.jpg +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/doc/images/qtquickcontrols2-texteditor-touch.jpg +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/documenthandler.cpp +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/documenthandler.h +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/fonts/fontello.ttf +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/images/qt-logo.png +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/qml/+touch/texteditor.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/qml/texteditor.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/qtquickcontrols2.conf +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/texteditor.cpp +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/texteditor.html +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/texteditor.pro +%%QT_EXAMPLEDIR%%/quickcontrols2/texteditor/texteditor.qrc +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/doc/images/qtquickcontrols2-wearable.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/images/back.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/images/back@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/images/back@3x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/images/back@4x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/images/background.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/images/home.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/images/home@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/images/home@3x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/images/home@4x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Alarms/AlarmsPage.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Alarms/images/alarms.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Alarms/images/alarms@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Fitness/FitnessPage.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Fitness/fitness.js +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Fitness/images/fitness.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Fitness/images/fitness@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Fitness/images/man-running.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Fitness/images/man-running@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Fitness/images/man-walking.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Fitness/images/man-walking@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/LauncherPage.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/NaviButton.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/NavigationPage.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/RouteElement.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/images/end.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/images/end@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/images/leftturn.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/images/leftturn@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/images/marker.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/images/navigation.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/images/navigation@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/images/rightturn.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/images/rightturn@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/images/start.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/images/start@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/images/straight.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/images/straight@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/images/uturn.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/images/uturn@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/navigation.js +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Navigation/walk_route.json +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Notifications/NotificationsPage.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Notifications/images/avatarf.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Notifications/images/avatarf@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Notifications/images/avatarm.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Notifications/images/avatarm@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Notifications/images/missedcall.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Notifications/images/missedcall@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Notifications/images/notifications.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Notifications/images/notifications@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Notifications/notifications.js +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Settings/SettingsPage.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Settings/images/bluetooth.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Settings/images/bluetooth@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Settings/images/brightness.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Settings/images/brightness@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Settings/images/contrast.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Settings/images/contrast@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Settings/images/settings.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Settings/images/settings@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Settings/images/wifi.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Settings/images/wifi@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Style/PageIndicator.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Style/Slider.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Style/Switch.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Style/UIStyle.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Style/qmldir +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Weather/WeatherPage.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Weather/images/humidity.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Weather/images/humidity@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Weather/images/pressure.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Weather/images/pressure@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Weather/images/sunrise.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Weather/images/sunrise@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Weather/images/sunset.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Weather/images/sunset@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Weather/images/temperature.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Weather/images/temperature@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Weather/images/weather.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Weather/images/weather@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Weather/images/wind.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Weather/images/wind@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Weather/weather.js +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/Weather/weather.json +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/Clock.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/WorldClockPage.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/center.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/center@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/clock-night.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/clock-night@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/clock.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/second.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/second@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/swissdaydial.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/swissdaydial@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/swissdayhour.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/swissdayhour@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/swissdayminute.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/swissdayminute@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/swissnightdial.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/swissnightdial@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/swissnighthour.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/swissnighthour@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/swissnightminute.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/swissnightminute@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/swissseconds.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/worldclock.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/qml/WorldClock/images/worldclock@2x.png +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/wearable.cpp +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/wearable.pro +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/wearable.qml +%%QT_EXAMPLEDIR%%/quickcontrols2/wearable/wearable.qrc %%QT_EXAMPLEDIR%%/script/README %%QT_EXAMPLEDIR%%/script/calculator/calculator.js %%QT_EXAMPLEDIR%%/script/calculator/calculator.pro @@ -4045,6 +4418,15 @@ %%QT_EXAMPLEDIR%%/scxml/calculator-widgets/mainwindow.cpp %%QT_EXAMPLEDIR%%/scxml/calculator-widgets/mainwindow.h %%QT_EXAMPLEDIR%%/scxml/calculator-widgets/mainwindow.ui +%%QT_EXAMPLEDIR%%/scxml/ftpclient/doc/images/ftpclient-statechart.png +%%QT_EXAMPLEDIR%%/scxml/ftpclient/doc/src/ftpclient.qdoc +%%QT_EXAMPLEDIR%%/scxml/ftpclient/ftpclient.pro +%%QT_EXAMPLEDIR%%/scxml/ftpclient/ftpcontrolchannel.cpp +%%QT_EXAMPLEDIR%%/scxml/ftpclient/ftpcontrolchannel.h +%%QT_EXAMPLEDIR%%/scxml/ftpclient/ftpdatachannel.cpp +%%QT_EXAMPLEDIR%%/scxml/ftpclient/ftpdatachannel.h +%%QT_EXAMPLEDIR%%/scxml/ftpclient/main.cpp +%%QT_EXAMPLEDIR%%/scxml/ftpclient/simpleftp.scxml %%QT_EXAMPLEDIR%%/scxml/invoke-common/Button.qml %%QT_EXAMPLEDIR%%/scxml/invoke-common/MainView.qml %%QT_EXAMPLEDIR%%/scxml/invoke-common/SubView.qml @@ -4064,8 +4446,8 @@ %%QT_EXAMPLEDIR%%/scxml/mediaplayer-common/Mediaplayer.qml %%QT_EXAMPLEDIR%%/scxml/mediaplayer-common/doc/images/mediaplayer.png %%QT_EXAMPLEDIR%%/scxml/mediaplayer-common/doc/src/mediaplayer-compiling.qdocinc -%%QT_EXAMPLEDIR%%/scxml/mediaplayer-common/doc/src/mediaplayer-dynamic.qdocinc %%QT_EXAMPLEDIR%%/scxml/mediaplayer-common/doc/src/mediaplayer-ecmascript-data-model.qdocinc +%%QT_EXAMPLEDIR%%/scxml/mediaplayer-common/doc/src/mediaplayer-widgets-connecting-to-states.qdocinc %%QT_EXAMPLEDIR%%/scxml/mediaplayer-common/mainwindow.cpp %%QT_EXAMPLEDIR%%/scxml/mediaplayer-common/mainwindow.h %%QT_EXAMPLEDIR%%/scxml/mediaplayer-common/mainwindow.ui @@ -4111,7 +4493,19 @@ %%QT_EXAMPLEDIR%%/scxml/pinball/pinball.pro %%QT_EXAMPLEDIR%%/scxml/pinball/pinball.scxml %%QT_EXAMPLEDIR%%/scxml/scxml.pro +%%QT_EXAMPLEDIR%%/scxml/sudoku/data/nearly-solved-sudoku.data +%%QT_EXAMPLEDIR%%/scxml/sudoku/data/sudoku.data +%%QT_EXAMPLEDIR%%/scxml/sudoku/doc/images/sudoku.png +%%QT_EXAMPLEDIR%%/scxml/sudoku/doc/src/sudoku.qdoc +%%QT_EXAMPLEDIR%%/scxml/sudoku/main.cpp +%%QT_EXAMPLEDIR%%/scxml/sudoku/mainwindow.cpp +%%QT_EXAMPLEDIR%%/scxml/sudoku/mainwindow.h +%%QT_EXAMPLEDIR%%/scxml/sudoku/sudoku.js +%%QT_EXAMPLEDIR%%/scxml/sudoku/sudoku.pro +%%QT_EXAMPLEDIR%%/scxml/sudoku/sudoku.qrc +%%QT_EXAMPLEDIR%%/scxml/sudoku/sudoku.scxml %%QT_EXAMPLEDIR%%/scxml/trafficlight-common/Button.qml +%%QT_EXAMPLEDIR%%/scxml/trafficlight-common/Lights.ui.qml %%QT_EXAMPLEDIR%%/scxml/trafficlight-common/TrafficLight.qml %%QT_EXAMPLEDIR%%/scxml/trafficlight-common/background.png %%QT_EXAMPLEDIR%%/scxml/trafficlight-common/doc/images/trafficlight.png @@ -4130,6 +4524,13 @@ %%QT_EXAMPLEDIR%%/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.pro %%QT_EXAMPLEDIR%%/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qml %%QT_EXAMPLEDIR%%/scxml/trafficlight-qml-dynamic/trafficlight-qml-dynamic.qrc +%%QT_EXAMPLEDIR%%/scxml/trafficlight-qml-simple/Light.qml +%%QT_EXAMPLEDIR%%/scxml/trafficlight-qml-simple/TrafficLight.qml +%%QT_EXAMPLEDIR%%/scxml/trafficlight-qml-simple/doc/images/trafficlight.png +%%QT_EXAMPLEDIR%%/scxml/trafficlight-qml-simple/doc/src/trafficlight-qml-simple.qdoc +%%QT_EXAMPLEDIR%%/scxml/trafficlight-qml-simple/trafficlight-qml-simple.cpp +%%QT_EXAMPLEDIR%%/scxml/trafficlight-qml-simple/trafficlight-qml-simple.pro +%%QT_EXAMPLEDIR%%/scxml/trafficlight-qml-simple/trafficlight-qml-simple.qrc %%QT_EXAMPLEDIR%%/scxml/trafficlight-qml-static/doc/src/trafficlight-qml-static.qdoc %%QT_EXAMPLEDIR%%/scxml/trafficlight-qml-static/trafficlight-qml-static.cpp %%QT_EXAMPLEDIR%%/scxml/trafficlight-qml-static/trafficlight-qml-static.pro @@ -4168,6 +4569,7 @@ %%QT_EXAMPLEDIR%%/sensors/grue/lib/gruesensor.cpp %%QT_EXAMPLEDIR%%/sensors/grue/lib/gruesensor.h %%QT_EXAMPLEDIR%%/sensors/grue/lib/gruesensor_p.h +%%QT_EXAMPLEDIR%%/sensors/grue/lib/lib.pri %%QT_EXAMPLEDIR%%/sensors/grue/lib/lib.pro %%QT_EXAMPLEDIR%%/sensors/grue/main.cpp %%QT_EXAMPLEDIR%%/sensors/grue/plugin/gruesensorimpl.cpp @@ -4262,6 +4664,8 @@ %%QT_EXAMPLEDIR%%/sensors/shakeit/shakeit.qml %%QT_EXAMPLEDIR%%/sensors/shakeit/shakeit.qrc %%QT_EXAMPLEDIR%%/sensors/stub.h +%%QT_EXAMPLEDIR%%/serialbus/can/bitratebox.cpp +%%QT_EXAMPLEDIR%%/serialbus/can/bitratebox.h %%QT_EXAMPLEDIR%%/serialbus/can/can.pro %%QT_EXAMPLEDIR%%/serialbus/can/can.qrc %%QT_EXAMPLEDIR%%/serialbus/can/connectdialog.cpp @@ -4382,6 +4786,7 @@ %%QT_EXAMPLEDIR%%/serialport/terminal/settingsdialog.ui %%QT_EXAMPLEDIR%%/serialport/terminal/terminal.pro %%QT_EXAMPLEDIR%%/serialport/terminal/terminal.qrc +%%QT_EXAMPLEDIR%%/shared/shared.pri %%QT_EXAMPLEDIR%%/sql/README %%QT_EXAMPLEDIR%%/sql/books/bookdelegate.cpp %%QT_EXAMPLEDIR%%/sql/books/bookdelegate.h @@ -4497,7 +4902,6 @@ %%QT_EXAMPLEDIR%%/svg/embedded/desktopservices/resources/photo.png %%QT_EXAMPLEDIR%%/svg/embedded/embedded.pro %%QT_EXAMPLEDIR%%/svg/embedded/fluidlauncher/config.xml -%%QT_EXAMPLEDIR%%/svg/embedded/fluidlauncher/config_wince/config.xml %%QT_EXAMPLEDIR%%/svg/embedded/fluidlauncher/demoapplication.cpp %%QT_EXAMPLEDIR%%/svg/embedded/fluidlauncher/demoapplication.h %%QT_EXAMPLEDIR%%/svg/embedded/fluidlauncher/fluidlauncher.cpp @@ -4692,6 +5096,8 @@ %%QT_EXAMPLEDIR%%/webchannel/chatclient-html/chatclient.html %%QT_EXAMPLEDIR%%/webchannel/chatclient-html/doc/images/chatclient-html.png %%QT_EXAMPLEDIR%%/webchannel/chatclient-html/doc/src/chatclient-html.qdoc +%%QT_EXAMPLEDIR%%/webchannel/chatclient-qml/LoginForm.ui.qml +%%QT_EXAMPLEDIR%%/webchannel/chatclient-qml/MainForm.ui.qml %%QT_EXAMPLEDIR%%/webchannel/chatclient-qml/chatclient-qml.pro %%QT_EXAMPLEDIR%%/webchannel/chatclient-qml/doc/images/chatclient-qml.png %%QT_EXAMPLEDIR%%/webchannel/chatclient-qml/doc/src/chatclient-qml.qdoc @@ -4711,10 +5117,14 @@ %%QT_EXAMPLEDIR%%/webchannel/qwclient/package.json %%QT_EXAMPLEDIR%%/webchannel/qwclient/qwclient.js %%QT_EXAMPLEDIR%%/webchannel/qwclient/qwclient.pro +%%QT_EXAMPLEDIR%%/webchannel/shared/qwebchannel.js %%QT_EXAMPLEDIR%%/webchannel/shared/websocketclientwrapper.cpp %%QT_EXAMPLEDIR%%/webchannel/shared/websocketclientwrapper.h %%QT_EXAMPLEDIR%%/webchannel/shared/websockettransport.cpp %%QT_EXAMPLEDIR%%/webchannel/shared/websockettransport.h +%%QT_EXAMPLEDIR%%/webchannel/standalone/core.h +%%QT_EXAMPLEDIR%%/webchannel/standalone/dialog.cpp +%%QT_EXAMPLEDIR%%/webchannel/standalone/dialog.h %%QT_EXAMPLEDIR%%/webchannel/standalone/dialog.ui %%QT_EXAMPLEDIR%%/webchannel/standalone/doc/images/standalone-screenshot.png %%QT_EXAMPLEDIR%%/webchannel/standalone/doc/src/standalone.qdoc @@ -4950,10 +5360,6 @@ %%QT_EXAMPLEDIR%%/widgets/dialogs/licensewizard/licensewizard.pro %%QT_EXAMPLEDIR%%/widgets/dialogs/licensewizard/licensewizard.qrc %%QT_EXAMPLEDIR%%/widgets/dialogs/licensewizard/main.cpp -%%QT_EXAMPLEDIR%%/widgets/dialogs/sipdialog/dialog.cpp -%%QT_EXAMPLEDIR%%/widgets/dialogs/sipdialog/dialog.h -%%QT_EXAMPLEDIR%%/widgets/dialogs/sipdialog/main.cpp -%%QT_EXAMPLEDIR%%/widgets/dialogs/sipdialog/sipdialog.pro %%QT_EXAMPLEDIR%%/widgets/dialogs/standarddialogs/dialog.cpp %%QT_EXAMPLEDIR%%/widgets/dialogs/standarddialogs/dialog.h %%QT_EXAMPLEDIR%%/widgets/dialogs/standarddialogs/main.cpp @@ -5135,7 +5541,6 @@ %%QT_EXAMPLEDIR%%/widgets/doc/src/simpledommodel.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/simpletreemodel.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/simplewidgetmapper.qdoc -%%QT_EXAMPLEDIR%%/widgets/doc/src/sipdialog.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/sliders.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/spinboxdelegate.qdoc %%QT_EXAMPLEDIR%%/widgets/doc/src/spinboxes.qdoc @@ -5765,16 +6170,6 @@ %%QT_EXAMPLEDIR%%/widgets/painting/transformations/transformations.pro %%QT_EXAMPLEDIR%%/widgets/painting/transformations/window.cpp %%QT_EXAMPLEDIR%%/widgets/painting/transformations/window.h -%%QT_EXAMPLEDIR%%/qt3d/materials/Lights.qml -%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/+material/back.png -%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/+material/back@2x.png -%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/+material/back@3x.png -%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/+material/back@4x.png -%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/back.png -%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/back@2x.png -%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/back@3x.png -%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/images/back@4x.png -%%QT_EXAMPLEDIR%%/quickcontrols2/gallery/pages/ScrollablePage.qml %%QT_EXAMPLEDIR%%/widgets/richtext/README %%QT_EXAMPLEDIR%%/widgets/richtext/calendar/calendar.pro %%QT_EXAMPLEDIR%%/widgets/richtext/calendar/main.cpp @@ -6339,7 +6734,6 @@ %%QT_EXAMPLEDIR%%/xml/dombookmarks/doc/images/dombookmarks-example.png %%QT_EXAMPLEDIR%%/xml/dombookmarks/doc/src/dombookmarks.qdoc %%QT_EXAMPLEDIR%%/xml/dombookmarks/dombookmarks.pro -%%QT_EXAMPLEDIR%%/xml/dombookmarks/frank.xbel %%QT_EXAMPLEDIR%%/xml/dombookmarks/jennifer.xbel %%QT_EXAMPLEDIR%%/xml/dombookmarks/main.cpp %%QT_EXAMPLEDIR%%/xml/dombookmarks/mainwindow.cpp @@ -6360,7 +6754,6 @@ %%QT_EXAMPLEDIR%%/xml/rsslisting/rsslisting.pro %%QT_EXAMPLEDIR%%/xml/saxbookmarks/doc/images/saxbookmarks-example.png %%QT_EXAMPLEDIR%%/xml/saxbookmarks/doc/src/saxbookmarks.qdoc -%%QT_EXAMPLEDIR%%/xml/saxbookmarks/frank.xbel %%QT_EXAMPLEDIR%%/xml/saxbookmarks/jennifer.xbel %%QT_EXAMPLEDIR%%/xml/saxbookmarks/main.cpp %%QT_EXAMPLEDIR%%/xml/saxbookmarks/mainwindow.cpp @@ -6374,7 +6767,6 @@ %%QT_EXAMPLEDIR%%/xml/streambookmarks/doc/images/xmlstreamexample-helpmenu.png %%QT_EXAMPLEDIR%%/xml/streambookmarks/doc/images/xmlstreamexample-screenshot.png %%QT_EXAMPLEDIR%%/xml/streambookmarks/doc/src/qxmlstreambookmarks.qdoc -%%QT_EXAMPLEDIR%%/xml/streambookmarks/frank.xbel %%QT_EXAMPLEDIR%%/xml/streambookmarks/jennifer.xbel %%QT_EXAMPLEDIR%%/xml/streambookmarks/main.cpp %%QT_EXAMPLEDIR%%/xml/streambookmarks/mainwindow.cpp diff --git a/misc/qt5-l10n/pkg-plist b/misc/qt5-l10n/pkg-plist index 9b62038a765d..80fb87b858bf 100644 --- a/misc/qt5-l10n/pkg-plist +++ b/misc/qt5-l10n/pkg-plist @@ -1,7 +1,9 @@ +%%QT_L10NDIR%%/assistant_bg.qm %%QT_L10NDIR%%/assistant_cs.qm %%QT_L10NDIR%%/assistant_da.qm %%QT_L10NDIR%%/assistant_de.qm %%QT_L10NDIR%%/assistant_en.qm +%%QT_L10NDIR%%/assistant_es.qm %%QT_L10NDIR%%/assistant_fr.qm %%QT_L10NDIR%%/assistant_hu.qm %%QT_L10NDIR%%/assistant_ja.qm @@ -13,9 +15,12 @@ %%QT_L10NDIR%%/assistant_uk.qm %%QT_L10NDIR%%/assistant_zh_CN.qm %%QT_L10NDIR%%/assistant_zh_TW.qm +%%QT_L10NDIR%%/designer_bg.qm %%QT_L10NDIR%%/designer_cs.qm +%%QT_L10NDIR%%/designer_da.qm %%QT_L10NDIR%%/designer_de.qm %%QT_L10NDIR%%/designer_en.qm +%%QT_L10NDIR%%/designer_es.qm %%QT_L10NDIR%%/designer_fr.qm %%QT_L10NDIR%%/designer_hu.qm %%QT_L10NDIR%%/designer_ja.qm @@ -27,9 +32,12 @@ %%QT_L10NDIR%%/designer_uk.qm %%QT_L10NDIR%%/designer_zh_CN.qm %%QT_L10NDIR%%/designer_zh_TW.qm +%%QT_L10NDIR%%/linguist_bg.qm %%QT_L10NDIR%%/linguist_cs.qm +%%QT_L10NDIR%%/linguist_da.qm %%QT_L10NDIR%%/linguist_de.qm %%QT_L10NDIR%%/linguist_en.qm +%%QT_L10NDIR%%/linguist_es.qm %%QT_L10NDIR%%/linguist_fr.qm %%QT_L10NDIR%%/linguist_hu.qm %%QT_L10NDIR%%/linguist_ja.qm @@ -41,8 +49,11 @@ %%QT_L10NDIR%%/linguist_uk.qm %%QT_L10NDIR%%/linguist_zh_CN.qm %%QT_L10NDIR%%/linguist_zh_TW.qm +%%QT_L10NDIR%%/qmlviewer_bg.qm %%QT_L10NDIR%%/qmlviewer_cs.qm +%%QT_L10NDIR%%/qmlviewer_da.qm %%QT_L10NDIR%%/qmlviewer_en.qm +%%QT_L10NDIR%%/qmlviewer_es.qm %%QT_L10NDIR%%/qmlviewer_fi.qm %%QT_L10NDIR%%/qmlviewer_fr.qm %%QT_L10NDIR%%/qmlviewer_he.qm @@ -54,6 +65,7 @@ %%QT_L10NDIR%%/qmlviewer_sk.qm %%QT_L10NDIR%%/qmlviewer_uk.qm %%QT_L10NDIR%%/qt_ar.qm +%%QT_L10NDIR%%/qt_bg.qm %%QT_L10NDIR%%/qt_ca.qm %%QT_L10NDIR%%/qt_cs.qm %%QT_L10NDIR%%/qt_da.qm @@ -65,10 +77,12 @@ %%QT_L10NDIR%%/qt_fr.qm %%QT_L10NDIR%%/qt_gl.qm %%QT_L10NDIR%%/qt_he.qm +%%QT_L10NDIR%%/qt_help_bg.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_es.qm %%QT_L10NDIR%%/qt_help_fr.qm %%QT_L10NDIR%%/qt_help_gl.qm %%QT_L10NDIR%%/qt_help_hu.qm @@ -96,12 +110,16 @@ %%QT_L10NDIR%%/qt_uk.qm %%QT_L10NDIR%%/qt_zh_CN.qm %%QT_L10NDIR%%/qt_zh_TW.qm +%%QT_L10NDIR%%/qtbase_bg.qm %%QT_L10NDIR%%/qtbase_ca.qm %%QT_L10NDIR%%/qtbase_cs.qm +%%QT_L10NDIR%%/qtbase_da.qm %%QT_L10NDIR%%/qtbase_de.qm %%QT_L10NDIR%%/qtbase_en.qm +%%QT_L10NDIR%%/qtbase_es.qm %%QT_L10NDIR%%/qtbase_fi.qm %%QT_L10NDIR%%/qtbase_fr.qm +%%QT_L10NDIR%%/qtbase_gd.qm %%QT_L10NDIR%%/qtbase_he.qm %%QT_L10NDIR%%/qtbase_hu.qm %%QT_L10NDIR%%/qtbase_it.qm @@ -122,14 +140,20 @@ %%QT_L10NDIR%%/qtconfig_uk.qm %%QT_L10NDIR%%/qtconfig_zh_CN.qm %%QT_L10NDIR%%/qtconfig_zh_TW.qm +%%QT_L10NDIR%%/qtconnectivity_bg.qm +%%QT_L10NDIR%%/qtconnectivity_da.qm %%QT_L10NDIR%%/qtconnectivity_de.qm %%QT_L10NDIR%%/qtconnectivity_en.qm +%%QT_L10NDIR%%/qtconnectivity_es.qm %%QT_L10NDIR%%/qtconnectivity_ko.qm %%QT_L10NDIR%%/qtconnectivity_pl.qm %%QT_L10NDIR%%/qtconnectivity_ru.qm %%QT_L10NDIR%%/qtconnectivity_uk.qm +%%QT_L10NDIR%%/qtdeclarative_bg.qm +%%QT_L10NDIR%%/qtdeclarative_da.qm %%QT_L10NDIR%%/qtdeclarative_de.qm %%QT_L10NDIR%%/qtdeclarative_en.qm +%%QT_L10NDIR%%/qtdeclarative_es.qm %%QT_L10NDIR%%/qtdeclarative_fi.qm %%QT_L10NDIR%%/qtdeclarative_fr.qm %%QT_L10NDIR%%/qtdeclarative_ja.qm @@ -139,17 +163,23 @@ %%QT_L10NDIR%%/qtdeclarative_ru.qm %%QT_L10NDIR%%/qtdeclarative_sk.qm %%QT_L10NDIR%%/qtdeclarative_uk.qm +%%QT_L10NDIR%%/qtlocation_bg.qm +%%QT_L10NDIR%%/qtlocation_da.qm %%QT_L10NDIR%%/qtlocation_de.qm %%QT_L10NDIR%%/qtlocation_en.qm +%%QT_L10NDIR%%/qtlocation_es.qm %%QT_L10NDIR%%/qtlocation_fr.qm %%QT_L10NDIR%%/qtlocation_ko.qm %%QT_L10NDIR%%/qtlocation_pl.qm %%QT_L10NDIR%%/qtlocation_ru.qm %%QT_L10NDIR%%/qtlocation_uk.qm +%%QT_L10NDIR%%/qtmultimedia_bg.qm %%QT_L10NDIR%%/qtmultimedia_ca.qm %%QT_L10NDIR%%/qtmultimedia_cs.qm +%%QT_L10NDIR%%/qtmultimedia_da.qm %%QT_L10NDIR%%/qtmultimedia_de.qm %%QT_L10NDIR%%/qtmultimedia_en.qm +%%QT_L10NDIR%%/qtmultimedia_es.qm %%QT_L10NDIR%%/qtmultimedia_fi.qm %%QT_L10NDIR%%/qtmultimedia_fr.qm %%QT_L10NDIR%%/qtmultimedia_hu.qm @@ -160,10 +190,13 @@ %%QT_L10NDIR%%/qtmultimedia_ru.qm %%QT_L10NDIR%%/qtmultimedia_sk.qm %%QT_L10NDIR%%/qtmultimedia_uk.qm +%%QT_L10NDIR%%/qtquick1_bg.qm %%QT_L10NDIR%%/qtquick1_ca.qm %%QT_L10NDIR%%/qtquick1_cs.qm +%%QT_L10NDIR%%/qtquick1_da.qm %%QT_L10NDIR%%/qtquick1_de.qm %%QT_L10NDIR%%/qtquick1_en.qm +%%QT_L10NDIR%%/qtquick1_es.qm %%QT_L10NDIR%%/qtquick1_fi.qm %%QT_L10NDIR%%/qtquick1_fr.qm %%QT_L10NDIR%%/qtquick1_he.qm @@ -175,8 +208,11 @@ %%QT_L10NDIR%%/qtquick1_ru.qm %%QT_L10NDIR%%/qtquick1_sk.qm %%QT_L10NDIR%%/qtquick1_uk.qm +%%QT_L10NDIR%%/qtquickcontrols2_bg.qm %%QT_L10NDIR%%/qtquickcontrols2_en.qm +%%QT_L10NDIR%%/qtquickcontrols2_ko.qm %%QT_L10NDIR%%/qtquickcontrols2_uk.qm +%%QT_L10NDIR%%/qtquickcontrols_bg.qm %%QT_L10NDIR%%/qtquickcontrols_de.qm %%QT_L10NDIR%%/qtquickcontrols_en.qm %%QT_L10NDIR%%/qtquickcontrols_fi.qm @@ -184,10 +220,13 @@ %%QT_L10NDIR%%/qtquickcontrols_ja.qm %%QT_L10NDIR%%/qtquickcontrols_ru.qm %%QT_L10NDIR%%/qtquickcontrols_uk.qm +%%QT_L10NDIR%%/qtscript_bg.qm %%QT_L10NDIR%%/qtscript_ca.qm %%QT_L10NDIR%%/qtscript_cs.qm +%%QT_L10NDIR%%/qtscript_da.qm %%QT_L10NDIR%%/qtscript_de.qm %%QT_L10NDIR%%/qtscript_en.qm +%%QT_L10NDIR%%/qtscript_es.qm %%QT_L10NDIR%%/qtscript_fi.qm %%QT_L10NDIR%%/qtscript_fr.qm %%QT_L10NDIR%%/qtscript_he.qm @@ -202,26 +241,35 @@ %%QT_L10NDIR%%/qtscript_uk.qm %%QT_L10NDIR%%/qtserialport_de.qm %%QT_L10NDIR%%/qtserialport_en.qm +%%QT_L10NDIR%%/qtserialport_es.qm %%QT_L10NDIR%%/qtserialport_ja.qm +%%QT_L10NDIR%%/qtserialport_ko.qm %%QT_L10NDIR%%/qtserialport_pl.qm %%QT_L10NDIR%%/qtserialport_ru.qm %%QT_L10NDIR%%/qtserialport_uk.qm %%QT_L10NDIR%%/qtwebengine_de.qm %%QT_L10NDIR%%/qtwebengine_en.qm +%%QT_L10NDIR%%/qtwebengine_es.qm +%%QT_L10NDIR%%/qtwebengine_ko.qm %%QT_L10NDIR%%/qtwebengine_pl.qm %%QT_L10NDIR%%/qtwebengine_ru.qm %%QT_L10NDIR%%/qtwebengine_uk.qm %%QT_L10NDIR%%/qtwebsockets_de.qm %%QT_L10NDIR%%/qtwebsockets_en.qm +%%QT_L10NDIR%%/qtwebsockets_es.qm %%QT_L10NDIR%%/qtwebsockets_fr.qm %%QT_L10NDIR%%/qtwebsockets_ja.qm +%%QT_L10NDIR%%/qtwebsockets_ko.qm %%QT_L10NDIR%%/qtwebsockets_pl.qm %%QT_L10NDIR%%/qtwebsockets_ru.qm %%QT_L10NDIR%%/qtwebsockets_uk.qm +%%QT_L10NDIR%%/qtxmlpatterns_bg.qm %%QT_L10NDIR%%/qtxmlpatterns_ca.qm %%QT_L10NDIR%%/qtxmlpatterns_cs.qm +%%QT_L10NDIR%%/qtxmlpatterns_da.qm %%QT_L10NDIR%%/qtxmlpatterns_de.qm %%QT_L10NDIR%%/qtxmlpatterns_en.qm +%%QT_L10NDIR%%/qtxmlpatterns_es.qm %%QT_L10NDIR%%/qtxmlpatterns_fr.qm %%QT_L10NDIR%%/qtxmlpatterns_hu.qm %%QT_L10NDIR%%/qtxmlpatterns_it.qm diff --git a/multimedia/qt5-multimedia/Makefile b/multimedia/qt5-multimedia/Makefile index ad8d8512a3c6..c31dfb039114 100644 --- a/multimedia/qt5-multimedia/Makefile +++ b/multimedia/qt5-multimedia/Makefile @@ -2,7 +2,6 @@ PORTNAME= multimedia DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= multimedia PKGNAMEPREFIX= qt5- @@ -11,7 +10,7 @@ COMMENT= Qt audio, video, radio and camera support module # LICENSE set via USES_QT5 (bsd.qt.mk) -USES= pkgconfig qmake +USES= pkgconfig qmake:norecursive USE_GL= gl USE_GNOME= glib20 USE_QT5= core gui network opengl qml quick widgets \ diff --git a/multimedia/qt5-multimedia/pkg-plist b/multimedia/qt5-multimedia/pkg-plist index 4ee3674d8a73..3bdc2b20e6b6 100644 --- a/multimedia/qt5-multimedia/pkg-plist +++ b/multimedia/qt5-multimedia/pkg-plist @@ -1,9 +1,9 @@ %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/gstvideoconnector_p.h -%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/playlistfileparser_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qabstractvideobuffer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiobuffer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiodevicefactory_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiohelpers_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiosystempluginext_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qcamera_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qdeclarativevideooutput_backend_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qdeclarativevideooutput_p.h @@ -14,7 +14,6 @@ %%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 @@ -49,10 +48,13 @@ %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediastoragelocation_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmemoryvideobuffer_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmultimediautils_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplaylistfileparser_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsamplecache_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsgvideonode_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsoundeffect_pulse_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsoundeffect_qaudio_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimedia-config_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimediaglobal_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimediaquickdefs_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframe_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconversionhelper_p.h @@ -232,7 +234,9 @@ %%QT_INCDIR%%/QtMultimedia/qradiotunercontrol.h %%QT_INCDIR%%/QtMultimedia/qsound.h %%QT_INCDIR%%/QtMultimedia/qsoundeffect.h +%%QT_INCDIR%%/QtMultimedia/qtmultimedia-config.h %%QT_INCDIR%%/QtMultimedia/qtmultimediadefs.h +%%QT_INCDIR%%/QtMultimedia/qtmultimediaglobal.h %%QT_INCDIR%%/QtMultimedia/qtmultimediaversion.h %%QT_INCDIR%%/QtMultimedia/qvideodeviceselectorcontrol.h %%QT_INCDIR%%/QtMultimedia/qvideoencodersettingscontrol.h @@ -250,7 +254,6 @@ %%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_pDepends %%QT_INCDIR%%/QtMultimediaQuick_p/QtMultimediaQuick_pVersion %%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 %%QT_INCDIR%%/QtMultimediaWidgets/QCameraViewfinder diff --git a/net/qt5-network/Makefile b/net/qt5-network/Makefile index a6709a233adb..c36b54771ae4 100644 --- a/net/qt5-network/Makefile +++ b/net/qt5-network/Makefile @@ -2,14 +2,12 @@ PORTNAME= network DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= net ipv6 PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt network module -LIB_DEPENDS= libproxy.so:net/libproxy RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USES= ssl @@ -22,8 +20,8 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} -QT_DEFINES= LIBPROXY OPENSSL SSL -QT_CONFIG= libproxy openssl +QT_DEFINES= OPENSSL SSL +QT_CONFIG= openssl post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ @@ -31,6 +29,12 @@ post-patch: @${REINPLACE_CMD} -e 's|%%OPENSSLLIB%%|${OPENSSLLIB}|g' \ ${BUILD_WRKSRC}/ssl/qsslsocket_openssl_symbols.cpp +post-configure: +.for d in src/network src/plugins/bearer/generic + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} +.endfor + post-build: @cd ${WRKSRC}/src/plugins/bearer/generic && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ diff --git a/net/qt5-network/pkg-plist b/net/qt5-network/pkg-plist index 60541f03172b..a13a857479f4 100644 --- a/net/qt5-network/pkg-plist +++ b/net/qt5-network/pkg-plist @@ -1,3 +1,10 @@ +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/bitstreams_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/hpack_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/hpacktable_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/http2frames_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/http2protocol_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/http2streams_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/huffman_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qabstractnetworkcache_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qabstractprotocolhandler_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qabstractsocket_p.h @@ -10,6 +17,8 @@ %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qftp_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhostaddress_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhostinfo_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhsts_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttp2protocolhandler_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpmultipart_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpnetworkconnection_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qhttpnetworkconnectionchannel_p.h @@ -38,8 +47,8 @@ %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkcookiejar_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkdatagram_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkdiskcache_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkfile_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkinterface_p.h -%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkproxy_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreply_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplydataimpl_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyfileimpl_p.h @@ -47,6 +56,8 @@ %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyimpl_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkrequest_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworksession_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsctpserver_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsctpsocket_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsharednetworksession_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsocks5socketengine_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qspdyprotocolhandler_p.h @@ -56,6 +67,7 @@ %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslcipher_p.h %%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/qssldiffiehellmanparameters_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 @@ -65,6 +77,8 @@ %%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/qtnetwork-config_p.h +%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qtnetworkglobal_p.h %%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qurlinfo_p.h %%QT_INCDIR%%/QtNetwork/QAbstractNetworkCache %%QT_INCDIR%%/QtNetwork/QAbstractSocket @@ -77,6 +91,7 @@ %%QT_INCDIR%%/QtNetwork/QDnsTextRecord %%QT_INCDIR%%/QtNetwork/QHostAddress %%QT_INCDIR%%/QtNetwork/QHostInfo +%%QT_INCDIR%%/QtNetwork/QHstsPolicy %%QT_INCDIR%%/QtNetwork/QHttpMultiPart %%QT_INCDIR%%/QtNetwork/QHttpPart %%QT_INCDIR%%/QtNetwork/QIPv6Address @@ -89,6 +104,7 @@ %%QT_INCDIR%%/QtNetwork/QNetworkConfigurationManager %%QT_INCDIR%%/QtNetwork/QNetworkCookie %%QT_INCDIR%%/QtNetwork/QNetworkCookieJar +%%QT_INCDIR%%/QtNetwork/QNetworkDatagram %%QT_INCDIR%%/QtNetwork/QNetworkDiskCache %%QT_INCDIR%%/QtNetwork/QNetworkInterface %%QT_INCDIR%%/QtNetwork/QNetworkProxy @@ -97,11 +113,14 @@ %%QT_INCDIR%%/QtNetwork/QNetworkReply %%QT_INCDIR%%/QtNetwork/QNetworkRequest %%QT_INCDIR%%/QtNetwork/QNetworkSession +%%QT_INCDIR%%/QtNetwork/QSctpServer +%%QT_INCDIR%%/QtNetwork/QSctpSocket %%QT_INCDIR%%/QtNetwork/QSsl %%QT_INCDIR%%/QtNetwork/QSslCertificate %%QT_INCDIR%%/QtNetwork/QSslCertificateExtension %%QT_INCDIR%%/QtNetwork/QSslCipher %%QT_INCDIR%%/QtNetwork/QSslConfiguration +%%QT_INCDIR%%/QtNetwork/QSslDiffieHellmanParameters %%QT_INCDIR%%/QtNetwork/QSslEllipticCurve %%QT_INCDIR%%/QtNetwork/QSslError %%QT_INCDIR%%/QtNetwork/QSslKey @@ -120,6 +139,7 @@ %%QT_INCDIR%%/QtNetwork/qdnslookup.h %%QT_INCDIR%%/QtNetwork/qhostaddress.h %%QT_INCDIR%%/QtNetwork/qhostinfo.h +%%QT_INCDIR%%/QtNetwork/qhstspolicy.h %%QT_INCDIR%%/QtNetwork/qhttpmultipart.h %%QT_INCDIR%%/QtNetwork/qlocalserver.h %%QT_INCDIR%%/QtNetwork/qlocalsocket.h @@ -128,18 +148,21 @@ %%QT_INCDIR%%/QtNetwork/qnetworkconfiguration.h %%QT_INCDIR%%/QtNetwork/qnetworkcookie.h %%QT_INCDIR%%/QtNetwork/qnetworkcookiejar.h +%%QT_INCDIR%%/QtNetwork/qnetworkdatagram.h %%QT_INCDIR%%/QtNetwork/qnetworkdiskcache.h -%%QT_INCDIR%%/QtNetwork/qnetworkfunctions_wince.h %%QT_INCDIR%%/QtNetwork/qnetworkinterface.h %%QT_INCDIR%%/QtNetwork/qnetworkproxy.h %%QT_INCDIR%%/QtNetwork/qnetworkreply.h %%QT_INCDIR%%/QtNetwork/qnetworkrequest.h %%QT_INCDIR%%/QtNetwork/qnetworksession.h +%%QT_INCDIR%%/QtNetwork/qsctpserver.h +%%QT_INCDIR%%/QtNetwork/qsctpsocket.h %%QT_INCDIR%%/QtNetwork/qssl.h %%QT_INCDIR%%/QtNetwork/qsslcertificate.h %%QT_INCDIR%%/QtNetwork/qsslcertificateextension.h %%QT_INCDIR%%/QtNetwork/qsslcipher.h %%QT_INCDIR%%/QtNetwork/qsslconfiguration.h +%%QT_INCDIR%%/QtNetwork/qssldiffiehellmanparameters.h %%QT_INCDIR%%/QtNetwork/qsslellipticcurve.h %%QT_INCDIR%%/QtNetwork/qsslerror.h %%QT_INCDIR%%/QtNetwork/qsslkey.h @@ -147,6 +170,8 @@ %%QT_INCDIR%%/QtNetwork/qsslsocket.h %%QT_INCDIR%%/QtNetwork/qtcpserver.h %%QT_INCDIR%%/QtNetwork/qtcpsocket.h +%%QT_INCDIR%%/QtNetwork/qtnetwork-config.h +%%QT_INCDIR%%/QtNetwork/qtnetworkglobal.h %%QT_INCDIR%%/QtNetwork/qtnetworkversion.h %%QT_INCDIR%%/QtNetwork/qudpsocket.h %%QT_CMAKEDIR%%/Qt5Network/Qt5NetworkConfig.cmake diff --git a/print/qt5-printsupport/Makefile b/print/qt5-printsupport/Makefile index 27afe0bb59d2..924f001d2668 100644 --- a/print/qt5-printsupport/Makefile +++ b/print/qt5-printsupport/Makefile @@ -29,11 +29,18 @@ CUPS_LIB_DEPENDS= libcups.so:print/cups .if ${PORT_OPTIONS:MCUPS} QT_DEFINES+= CUPS QT_CONFIG+= cups +MORE_WRKSRCS+= src/plugins/printsupport .else QT_DEFINES+= -CUPS QT_CONFIG+= -cups .endif +post-configure: +.for d in src/printsupport ${MORE_WRKSRCS} + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} +.endfor + post-build: .if ${PORT_OPTIONS:MCUPS} @cd ${WRKSRC}/src/plugins/${PORTNAME}/cups && \ diff --git a/print/qt5-printsupport/pkg-plist b/print/qt5-printsupport/pkg-plist index 3b65ee6767e9..ef82169a559a 100644 --- a/print/qt5-printsupport/pkg-plist +++ b/print/qt5-printsupport/pkg-plist @@ -11,6 +11,8 @@ %%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/private/qprintengine_win_p.h %%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/private/qprinter_p.h %%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/private/qprinterinfo_p.h +%%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/private/qtprintsupport-config_p.h +%%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/private/qtprintsupportglobal_p.h %%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/qpa/qplatformprintdevice.h %%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/qpa/qplatformprintersupport.h %%QT_INCDIR%%/QtPrintSupport/%%FULLVER%%/QtPrintSupport/qpa/qplatformprintplugin.h @@ -33,6 +35,7 @@ %%QT_INCDIR%%/QtPrintSupport/qprinterinfo.h %%QT_INCDIR%%/QtPrintSupport/qprintpreviewdialog.h %%QT_INCDIR%%/QtPrintSupport/qprintpreviewwidget.h +%%QT_INCDIR%%/QtPrintSupport/qtprintsupport-config.h %%QT_INCDIR%%/QtPrintSupport/qtprintsupportglobal.h %%QT_INCDIR%%/QtPrintSupport/qtprintsupportversion.h %%QT_CMAKEDIR%%/Qt5PrintSupport/Qt5PrintSupportConfig.cmake diff --git a/textproc/qt5-xml/Makefile b/textproc/qt5-xml/Makefile index 353289b12cf5..d4c33bdcb21a 100644 --- a/textproc/qt5-xml/Makefile +++ b/textproc/qt5-xml/Makefile @@ -17,4 +17,10 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} +post-configure: +.for d in src/xml + ${MKDIR} ${WRKSRC}/${d} + cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} +.endfor + .include diff --git a/textproc/qt5-xml/pkg-plist b/textproc/qt5-xml/pkg-plist index 01c203e99dce..cc554fd05be0 100644 --- a/textproc/qt5-xml/pkg-plist +++ b/textproc/qt5-xml/pkg-plist @@ -1,3 +1,4 @@ +%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qtxml-config_p.h %%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qxml_p.h %%QT_INCDIR%%/QtXml/QDomAttr %%QT_INCDIR%%/QtXml/QDomCDATASection @@ -34,6 +35,7 @@ %%QT_INCDIR%%/QtXml/QtXmlDepends %%QT_INCDIR%%/QtXml/QtXmlVersion %%QT_INCDIR%%/QtXml/qdom.h +%%QT_INCDIR%%/QtXml/qtxml-config.h %%QT_INCDIR%%/QtXml/qtxmlglobal.h %%QT_INCDIR%%/QtXml/qtxmlversion.h %%QT_INCDIR%%/QtXml/qxml.h diff --git a/textproc/qt5-xmlpatterns/Makefile b/textproc/qt5-xmlpatterns/Makefile index a18bf4cf9cd8..a28f70b7e3fb 100644 --- a/textproc/qt5-xmlpatterns/Makefile +++ b/textproc/qt5-xmlpatterns/Makefile @@ -12,7 +12,7 @@ BROKEN_powerpc64= Does not build USE_QT5= core network buildtools_build QT_DIST= ${PORTNAME} -USES= qmake +USES= qmake:norecursive USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} .include diff --git a/textproc/qt5-xmlpatterns/pkg-plist b/textproc/qt5-xmlpatterns/pkg-plist index 640bf086f872..4260c461e899 100644 --- a/textproc/qt5-xmlpatterns/pkg-plist +++ b/textproc/qt5-xmlpatterns/pkg-plist @@ -279,6 +279,7 @@ %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtreatas_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtriplecontainer_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtruthpredicate_p.h +%%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtxmlpatterns-config_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtypeavailablefn_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qtypechecker_p.h %%QT_INCDIR%%/QtXmlPatterns/%%FULLVER%%/QtXmlPatterns/private/qunaryexpression_p.h @@ -391,6 +392,7 @@ %%QT_INCDIR%%/QtXmlPatterns/qabstractxmlreceiver.h %%QT_INCDIR%%/QtXmlPatterns/qsimplexmlnodemodel.h %%QT_INCDIR%%/QtXmlPatterns/qsourcelocation.h +%%QT_INCDIR%%/QtXmlPatterns/qtxmlpatterns-config.h %%QT_INCDIR%%/QtXmlPatterns/qtxmlpatternsglobal.h %%QT_INCDIR%%/QtXmlPatterns/qtxmlpatternsversion.h %%QT_INCDIR%%/QtXmlPatterns/qxmlformatter.h diff --git a/www/qt5-webchannel/Makefile b/www/qt5-webchannel/Makefile index 509638852c50..36c585463b29 100644 --- a/www/qt5-webchannel/Makefile +++ b/www/qt5-webchannel/Makefile @@ -10,7 +10,11 @@ COMMENT= Qt 5 library for integration of C++/QML with HTML/js clients USE_QT5= buildtools_build core qml quick QT_DIST= ${PORTNAME} -USES= qmake +USES= qmake:norecursive USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} +# The default EXTRACT_AFTER_ARGS value excludes examples/ from the extracted +# tarball, which we need during the build. +EXTRACT_AFTER_ARGS= # empty + .include diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile index 8cab5258d7b8..9116d942ffa3 100644 --- a/www/qt5-webengine/Makefile +++ b/www/qt5-webengine/Makefile @@ -16,7 +16,6 @@ PORTNAME= webengine DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -27,17 +26,19 @@ BUILD_DEPENDS= bison:devel/bison \ ninja:devel/ninja \ yasm:devel/yasm \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat -LIB_DEPENDS= libdbus-1.so:devel/dbus \ +LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ + libdbus-1.so:devel/dbus \ libevent.so:devel/libevent \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz \ libjsoncpp.so:devel/jsoncpp \ libnspr4.so:devel/nspr \ libnss3.so:security/nss \ libopus.so:audio/opus \ libpci.so:devel/libpci \ libpng.so:graphics/png \ - libprotobuf.so:devel/protobuf \ + libre2.so:devel/re2 \ libsnappy.so:archivers/snappy \ libsrtp.so:net/libsrtp \ libwebp.so:graphics/webp @@ -56,26 +57,41 @@ PULSEAUDIO_QMAKE_ON= QT_CONFIG+=pulseaudio # We pass `norecursive' to USES=qmake because src/plugins/plugins.pro checks # whether webenginewidgets is available, which fails when qmake processes all # .pro files at once. -USES= gperf jpeg python:2,build pkgconfig \ +USES= gperf jpeg python:2.7,build pkgconfig \ qmake:norecursive,outsource shebangfix USE_GNOME= glib20 libxml2 libxslt USE_QT5= core designer gui location network qml quick webchannel \ widgets buildtools_build qmake_build -USE_XORG= scrnsaverproto x11 xcomposite xcursor xext xi xproto \ +USE_XORG= scrnsaverproto x11 xcb xcomposite xcursor xext xi xproto \ xrandr xrender xscrnsaver xtst USE_LDCONFIG= ${QT_LIBDIR} QT_DIST= ${PORTNAME} -QMAKE_ARGS= WEBENGINE_CONFIG+=use_nss \ - WEBENGINE_CONFIG+=use_proprietary_codecs \ - WEBENGINE_CONFIG+=use_system_libevent +QMAKE_CONFIGURE_ARGS= -no-printing-and-pdf -proprietary-codecs -system-ffmpeg # We could just set it to an empty string as well. "all" does not account for # dependencies correctly in the generated Makefiles, use the right target here. ALL_TARGET= first +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10 + +BUILD_DEPENDS+= clang50:devel/llvm50 +CC= clang50 +CXX= clang++50 +.endif # ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 + +# We need ar(1) from ports because the Chromium code uses the @file syntax. +# We then need to ensure ld(1) from ports is used because of the archives ar(1) +# generated. +USE_BINUTILS= yes +CC+= "-B${LOCALBASE}/bin" +CXX+= "-B${LOCALBASE}/bin" + # The build system reads the environment variable $NINJA_PATH to decide whether # to boostrap ninja or not (and also to invoke it afterwards). CC and CXX are # read by some Chromium code to determine which compiler to invoke when running @@ -84,29 +100,23 @@ ALL_TARGET= first # MAKE_ENV because part of the configuration process happens during the build. CONFIGURE_ENV+= NINJAFLAGS="-j${MAKE_JOBS_NUMBER}" \ NINJA_PATH="${LOCALBASE}/bin/ninja" \ - PATH=${CONFIGURE_WRKSRC}/bin:${PATH} -MAKE_ENV+= CC="${CC}" CXX="${CXX}" ${CONFIGURE_ENV} + PATH=${CONFIGURE_WRKSRC}/bin:${LOCALBASE}/bin:${PATH} +MAKE_ENV+= CC="${CC}" CXX="${CXX}" \ + C_INCLUDE_PATH=${LOCALBASE}/include \ + CPLUS_INCLUDE_PATH=${LOCALBASE}/include \ + ${CONFIGURE_ENV} post-extract: # Install FreeBSD's freebsd.pri file. ${CP} ${FILESDIR}/freebsd.pri ${WRKSRC}/src/core/config/freebsd.pri -# Unbundle libusb. - ${RM} -r ${WRKSRC}/src/3rdparty/chromium/third_party/libusb/src - ${CP} ${WRKSRC}/src/3rdparty/chromium/build/linux/unbundle/libusb.gyp \ - ${WRKSRC}/src/3rdparty/chromium/third_party/libusb/libusb.gyp -# Unbundle libxml. - ${CP} ${WRKSRC}/src/3rdparty/chromium/build/linux/unbundle/libxml.gyp \ - ${WRKSRC}/src/3rdparty/chromium/third_party/libxml/libxml.gyp - -post-patch: -# Too many occurrences to keep in a patch in files/. - ${REINPLACE_CMD} -e 's,OS == "linux",(OS == "linux" or OS == "freebsd"),g' \ - ${WRKSRC}/src/3rdparty/chromium/third_party/ffmpeg/ffmpeg_generated.gypi pre-configure: -# Link in ${PYTHON_CMD} to ${CONFIGURE_WRKSRC}/bin -- the scripts hardcode 'python' +# Link in ${PYTHON_CMD} to ${CONFIGURE_WRKSRC}/bin -- the scripts hardcode 'python' # in too many places to reasonably patch. So just link in ${PYTHON_CMD} to work around # $LOCALBASE/bin/python being python3 if the default versions is set to 3.x. ${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python +# Unbundle a few dependencies. + ${PYTHON_CMD} ${WRKSRC}/src/3rdparty/chromium/build/linux/unbundle/replace_gn_files.py \ + --system-libraries libwebp libxml libxslt yasm -.include +.include diff --git a/www/qt5-webengine/files/extra-patch-10 b/www/qt5-webengine/files/extra-patch-10 new file mode 100644 index 000000000000..e3b99ae8aed1 --- /dev/null +++ b/www/qt5-webengine/files/extra-patch-10 @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/skia/src/core/SkSmallAllocator.h.orig 2017-02-01 20:16:14.715097000 +0100 ++++ src/3rdparty/chromium/third_party/skia/src/core/SkSmallAllocator.h 2017-02-01 20:24:56.680605000 +0100 +@@ -20,7 +20,7 @@ + // abstract type. The complication with max_align_t is that it is defined differently for + // different builds. + namespace { +-#if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_MAC) ++#if defined(SK_BUILD_FOR_WIN32) || defined(SK_BUILD_FOR_MAC) || defined(__FreeBSD__) + // Use std::max_align_t for compiles that follow the standard. + #include + using SystemAlignment = std::max_align_t; diff --git a/www/qt5-webengine/files/freebsd.pri b/www/qt5-webengine/files/freebsd.pri index 802c267de92f..47e99151af5f 100644 --- a/www/qt5-webengine/files/freebsd.pri +++ b/www/qt5-webengine/files/freebsd.pri @@ -1,16 +1,15 @@ include(desktop_linux.pri) -GYP_CONFIG += disable_nacl=1 \ - enable_basic_printing=0 \ - enable_printing=0 \ - enable_webrtc=0 \ - enable_hidpi=1 \ - use_dbus=1 \ - use_pulseaudio=0 +gn_args += disable_nacl=true \ + enable_basic_printing=false \ + enable_webrtc=false \ + enable_hidpi=true \ + use_dbus=true \ + use_pulseaudio=false # Once the port works better, we can think about readding the diverse `use_system_` # for bundled libraries. # For now, only add very few system libraries. -GYP_CONFIG += use_system_yasm=1 \ - use_system_libusb=1 \ - use_system_libcxx=1 +gn_args += use_system_yasm=true \ + use_system_libusb=true \ + use_system_libcxx=true diff --git a/www/qt5-webengine/files/patch-clang b/www/qt5-webengine/files/patch-clang new file mode 100644 index 000000000000..fd14b848faf1 --- /dev/null +++ b/www/qt5-webengine/files/patch-clang @@ -0,0 +1,143 @@ +--- src/3rdparty/chromium/base/strings/safe_sprintf_unittest.cc.orig 2016-10-06 04:02:08.000000000 +0300 ++++ src/3rdparty/chromium/base/strings/safe_sprintf_unittest.cc 2016-10-25 21:42:28.951114000 +0300 +@@ -728,6 +728,7 @@ + } + + TEST(SafeSPrintfTest, EmitNULL) { ++/* Avoid compiler error: http://pastebin.com/1edWUE84 + char buf[40]; + #if defined(__GNUC__) + #pragma GCC diagnostic push +@@ -739,6 +740,7 @@ + EXPECT_EQ("0x0", std::string(buf)); + EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL)); + EXPECT_EQ("", std::string(buf)); ++*/ + #if defined(__GCC__) + #pragma GCC diagnostic pop + #endif +--- src/3rdparty/chromium/base/threading/thread_local_storage_unittest.cc 2015-04-15 00:18:48.000000000 +0200 ++++ src/3rdparty/chromium/base/threading/thread_local_storage_unittest.cc 2015-04-18 21:45:40.000000000 +0200 +@@ -60,7 +60,7 @@ + void ThreadLocalStorageCleanup(void *value) { + int *ptr = reinterpret_cast(value); + // Destructors should never be called with a NULL. +- ASSERT_NE(reinterpret_cast(NULL), ptr); ++ ASSERT_NE(static_cast(NULL), ptr); + if (*ptr == kFinalTlsValue) + return; // We've been called enough times. + ASSERT_LT(kFinalTlsValue, *ptr); +--- src/3rdparty/chromium/base/tracked_objects.cc 2015-04-15 00:31:20.000000000 +0200 ++++ src/3rdparty/chromium/base/tracked_objects.cc 2015-04-18 21:57:33.000000000 +0200 +@@ -425,7 +425,7 @@ + } + // We must NOT do any allocations during this callback. + // Using the simple linked lists avoids all allocations. +- DCHECK_EQ(this->next_retired_worker_, reinterpret_cast(NULL)); ++ DCHECK_EQ(this->next_retired_worker_, static_cast(NULL)); + this->next_retired_worker_ = first_retired_worker_; + first_retired_worker_ = this; + } +--- src/3rdparty/chromium/base/tracked_objects_unittest.cc.orig 2015-08-22 15:01:51.000000000 -0400 ++++ src/3rdparty/chromium/base/tracked_objects_unittest.cc 2015-09-03 09:20:53.370191000 -0400 +@@ -58,9 +58,9 @@ + Births* birth = ThreadData::TallyABirthIfActive(location); + + if (ThreadData::status() == ThreadData::DEACTIVATED) +- EXPECT_EQ(reinterpret_cast(NULL), birth); ++ EXPECT_EQ(static_cast(NULL), birth); + else +- EXPECT_NE(reinterpret_cast(NULL), birth); ++ EXPECT_NE(static_cast(NULL), birth); + } + + // Helper function to verify the most common test expectations. +--- src/3rdparty/chromium/media/audio/audio_output_proxy_unittest.cc 2015-04-15 00:18:55.000000000 +0200 ++++ src/3rdparty/chromium/media/audio/audio_output_proxy_unittest.cc 2015-04-18 22:02:38.000000000 +0200 +@@ -387,7 +387,7 @@ + // |stream| is closed at this point. Start() should reopen it again. + EXPECT_CALL(manager(), MakeAudioOutputStream(_, _)) + .Times(2) +- .WillRepeatedly(Return(reinterpret_cast(NULL))); ++ .WillRepeatedly(Return(static_cast(NULL))); + + EXPECT_CALL(callback_, OnError(_)) + .Times(2); +--- src/3rdparty/chromium/third_party/hunspell/src/hunspell/affentry.hxx.orig 2015-07-21 18:46:37.322427000 -0400 ++++ src/3rdparty/chromium/third_party/hunspell/src/hunspell/affentry.hxx 2015-07-21 18:48:02.034251000 -0400 +@@ -27,7 +27,7 @@ + struct hentry * checkword(const char * word, int len, char in_compound, + const FLAG needflag = FLAG_NULL); + +- struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = NULL); ++ struct hentry * check_twosfx(const char * word, int len, char in_compound, const FLAG needflag = 0); + + char * check_morph(const char * word, int len, char in_compound, + const FLAG needflag = FLAG_NULL); +@@ -90,7 +90,7 @@ + // const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, char in_compound=IN_CPD_NOT); + const FLAG cclass = FLAG_NULL, const FLAG needflag = FLAG_NULL, const FLAG badflag = 0); + +- struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = NULL); ++ struct hentry * check_twosfx(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = 0); + + char * check_twosfx_morph(const char * word, int len, int optflags, + PfxEntry* ppfx, const FLAG needflag = FLAG_NULL); +--- src/3rdparty/chromium/third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-15 00:31:48.000000000 +0200 ++++ src/3rdparty/chromium/third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-18 22:05:41.000000000 +0200 +@@ -439,7 +439,7 @@ + } + + CMapTable::CMapFormat0::Builder::Builder(const CMapId& cmap_id) +- : CMap::Builder(reinterpret_cast(NULL), ++ : CMap::Builder(static_cast(NULL), + CMapFormat::kFormat0, + cmap_id) { + } +@@ -563,7 +563,7 @@ + : CMapTable::CMap::Builder(data ? down_cast( + data->Slice(offset, data->ReadUShort( + offset + Offset::kFormat0Length))) +- : reinterpret_cast(NULL), ++ : static_cast(NULL), + CMapFormat::kFormat2, cmap_id) { + // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. + } +@@ -574,7 +574,7 @@ + : CMapTable::CMap::Builder(data ? down_cast( + data->Slice(offset, data->ReadUShort( + offset + Offset::kFormat0Length))) +- : reinterpret_cast(NULL), ++ : static_cast(NULL), + CMapFormat::kFormat2, cmap_id) { + // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. + } +@@ -958,7 +958,7 @@ + CMapTable::CMapFormat4::Builder::Builder(SegmentList* segments, + IntegerList* glyph_id_array, + const CMapId& cmap_id) +- : CMap::Builder(reinterpret_cast(NULL), ++ : CMap::Builder(static_cast(NULL), + CMapFormat::kFormat4, cmap_id), + segments_(segments->begin(), segments->end()), + glyph_id_array_(glyph_id_array->begin(), glyph_id_array->end()) { +@@ -966,7 +966,7 @@ + } + + CMapTable::CMapFormat4::Builder::Builder(const CMapId& cmap_id) +- : CMap::Builder(reinterpret_cast(NULL), ++ : CMap::Builder(static_cast(NULL), + CMapFormat::kFormat4, cmap_id) { + } + +--- src/3rdparty/chromium/third_party/webrtc/base/taskrunner.cc 2015-04-15 00:32:17.000000000 +0200 ++++ src/3rdparty/chromium/third_party/webrtc/base/taskrunner.cc 2015-04-18 22:10:53.000000000 +0200 +@@ -102,7 +102,7 @@ + std::vector::iterator it; + it = std::remove(tasks_.begin(), + tasks_.end(), +- reinterpret_cast(NULL)); ++ static_cast(NULL)); + + tasks_.erase(it, tasks_.end()); + diff --git a/www/qt5-webengine/files/patch-config.tests-enable-on-FreeBSD b/www/qt5-webengine/files/patch-config.tests-enable-on-FreeBSD new file mode 100644 index 000000000000..c99904ce254d --- /dev/null +++ b/www/qt5-webengine/files/patch-config.tests-enable-on-FreeBSD @@ -0,0 +1,15 @@ +--- config.tests/khr/khr.pro.orig 2017-04-19 08:32:39 UTC ++++ config.tests/khr/khr.pro +@@ -3,4 +3,4 @@ + + CONFIG-=qt + +-linux:SOURCES += khr.cpp ++SOURCES += khr.cpp +--- config.tests/snappy/snappy.pro.orig 2017-04-11 14:08:45 UTC ++++ config.tests/snappy/snappy.pro +@@ -1,3 +1,3 @@ +-linux:SOURCES += snappy.cpp ++SOURCES += snappy.cpp + LIBS += -lsnappy + CONFIG -= qt diff --git a/www/qt5-webengine/files/patch-mkspecs_features_configure.prf b/www/qt5-webengine/files/patch-mkspecs_features_configure.prf new file mode 100644 index 000000000000..49135856f2e3 --- /dev/null +++ b/www/qt5-webengine/files/patch-mkspecs_features_configure.prf @@ -0,0 +1,20 @@ +--- mkspecs/features/configure.prf.orig 2017-04-19 08:37:44 UTC ++++ mkspecs/features/configure.prf +@@ -4,7 +4,7 @@ load(functions) + + defineTest(runConfigure) { + webengine_successfully_configured: return(true) +- linux:contains(QT_CONFIG,no-pkg-config) { ++ unix:contains(QT_CONFIG,no-pkg-config) { + skipBuild("pkg-config is required") + return(false) + } +@@ -53,7 +53,7 @@ defineTest(runConfigure) { + qtConfig(embedded): WEBENGINE_CONFIG += reduce_binary_size + } + +- linux { ++ unix { + QT_FOR_CONFIG += gui-private + !config_khr:skipBuild("khronos development headers appear to be missing (mesa/libegl1-mesa-dev)") + diff --git a/www/qt5-webengine/files/patch-mkspecs_features_functions.prf b/www/qt5-webengine/files/patch-mkspecs_features_functions.prf new file mode 100644 index 000000000000..4d90ed26a999 --- /dev/null +++ b/www/qt5-webengine/files/patch-mkspecs_features_functions.prf @@ -0,0 +1,30 @@ +Include the freebsd.pri file provided by the port, to pass FreeBSD specific +settings to gn. + +--- mkspecs/features/functions.prf.orig ++++ mkspecs/features/functions.prf +@@ -15,7 +15,7 @@ + + defineTest(isPlatformSupported) { + QT_FOR_CONFIG += gui-private +- linux { ++ unix { + if(!gcc:!clang)|intel_icc { + skipBuild("Qt WebEngine on Linux requires clang or GCC.") + return(false) +@@ -367,6 +367,7 @@ + } + macos: include($$QTWEBENGINE_ROOT/src/core/config/mac_osx.pri) + win32: include($$QTWEBENGINE_ROOT/src/core/config/windows.pri) ++ freebsd: include($$QTWEBENGINE_ROOT/src/core/config/freebsd.pri) + isEmpty(gn_args): error(No gn_args found please make sure you have valid configuration.) + return($$gn_args) + } +@@ -386,6 +387,7 @@ + macos: return(mac) + win32: return(win) + linux: return(linux) ++ freebsd: return(bsd) + error(Unsupported platform) + return(unknown) + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_BUILD.gn new file mode 100644 index 000000000000..c42f6f00274c --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_BUILD.gn @@ -0,0 +1,174 @@ +--- src/3rdparty/chromium/BUILD.gn.orig 2017-06-20 05:10:02.000000000 -0400 ++++ src/3rdparty/chromium/BUILD.gn 2017-12-15 16:23:27.924636000 -0500 +@@ -218,7 +218,7 @@ + ] + } + +- if (!is_ios && !is_android && !is_chromecast) { ++ if (!is_ios && !is_android && !is_bsd && !is_chromecast) { + deps += [ + "//chrome", + "//chrome/test:browser_tests", +@@ -286,7 +286,7 @@ + } + } + +- if (!is_ios) { ++ if (!is_ios && !is_bsd) { + # TODO(GYP): Figure out which of these should actually build on iOS, + # and whether there should be other targets that are iOS-only and missing. + deps += [ +@@ -336,7 +336,7 @@ + "//third_party/catapult/telemetry:bitmaptools($host_toolchain)", + ] + } +- } else { ++ } else if (!is_bsd) { + deps += [ "//ios:all" ] + } + +@@ -504,18 +504,23 @@ + ] + } + +- if (is_linux) { +- # The following are definitely linux-only. ++ if (is_linux || is_bsd) { ++ # The following are definitely? linux-only. + deps += [ + "//chrome:manpage", + "//chrome:xdg_mime", + "//net:disk_cache_memory_test", + "//net:quic_client", + "//net:quic_server", +- "//sandbox/linux:chrome_sandbox", +- "//sandbox/linux:sandbox_linux_unittests", + ] + ++ if (is_linux) { ++ deps += [ ++ "//sandbox/linux:chrome_sandbox", ++ "//sandbox/linux:sandbox_linux_unittests", ++ ] ++ } ++ + if (use_dbus) { + deps += [ + "//dbus:dbus_test_server", +@@ -533,7 +538,7 @@ + } + } + +- if (is_ios || is_win || (is_linux && !is_chromeos)) { ++ if (is_ios || is_win || is_bsd || (is_linux && !is_chromeos)) { + deps += [ + "//base:base_i18n_perftests", + "//base:base_perftests", +@@ -612,7 +617,7 @@ + if (enable_nacl) { + deps += [ "//components/nacl/loader:nacl_loader_unittests" ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + # TODO(dpranke): Figure out what platforms should actually have this. + deps += [ "//components/nacl/loader:nacl_helper" ] + +@@ -722,7 +727,7 @@ + deps += + [ "//chrome/installer/mini_installer:next_version_mini_installer" ] + } +- } else if (!is_android && !is_ios) { ++ } else if (!is_android && !is_ios && !is_bsd) { + deps += [ "//breakpad:symupload($host_toolchain)" ] + } + +@@ -787,7 +792,7 @@ + } + } + +- if (is_linux && !is_chromeos && !is_chromecast) { ++ if ((is_linux || is_bsd) && !is_chromeos && !is_chromecast) { + # TODO(GYP): Figure out if any of these should be in gn_all + # and figure out how cross-platform they are + deps += [ +@@ -840,7 +845,7 @@ + ] + + if (target_cpu == "x86" || target_cpu == "x64") { +- if (!is_android) { ++ if (!is_android && !is_bsd) { + deps += [ "//chrome/test:load_library_perf_tests" ] + if (use_qt) { + deps -= [ "//chrome/test:load_library_perf_tests" ] +@@ -851,7 +856,7 @@ + "//third_party/libjpeg_turbo:simd_asm", + ] + } +- if (is_linux && current_toolchain == host_toolchain) { ++ if ((is_linux || is_bsd) && current_toolchain == host_toolchain) { + deps += [ "//v8:v8_shell" ] + } + } +@@ -861,7 +866,7 @@ + } + + if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) || +- (use_libfuzzer && is_mac)) { ++ (use_libfuzzer && is_mac) || is_bsd) { + deps += [ + "//testing/libfuzzer/fuzzers", + "//testing/libfuzzer/tests:libfuzzer_tests", +@@ -904,7 +909,7 @@ + + group("gn_mojo_targets") { + testonly = true +- if (is_linux && !is_chromeos) { ++ if (is_bsd || (is_linux && !is_chromeos)) { + # TODO(GYP): Figure out if any of these should be in gn_all + # and figure out how cross-platform they are + deps = [ +@@ -930,7 +935,7 @@ + } + } + +-if (!is_ios) { ++if (!is_ios || !is_bsd) { + # This group includes all of the targets needed to build and test Blink, + # including running the layout tests (see below). + group("blink_tests") { +@@ -976,7 +981,7 @@ + data_deps += [ "//content/shell:content_shell_crash_service" ] + } + +- if (!is_win && !is_android) { ++ if (!is_win && !is_android && !is_bsd) { + data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] + } + +@@ -984,7 +989,7 @@ + data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] + } + +- if (is_linux) { ++ if (is_linux && !is_bsd) { + data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] + } + +@@ -1006,7 +1011,7 @@ + group("chromium_builder_perf") { + testonly = true + +- if (!is_ios && !is_android && !is_chromecast) { ++ if (!is_ios && !is_android && !is_chromecast && !is_bsd) { + data_deps = [ + "//cc:cc_perftests", + "//chrome/test:load_library_perf_tests", +@@ -1043,7 +1048,7 @@ + "//chrome/installer/mini_installer:mini_installer", + "//chrome/test:angle_perftests", + ] +- } else { ++ } else if (!is_bsd) { + data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] + } + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn new file mode 100644 index 000000000000..04f3a1b42422 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_BUILD.gn @@ -0,0 +1,83 @@ +--- src/3rdparty/chromium/base/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/BUILD.gn +@@ -1076,6 +1076,35 @@ component("base") { + public_deps += [ "//base/allocator:unified_allocator_shim" ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "files/file_util_linux.cc", ++ "files/file_path_watcher_linux.cc", ++ "process/process_linux.cc", ++ "process/process_iterator_linux.cc", ++ "process/process_metrics_linux.cc", ++ "process/process_handle_linux.cc", ++ "sys_info_linux.cc", ++ "trace_event/malloc_dump_provider.cc", ++ "trace_event/malloc_dump_provider.h", ++ "debug/proc_maps_linux.cc", ++ "debug/proc_maps_linux.h", ++ ] ++ sources += [ ++ "files/file_path_watcher_stub.cc", ++ "process/process_handle_freebsd.cc", ++ "process/process_iterator_freebsd.cc", ++ "process/process_metrics_freebsd.cc", ++ "sys_info_freebsd.cc", ++ ] ++ libs = [ ++ "execinfo", # logging.cc ++ "kvm" # process_metrics_freebsd ++ ] ++ } ++ ++ ++ + # Allow more direct string conversions on platforms with native utf8 + # strings + if (is_mac || is_ios || is_chromeos || is_chromecast) { +@@ -1347,7 +1376,7 @@ component("base") { + } + + # Linux. +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (is_asan || is_lsan || is_msan || is_tsan) { + # For llvm-sanitizer. + data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ] +@@ -1372,7 +1401,7 @@ component("base") { + "//base/third_party/xdg_user_dirs", + ] + } else { +- # Non-Linux. ++ # Non-Linux/BSD. + sources -= [ + "nix/mime_util_xdg.cc", + "nix/mime_util_xdg.h", +@@ -1388,6 +1417,13 @@ component("base") { + } + } + ++ if (is_bsd) { ++ sources -= [ ++ "threading/platform_thread_linux.cc", ++ ] ++ sources += [ "threading/platform_thread_freebsd.cc" ] ++ } ++ + # iOS + if (is_ios) { + set_sources_assignment_filter([]) +@@ -2154,6 +2190,12 @@ test("base_unittests") { + set_sources_assignment_filter(sources_assignment_filter) + } + ++ if (is_bsd) { ++ sources -= [ ++ "debug/proc_maps_linux_unittest.cc", ++ ] ++ } ++ + if (is_win) { + deps += [ "//base:scoped_handle_test_dll" ] + if (current_cpu == "x64") { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base__trace_event__process_memory_dump.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base__trace_event__process_memory_dump.h new file mode 100644 index 000000000000..055fd8ee50d5 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base__trace_event__process_memory_dump.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/trace_event/process_memory_dump.h.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/trace_event/process_memory_dump.h +@@ -24,7 +24,7 @@ + + // Define COUNT_RESIDENT_BYTES_SUPPORTED if platform supports counting of the + // resident memory. +-#if (defined(OS_POSIX) && !defined(OS_NACL)) || defined(OS_WIN) ++#if (defined(OS_POSIX) && !defined(OS_NACL) && !defined(OS_BSD)) || defined(OS_WIN) + #define COUNT_RESIDENT_BYTES_SUPPORTED + #endif + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_BUILD.gn new file mode 100644 index 000000000000..bc82fa249294 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_BUILD.gn @@ -0,0 +1,12 @@ +--- src/3rdparty/chromium/base/allocator/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/allocator/BUILD.gn +@@ -338,6 +338,9 @@ if (use_experimental_allocator_shim) { + ] + } else if (is_linux && use_allocator == "none") { + sources += [ "allocator_shim_default_dispatch_to_glibc.cc" ] ++ } else if (is_bsd && use_allocator == "none") { ++ # TODO move the code to allocator_shim_default_dispatch_to_libc.cc" ++ sources += [ "allocator_shim_default_dispatch_to_glibc.cc" ] + } else if (is_android && use_allocator == "none") { + sources += [ + "allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_allocator__shim__default__dispatch__to__glibc.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_allocator__shim__default__dispatch__to__glibc.cc new file mode 100644 index 000000000000..3b814ad77151 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_allocator__shim__default__dispatch__to__glibc.cc @@ -0,0 +1,68 @@ +--- src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc +@@ -3,19 +3,28 @@ + // found in the LICENSE file. + + #include "base/allocator/allocator_shim.h" +- +-#include ++#include ++#include ++#include + + // This translation unit defines a default dispatch for the allocator shim which + // routes allocations to libc functions. +-// The code here is strongly inspired from tcmalloc's libc_override_glibc.h. ++// The code here is strongly inspired from tcmalloc's override_glibc.h. + + extern "C" { +-void* __libc_malloc(size_t size); +-void* __libc_calloc(size_t n, size_t size); +-void* __libc_realloc(void* address, size_t size); +-void* __libc_memalign(size_t alignment, size_t size); +-void __libc_free(void* ptr); ++void* __malloc(size_t size); ++void* __calloc(size_t n, size_t size); ++void* __realloc(void* address, size_t size); ++void* __memalign(size_t alignment, size_t size) { ++ void *ret; ++ if (__posix_memalign(&ret, alignment, size) != 0) { ++ return nullptr; ++ } else { ++ return ret; ++ } ++} ++int __posix_memalign(void **ptr, size_t alignment, size_t size); ++void __free(void* ptr); + } // extern "C" + + namespace { +@@ -23,23 +32,23 @@ namespace { + using base::allocator::AllocatorDispatch; + + void* GlibcMalloc(const AllocatorDispatch*, size_t size) { +- return __libc_malloc(size); ++ return __malloc(size); + } + + void* GlibcCalloc(const AllocatorDispatch*, size_t n, size_t size) { +- return __libc_calloc(n, size); ++ return __calloc(n, size); + } + + void* GlibcRealloc(const AllocatorDispatch*, void* address, size_t size) { +- return __libc_realloc(address, size); ++ return __realloc(address, size); + } + + void* GlibcMemalign(const AllocatorDispatch*, size_t alignment, size_t size) { +- return __libc_memalign(alignment, size); ++ return __memalign(alignment, size); + } + + void GlibcFree(const AllocatorDispatch*, void* address) { +- __libc_free(address); ++ __free(address); + } + + size_t GlibcGetSizeEstimate(const AllocatorDispatch*, void* address) { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_allocator__shim__override__libc__symbols.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_allocator__shim__override__libc__symbols.h new file mode 100644 index 000000000000..026e59d91640 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_allocator__shim__override__libc__symbols.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/allocator/allocator_shim_override_libc_symbols.h.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/allocator/allocator_shim_override_libc_symbols.h +@@ -10,7 +10,7 @@ + #endif + #define BASE_ALLOCATOR_ALLOCATOR_SHIM_OVERRIDE_LIBC_SYMBOLS_H_ + +-#include ++#include + + #include "base/allocator/allocator_shim_internals.h" + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_allocator__shim__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_allocator__shim__unittest.cc new file mode 100644 index 000000000000..1d1837d39756 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_allocator__shim__unittest.cc @@ -0,0 +1,61 @@ +--- src/3rdparty/chromium/base/allocator/allocator_shim_unittest.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/allocator/allocator_shim_unittest.cc +@@ -4,7 +4,6 @@ + + #include "base/allocator/allocator_shim.h" + +-#include + #include + #include + +@@ -193,11 +192,13 @@ TEST_F(AllocatorShimTest, InterceptLibcS + ASSERT_GE(zero_allocs_intercepted_by_size[2 * 23], 1u); + + #if !defined(OS_WIN) ++#if !defined(OS_BSD) + void* memalign_ptr = memalign(128, 53); + ASSERT_NE(nullptr, memalign_ptr); + ASSERT_EQ(0u, reinterpret_cast(memalign_ptr) % 128); + ASSERT_GE(aligned_allocs_intercepted_by_alignment[128], 1u); + ASSERT_GE(aligned_allocs_intercepted_by_size[53], 1u); ++#endif + + void* posix_memalign_ptr = nullptr; + int res = posix_memalign(&posix_memalign_ptr, 256, 59); +@@ -214,12 +215,14 @@ TEST_F(AllocatorShimTest, InterceptLibcS + ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u); + ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u); + ++#if !defined(OS_BSD) + void* pvalloc_ptr = pvalloc(67); + ASSERT_NE(nullptr, pvalloc_ptr); + ASSERT_EQ(0u, reinterpret_cast(pvalloc_ptr) % kPageSize); + ASSERT_GE(aligned_allocs_intercepted_by_alignment[kPageSize], 1u); + // pvalloc rounds the size up to the next page. + ASSERT_GE(aligned_allocs_intercepted_by_size[kPageSize], 1u); ++#endif + #endif // OS_WIN + + char* realloc_ptr = static_cast(realloc(nullptr, 71)); +@@ -240,8 +243,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS + ASSERT_GE(frees_intercepted_by_addr[Hash(zero_alloc_ptr)], 1u); + + #if !defined(OS_WIN) ++#if !defined(OS_BSD) + free(memalign_ptr); + ASSERT_GE(frees_intercepted_by_addr[Hash(memalign_ptr)], 1u); ++#endif + + free(posix_memalign_ptr); + ASSERT_GE(frees_intercepted_by_addr[Hash(posix_memalign_ptr)], 1u); +@@ -249,8 +254,10 @@ TEST_F(AllocatorShimTest, InterceptLibcS + free(valloc_ptr); + ASSERT_GE(frees_intercepted_by_addr[Hash(valloc_ptr)], 1u); + ++#if !defined(OS_BSD) + free(pvalloc_ptr); + ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u); ++#endif + #endif // OS_WIN + + free(realloc_ptr); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_base.gyp b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_base.gyp deleted file mode 100644 index 3efd008c6010..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_base.gyp +++ /dev/null @@ -1,13 +0,0 @@ -Disable USE_SYMBOLIZE, it assumes Linux is being used and does things such as -reading from /proc. ---- src/3rdparty/chromium/base/base.gyp.orig 2017-04-19 16:31:45 UTC -+++ src/3rdparty/chromium/base/base.gyp -@@ -46,7 +46,7 @@ - 'xdg_mime', - ], - 'defines': [ -- 'USE_SYMBOLIZE', -+ # 'USE_SYMBOLIZE', - ], - }, { # desktop_linux == 0 and chromeos == 0 - 'sources/': [ diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_base.gypi b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_base.gypi deleted file mode 100644 index 5e115d1026cf..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_base.gypi +++ /dev/null @@ -1,17 +0,0 @@ ---- src/3rdparty/chromium/base/base.gypi.orig 2016-11-07 14:46:18 UTC -+++ src/3rdparty/chromium/base/base.gypi -@@ -1006,9 +1006,14 @@ - 'process/memory_stubs.cc', - ], - 'sources/': [ -+ ['exclude', '^debug/proc_maps_linux\\.cc$'], -+ ['exclude', '^files/file_path_watcher_fsevents\\.cc$'], - ['exclude', '^files/file_path_watcher_linux\\.cc$'], - ['exclude', '^files/file_path_watcher_stub\\.cc$'], - ['exclude', '^files/file_util_linux\\.cc$'], -+ ['exclude', '^process/memory_linux\\.cc$'], -+ ['exclude', '^process/process_iterator_linux\\.cc$'], -+ ['exclude', '^process/process_metrics_linux\\.cc$'], - ['exclude', '^process/process_linux\\.cc$'], - ['exclude', '^sys_info_linux\\.cc$'], - ], diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_proc__maps__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_proc__maps__linux.cc new file mode 100644 index 000000000000..05b1565e9a6e --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_proc__maps__linux.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/debug/proc_maps_linux.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/debug/proc_maps_linux.cc +@@ -12,7 +12,7 @@ + #include "base/strings/string_split.h" + #include "build/build_config.h" + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_ANDROID) + #include + #endif + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc new file mode 100644 index 000000000000..30b21a7f75da --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc @@ -0,0 +1,21 @@ +--- src/3rdparty/chromium/base/debug/stack_trace_posix.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/debug/stack_trace_posix.cc +@@ -571,6 +571,10 @@ class SandboxSymbolizeHelper { + // for the modules that are loaded in the current process. + // Returns true on success. + bool CacheMemoryRegions() { ++#if defined(OS_FREEBSD) ++ // TODO (rene) avoid link error, implement something? ++ return false; ++#else + // Reads /proc/self/maps. + std::string contents; + if (!ReadProcMaps(&contents)) { +@@ -586,6 +590,7 @@ class SandboxSymbolizeHelper { + + is_initialized_ = true; + return true; ++#endif + } + + // Opens all object files and caches their file descriptors. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_thread__heap__usage__tracker.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_thread__heap__usage__tracker.cc new file mode 100644 index 000000000000..fa9d14086533 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_thread__heap__usage__tracker.cc @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/base/debug/thread_heap_usage_tracker.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/debug/thread_heap_usage_tracker.cc +@@ -14,11 +14,13 @@ + #include "base/threading/thread_local_storage.h" + #include "build/build_config.h" + ++#if !defined(OS_BSD) + #if defined(OS_MACOSX) || defined(OS_IOS) + #include + #else + #include + #endif ++#endif + + namespace base { + namespace debug { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__unittest.cc new file mode 100644 index 000000000000..06ca6bdf24be --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__unittest.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/files/file_path_unittest.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/files/file_path_unittest.cc +@@ -1133,7 +1133,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_ + "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" }, + }; + +-#if !defined(SYSTEM_NATIVE_UTF8) && defined(OS_LINUX) ++#if !defined(SYSTEM_NATIVE_UTF8) && (defined(OS_LINUX) || defined(OS_BSD)) + ScopedLocale locale("en_US.UTF-8"); + #endif + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.cc deleted file mode 100644 index 901306417a16..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- src/3rdparty/chromium/base/files/file_path_watcher_kqueue.cc.orig 2017-04-19 09:33:16 UTC -+++ src/3rdparty/chromium/base/files/file_path_watcher_kqueue.cc -@@ -388,4 +388,10 @@ void FilePathWatcherKQueue::CancelOnMess - } - } - -+// In the upstream version, this method is implemented in -+// file_path_watcher_mac.cc, which we obviously do not use. -+FilePathWatcher::FilePathWatcher() { -+ impl_ = new FilePathWatcherKQueue(); -+} -+ - } // namespace base diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h index 18e94e0f707e..7e5329dc161c 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h.orig 2017-04-11 14:08:45 UTC +--- src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h.orig 2017-01-26 00:49:07 UTC +++ src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h -@@ -5,6 +5,11 @@ +@@ -5,6 +5,10 @@ #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ #define BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ @@ -8,7 +8,6 @@ +#include +#include +#endif -+ #include - #include + #include diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__util.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__util.h new file mode 100644 index 000000000000..cf50484ca53a --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__util.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/files/file_util.h.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/files/file_util.h +@@ -404,7 +404,7 @@ BASE_EXPORT bool VerifyPathControlledByA + // the directory |path|, in the number of FilePath::CharType, or -1 on failure. + BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Broad categories of file systems as returned by statfs() on Linux. + enum FileSystemType { + FILE_SYSTEM_UNKNOWN, // statfs failed. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc new file mode 100644 index 000000000000..7de1bbda90be --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/base/linux_util.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/linux_util.cc +@@ -110,12 +110,14 @@ char g_linux_distro[kDistroSize] = + "CrOS"; + #elif defined(OS_ANDROID) + "Android"; ++#elif defined(OS_BSD) ++ "BSD"; + #else // if defined(OS_LINUX) + "Unknown"; + #endif + + std::string GetLinuxDistro() { +-#if defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#if defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) + return g_linux_distro; + #elif defined(OS_LINUX) + LinuxDistroHelper* distro_state_singleton = LinuxDistroHelper::GetInstance(); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_native__library__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_native__library__posix.cc new file mode 100644 index 000000000000..26300f479d06 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_native__library__posix.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/native_library_posix.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/native_library_posix.cc +@@ -35,7 +35,7 @@ NativeLibrary LoadNativeLibraryWithOptio + // further investigation, as it might vary across versions. Crash here to + // warn developers that they're trying to rely on uncertain behavior. + CHECK(!options.prefer_own_symbols); +-#else ++#elif !defined(OS_BSD) + if (options.prefer_own_symbols) + flags |= RTLD_DEEPBIND; + #endif diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket__linux.cc index c2941174f235..e2fdb239a2b5 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket__linux.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket__linux.cc @@ -1,10 +1,10 @@ ---- src/3rdparty/chromium/base/posix/unix_domain_socket_linux.cc.orig 2017-04-11 14:08:45 UTC +--- src/3rdparty/chromium/base/posix/unix_domain_socket_linux.cc.orig 2017-01-26 00:49:07 UTC +++ src/3rdparty/chromium/base/posix/unix_domain_socket_linux.cc -@@ -21,6 +21,15 @@ - #include - #endif +@@ -23,6 +23,15 @@ -+#if defined(__FreeBSD__) + namespace base { + ++#if defined(OS_BSD) +// Port over Linux ucred structure +struct ucred { + pid_t pid; // process ID of the sending process @@ -13,29 +13,30 @@ +}; +#endif + - namespace base { - const size_t UnixDomainSocket::kMaxFileDescriptors = 16; -@@ -41,7 +50,13 @@ static bool CreateSocketPair(ScopedFD* one, ScopedFD* + + #if !defined(OS_NACL_NONSFI) +@@ -40,8 +49,14 @@ static bool CreateSocketPair(ScopedFD* o + // static bool UnixDomainSocket::EnableReceiveProcessId(int fd) { - const int enable = 1; -+#if defined(__FreeBSD__) ++#if defined(OS_BSD) + // XXX(rene) do this? : + // taken from dbus, Academic Free License 2.1 / GPL 2+ + return 0; // fake OK +#else + const int enable = 1; return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; +#endif } #endif // !defined(OS_NACL_NONSFI) -@@ -147,7 +162,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -147,7 +162,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFla // The PNaCl toolchain for Non-SFI binary build does not support // SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && -+#if defined(__FreeBSD__) -+ 1) { ++#if defined(OS_BSD) ++ 1) { // XXX(rene) carpet getting full ... +#else cmsg->cmsg_type == SCM_CREDENTIALS) { +#endif diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket__linux__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket__linux__unittest.cc new file mode 100644 index 000000000000..239f6e30b093 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_posix_unix__domain__socket__linux__unittest.cc @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/base/posix/unix_domain_socket_linux_unittest.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/posix/unix_domain_socket_linux_unittest.cc +@@ -2,10 +2,15 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include "build/build_config.h" ++ + #include + #include + #include + #include ++#if defined(OS_BSD) ++#include ++#endif + #include + + #include "base/bind.h" diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_internal__linux.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_internal__linux.h new file mode 100644 index 000000000000..0e323f920b30 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_internal__linux.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/process/internal_linux.h.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/process/internal_linux.h +@@ -14,6 +14,8 @@ + + #include "base/files/file_path.h" + ++#include /* pid_t */ ++ + namespace base { + + class Time; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch.cc new file mode 100644 index 000000000000..cc47b3687b14 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/process/launch.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/process/launch.cc +@@ -15,7 +15,7 @@ LaunchOptions::~LaunchOptions() = defaul + + LaunchOptions LaunchOptionsForTest() { + LaunchOptions options; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // To prevent accidental privilege sharing to an untrusted child, processes + // are started with PR_SET_NO_NEW_PRIVS. Do not set that here, since this + // new child will be used for testing only. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h new file mode 100644 index 000000000000..b7fe49c6dcd4 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/base/process/launch.h.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/process/launch.h +@@ -138,7 +138,7 @@ struct BASE_EXPORT LaunchOptions { + // will be the same as its pid. + bool new_process_group = false; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // If non-zero, start the process using clone(), using flags as provided. + // Unlike in clone, clone_flags may not contain a custom termination signal + // that is sent to the parent when the child dies. The termination signal will +@@ -151,7 +151,7 @@ struct BASE_EXPORT LaunchOptions { + + // Sets parent process death signal to SIGKILL. + bool kill_on_parent_death = false; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_POSIX) + // If not empty, launch the specified executable instead of diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc new file mode 100644 index 000000000000..0700b130bb2b --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_launch__posix.cc @@ -0,0 +1,10 @@ +--- src/3rdparty/chromium/base/process/launch_posix.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/process/launch_posix.cc +@@ -64,6 +64,7 @@ + #include "base/feature_list.h" + #else + extern char** environ; ++#pragma weak environ + #endif + + namespace base { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_memory.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_memory.h new file mode 100644 index 000000000000..80411a33a2a0 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_memory.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/process/memory.h.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/process/memory.h +@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutO + // Crash reporting classifies such crashes as OOM. + BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size); + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_ANDROID) + BASE_EXPORT extern size_t g_oom_size; + + // The maximum allowed value for the OOM score. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_memory__stubs.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_memory__stubs.cc index fb11d976e83c..c555df183d12 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_memory__stubs.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_memory__stubs.cc @@ -1,12 +1,15 @@ -Use the definition in memory.cc instead. ---- src/3rdparty/chromium/base/process/memory_stubs.cc.orig 2017-04-19 16:40:17 UTC +--- src/3rdparty/chromium/base/process/memory_stubs.cc.orig 2017-01-26 00:49:07 UTC +++ src/3rdparty/chromium/base/process/memory_stubs.cc -@@ -32,9 +32,11 @@ bool UncheckedMalloc(size_t size, void** - return *result != nullptr; - } +@@ -31,6 +31,8 @@ void TerminateBecauseOutOfMemory(size_t + // their respective stdlib function since those functions will return null on a + // failure to allocate. -+#if !defined(OS_BSD) - bool UncheckedCalloc(size_t num_items, size_t size, void** result) { ++#if !defined(OS_FREEBSD) ++// FreeBSD brings it's own implementation in memory.cc -- cmt + bool UncheckedMalloc(size_t size, void** result) { + *result = malloc(size); + return *result != nullptr; +@@ -40,5 +42,6 @@ bool UncheckedCalloc(size_t num_items, s *result = calloc(num_items, size); return *result != nullptr; } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_memory__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_memory__unittest.cc new file mode 100644 index 000000000000..f5b0038fab84 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_memory__unittest.cc @@ -0,0 +1,22 @@ +--- src/3rdparty/chromium/base/process/memory_unittest.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/process/memory_unittest.cc +@@ -82,10 +82,10 @@ TEST(MemoryTest, AllocatorShimWorking) { + ASSERT_TRUE(base::allocator::IsAllocatorInitialized()); + } + +-// OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan ++// BSD does not support these tests. Don't test these on ASan/TSan/MSan + // configurations: only test the real allocator. + // Windows only supports these tests with the allocator shim in place. +-#if !defined(OS_OPENBSD) && \ ++#if !defined(OS_BSD) && \ + BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && \ + !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) + +@@ -439,5 +439,5 @@ TEST_F(OutOfMemoryHandledTest, Unchecked + EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_)); + EXPECT_TRUE(value_ == NULL); + } +-#endif // !defined(OS_OPENBSD) && BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && ++#endif // !defined(OS_BSD) && BUILDFLAG(ENABLE_WIN_ALLOCATOR_SHIM_TESTS) && + // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__freebsd.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__freebsd.cc new file mode 100644 index 000000000000..7607476b5ef3 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__handle__freebsd.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/process/process_handle_freebsd.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/process/process_handle_freebsd.cc +@@ -16,7 +16,7 @@ namespace base { + + ProcessId GetParentProcessId(ProcessHandle process) { + struct kinfo_proc info; +- size_t length; ++ size_t length = sizeof(struct kinfo_proc); + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process }; + + if (sysctl(mib, arraysize(mib), &info, &length, NULL, 0) < 0) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__info__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__info__linux.cc new file mode 100644 index 000000000000..640a43eee85f --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__info__linux.cc @@ -0,0 +1,39 @@ +--- src/3rdparty/chromium/base/process/process_info_linux.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/process/process_info_linux.cc +@@ -11,10 +11,28 @@ + #include "base/process/process_handle.h" + #include "base/time/time.h" + ++#if defined(__FreeBSD__) || defined(__DragonFly__) ++#include ++#include ++#include ++#endif ++ + namespace base { + + // static + const Time CurrentProcessInfo::CreationTime() { ++#if defined(__FreeBSD__) || defined(__DragonFly__) ++ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; ++ struct kinfo_proc proc; ++ size_t len = sizeof(struct kinfo_proc); ++ if (sysctl(mib, arraysize(mib), &proc, &len, NULL, 0) < 0) ++ return Time(); ++#if defined(__DragonFly__) ++ return Time::FromTimeVal(proc.kp_start); ++#else ++ return Time::FromTimeVal(proc.ki_start); ++#endif ++#else + ProcessHandle pid = GetCurrentProcessHandle(); + int64_t start_ticks = + internal::ReadProcStatsAndGetFieldAsInt64(pid, internal::VM_STARTTIME); +@@ -23,6 +41,7 @@ const Time CurrentProcessInfo::CreationT + Time boot_time = internal::GetBootTime(); + DCHECK(!boot_time.is_null()); + return Time(boot_time + start_offset); ++#endif + } + + } // namespace base diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__iterator__freebsd.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__iterator__freebsd.cc new file mode 100644 index 000000000000..0cee45aec94c --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__iterator__freebsd.cc @@ -0,0 +1,36 @@ +--- src/3rdparty/chromium/base/process/process_iterator_freebsd.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/process/process_iterator_freebsd.cc +@@ -10,6 +10,10 @@ + #include + #include + ++/* getuid() */ ++#include ++#include ++ + #include "base/logging.h" + #include "base/macros.h" + #include "base/strings/string_split.h" +@@ -72,19 +76,13 @@ bool ProcessIterator::CheckForNextProces + for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) { + size_t length; + struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_]; +- int mib[] = { CTL_KERN, KERN_PROC_ARGS, kinfo.ki_pid }; ++ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, kinfo.ki_pid }; + + if ((kinfo.ki_pid > 0) && (kinfo.ki_stat == SZOMB)) + continue; + +- length = 0; +- if (sysctl(mib, arraysize(mib), NULL, &length, NULL, 0) < 0) { +- LOG(ERROR) << "failed to figure out the buffer size for a command line"; +- continue; +- } +- +- data.resize(length); +- ++ data.resize(ARG_MAX); ++ length = ARG_MAX; + if (sysctl(mib, arraysize(mib), &data[0], &length, NULL, 0) < 0) { + LOG(ERROR) << "failed to fetch a commandline"; + continue; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h new file mode 100644 index 000000000000..7c3fe45f64b5 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics.h @@ -0,0 +1,33 @@ +--- src/3rdparty/chromium/base/process/process_metrics.h.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/process/process_metrics.h +@@ -22,6 +22,12 @@ + #include "base/values.h" + #include "build/build_config.h" + ++#if defined(OS_BSD) ++#include ++#include ++#include ++#endif ++ + #if defined(OS_MACOSX) + #include + #include "base/process/port_provider_mac.h" +@@ -326,13 +332,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys + // CPU-related ticks. Returns -1 on parse error. + // Exposed for testing. + BASE_EXPORT int ParseProcStatCPU(const std::string& input); ++#endif + ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) + // Get the number of threads of |process| as available in /proc//stat. + // This should be used with care as no synchronization with running threads is + // done. This is mostly useful to guarantee being single-threaded. + // Returns 0 on failure. + BASE_EXPORT int GetNumberOfThreads(ProcessHandle process); ++#endif + ++#if defined(OS_LINUX) || defined(OS_ANDROID) + // /proc/self/exe refers to the current executable. + BASE_EXPORT extern const char kProcSelfExe[]; + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc new file mode 100644 index 000000000000..96cd70e5030d --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__metrics__freebsd.cc @@ -0,0 +1,36 @@ +--- src/3rdparty/chromium/base/process/process_metrics_freebsd.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/process/process_metrics_freebsd.cc +@@ -13,6 +13,9 @@ + #include "base/memory/ptr_util.h" + #include "base/sys_info.h" + ++#include /* getpagesize() */ ++#include /* O_RDONLY */ ++ + namespace base { + + ProcessMetrics::ProcessMetrics(ProcessHandle process) +@@ -122,4 +125,23 @@ size_t GetSystemCommitCharge() { + return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); + } + ++int GetNumberOfThreads(ProcessHandle process) { ++ // Taken from FreeBSD top (usr.bin/top/machine.c) ++ ++ kvm_t* kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "kvm_open"); ++ if (kd == NULL) ++ return 0; ++ ++ struct kinfo_proc* pbase; ++ int nproc; ++ pbase = kvm_getprocs(kd, KERN_PROC_PID, process, &nproc); ++ if (pbase == NULL) ++ return 0; ++ ++ if (kvm_close(kd) == -1) ++ return 0; ++ ++ return nproc; ++} ++ + } // namespace base diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc index 792cca0e96cd..890c4dde9b11 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_process_process__posix.cc @@ -1,10 +1,90 @@ ---- src/3rdparty/chromium/base/process/process_posix.cc.orig 2017-04-11 14:08:45 UTC +--- src/3rdparty/chromium/base/process/process_posix.cc.orig 2017-01-26 00:49:07 UTC +++ src/3rdparty/chromium/base/process/process_posix.cc -@@ -8,6 +8,7 @@ - #include - #include - #include +@@ -21,8 +21,18 @@ + #include + #endif + ++#if defined(OS_BSD) +#include ++#include ++#include ++#include ++#endif ++ + namespace { + ++const int kBackgroundPriority = 5; ++const int kForegroundPriority = 0; ++ + #if !defined(OS_NACL_NONSFI) + + bool WaitpidWithTimeout(base::ProcessHandle handle, +@@ -184,13 +194,13 @@ bool WaitForExitWithTimeoutImpl(base::Pr + base::ProcessHandle parent_pid = base::GetParentProcessId(handle); + base::ProcessHandle our_pid = base::GetCurrentProcessHandle(); + if (parent_pid != our_pid) { +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_BSD) + // On Mac we can wait on non child processes. +- return WaitForSingleNonChildProcess(handle, timeout); ++ /* return WaitForSingleNonChildProcess(handle, timeout); */ + #else + // Currently on Linux we can't handle non child processes. + NOTIMPLEMENTED(); +-#endif // OS_MACOSX ++#endif // OS_MACOSX || OS_BSD + } + + int status; +@@ -257,12 +267,16 @@ Process Process::DeprecatedGetProcessFro + return Process(handle); + } + +-#if !defined(OS_LINUX) && !defined(OS_MACOSX) ++#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) + // static + bool Process::CanBackgroundProcesses() { + return false; + } +-#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) ++#elif defined(OS_FREEBSD) ++bool Process::CanBackgroundProcesses() { ++ return true; ++} ++#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) + + bool Process::IsValid() const { + return process_ != kNullProcessHandle; +@@ -365,15 +379,32 @@ bool Process::WaitForExitWithTimeout(Tim + bool Process::IsProcessBackgrounded() const { + // See SetProcessBackgrounded(). + DCHECK(IsValid()); ++#if defined(OS_FREEBSD) ++ return true; ++#else + return false; ++#endif + } + + bool Process::SetProcessBackgrounded(bool value) { ++#if !defined(OS_FREEBSD) + // Not implemented for POSIX systems other than Linux and Mac. With POSIX, if + // we were to lower the process priority we wouldn't be able to raise it back + // to its initial priority. + NOTIMPLEMENTED(); + return false; ++#else ++ DCHECK(IsValid()); ++ ++ if (!CanBackgroundProcesses()) ++ return false; ++ ++ int priority = value ? kBackgroundPriority : kForegroundPriority; ++ int result = setpriority(PRIO_PROCESS, process_, priority); ++ ++ DPCHECK(result == 0); ++ return result == 0; ++#endif // !defined(OS_FREEBSD) + } + #endif // !defined(OS_LINUX) && !defined(OS_MACOSX) - #include "base/files/scoped_file.h" - #include "base/logging.h" diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__unittest.cc new file mode 100644 index 000000000000..af02e8a66c37 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__sampling__profiler__unittest.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/profiler/stack_sampling_profiler_unittest.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/profiler/stack_sampling_profiler_unittest.cc +@@ -31,7 +31,7 @@ + #include + #include + #include +-#else ++#elif !defined(OS_BSD) + #include + #endif + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc new file mode 100644 index 000000000000..69326def4b47 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/security_unittest.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/security_unittest.cc +@@ -74,7 +74,7 @@ bool IsTcMallocBypassed() { + // FAILS_ is too clunky. + void OverflowTestsSoftExpectTrue(bool overflow_detected) { + if (!overflow_detected) { +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_NACL) + // Sadly, on Linux, Android, and OSX we don't have a good story yet. Don't + // fail the test, but report. + printf("Platform has overflow: %s\n", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_sys__info__freebsd.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_sys__info__freebsd.cc new file mode 100644 index 000000000000..612714de67cf --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_sys__info__freebsd.cc @@ -0,0 +1,72 @@ +--- src/3rdparty/chromium/base/sys_info_freebsd.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/sys_info_freebsd.cc +@@ -12,12 +12,34 @@ + + namespace base { + ++int64_t SysInfo::AmountOfAvailablePhysicalMemory() { ++ int page_size, r = 0; ++ unsigned pgfree, pginact, pgcache; ++ size_t size = sizeof(page_size); ++ size_t szpg = sizeof(pgfree); ++ if(r == 0) ++ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); ++ if(r == 0) ++ r = sysctlbyname("vm.stats.vm.v_free_count", &pgfree, &szpg, NULL, 0); ++ if(r == 0) ++ r = sysctlbyname("vm.stats.vm.v_inactive_count", &pginact, &szpg, NULL, 0); ++ if(r == 0) ++ r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0); ++ if (r == -1) { ++ NOTREACHED(); ++ return 0; ++ } ++ return static_cast((pgfree + pginact + pgcache) * page_size); ++} ++ + int64_t SysInfo::AmountOfPhysicalMemory() { +- int pages, page_size; ++ int pages, page_size, r = 0; + size_t size = sizeof(pages); +- sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); +- sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); +- if (pages == -1 || page_size == -1) { ++ if(r == 0) ++ r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); ++ if(r == 0) ++ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0); ++ if (r == -1) { + NOTREACHED(); + return 0; + } +@@ -25,14 +47,24 @@ int64_t SysInfo::AmountOfPhysicalMemory( + } + + // static +-uint64_t SysInfo::MaxSharedMemorySize() { +- size_t limit; +- size_t size = sizeof(limit); +- if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) { ++std::string SysInfo::CPUModelName() { ++ int mib[] = { CTL_HW, HW_MODEL }; ++ char name[256]; ++ size_t size = arraysize(name); ++ if (sysctl(mib, arraysize(mib), &name, &size, NULL, 0) == 0) ++ return name; ++ return std::string(); ++} ++ ++int SysInfo::NumberOfProcessors() { ++ int mib[] = { CTL_HW, HW_NCPU }; ++ int ncpu; ++ size_t size = sizeof(ncpu); ++ if (sysctl(mib, arraysize(mib), &ncpu, &size, NULL, 0) == -1) { + NOTREACHED(); +- return 0; ++ return 1; + } +- return static_cast(limit); ++ return ncpu; + } + + } // namespace base diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_sys__info__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_sys__info__posix.cc new file mode 100644 index 000000000000..aafc8c04941c --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_sys__info__posix.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/base/sys_info_posix.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/sys_info_posix.cc +@@ -35,7 +35,7 @@ + + namespace { + +-#if !defined(OS_OPENBSD) ++#if !defined(OS_BSD) + int NumberOfProcessors() { + // sysconf returns the number of "logical" (not "physical") processors on both + // Mac and Linux. So we get the number of max available "logical" processors. +@@ -128,7 +128,7 @@ bool GetDiskSpaceInfo(const base::FilePa + + namespace base { + +-#if !defined(OS_OPENBSD) ++#if !defined(OS_BSD) + int SysInfo::NumberOfProcessors() { + return g_lazy_number_of_processors.Get().value(); + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_test_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_test_BUILD.gn new file mode 100644 index 000000000000..50aacacad19e --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_test_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/test/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/test/BUILD.gn +@@ -303,7 +303,7 @@ static_library("run_all_base_unittests") + ] + } + +-if (is_linux) { ++if (is_linux || is_bsd) { + shared_library("malloc_wrapper") { + testonly = true + sources = [ diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_third__party_libevent_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_third__party_libevent_BUILD.gn new file mode 100644 index 000000000000..4f88a72fdae2 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_third__party_libevent_BUILD.gn @@ -0,0 +1,12 @@ +--- src/3rdparty/chromium/base/third_party/libevent/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/third_party/libevent/BUILD.gn +@@ -29,6 +29,9 @@ static_library("libevent") { + } else if (is_linux) { + sources += [ "epoll.c" ] + include_dirs = [ "linux" ] ++ } else if (is_bsd) { ++ sources += [ "kqueue.c" ] ++ include_dirs = [ "freebsd" ] + } else if (is_android) { + sources += [ "epoll.c" ] + include_dirs = [ "android" ] diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h new file mode 100644 index 000000000000..ba734142e066 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/threading/platform_thread.h.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/threading/platform_thread.h +@@ -205,7 +205,7 @@ class BASE_EXPORT PlatformThread { + + static ThreadPriority GetCurrentThreadPriority(); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Toggles a specific thread's priority at runtime. This can be used to + // change the priority of a thread in a different process and will fail + // if the calling process does not have proper permissions. The diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc index 0ed91c4fa529..4b8c8b298df7 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__linux.cc @@ -1,16 +1,16 @@ ---- src/3rdparty/chromium/base/threading/platform_thread_linux.cc.orig 2017-04-11 14:08:45 UTC +--- src/3rdparty/chromium/base/threading/platform_thread_linux.cc.orig 2017-01-26 00:49:07 UTC +++ src/3rdparty/chromium/base/threading/platform_thread_linux.cc -@@ -17,7 +17,9 @@ +@@ -19,7 +19,9 @@ #if !defined(OS_NACL) #include +#if !defined(OS_BSD) #include +#endif + #include + #include #include - #include - #endif -@@ -81,7 +83,7 @@ void PlatformThread::SetName(const std::string& name) +@@ -130,7 +132,7 @@ void PlatformThread::SetName(const std:: ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name); tracked_objects::ThreadData::InitializeThreadContext(name); @@ -19,3 +19,12 @@ // On linux we can get the thread names to show up in the debugger by setting // the process name for the LWP. We don't want to do this for the main // thread because that would rename the process, causing tools like killall +@@ -150,7 +152,7 @@ void PlatformThread::SetName(const std:: + #endif // !defined(OS_NACL) + } + +-#if !defined(OS_NACL) ++#if !defined(OS_NACL) && !defined(OS_BSD) + // static + void PlatformThread::SetThreadPriority(PlatformThreadId thread_id, + ThreadPriority priority) { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc new file mode 100644 index 000000000000..c77c1dff866c --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_threading_platform__thread__posix.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/threading/platform_thread_posix.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/threading/platform_thread_posix.cc +@@ -56,7 +56,7 @@ void* ThreadFunc(void* params) { + if (!thread_params->joinable) + base::ThreadRestrictions::SetSingletonAllowed(false); + +-#if !defined(OS_NACL) ++#if !defined(OS_NACL) && !defined(OS_BSD) + // Threads on linux/android may inherit their priority from the thread + // where they were created. This explicitly sets the priority of all new + // threads. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc new file mode 100644 index 000000000000..c5d514f5a5c3 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_trace__event_malloc__dump__provider.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc +@@ -21,7 +21,7 @@ + #if defined(OS_MACOSX) + #include + #else +-#include ++#include + #endif + #if defined(OS_WIN) + #include diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_trace__event_process__memory__dump.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_trace__event_process__memory__dump.cc index 35d5104af99a..d569b7479f69 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_trace__event_process__memory__dump.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_trace__event_process__memory__dump.cc @@ -1,29 +1,11 @@ ---- src/3rdparty/chromium/base/trace_event/process_memory_dump.cc.orig 2016-11-07 14:46:18 UTC +--- src/3rdparty/chromium/base/trace_event/process_memory_dump.cc.orig 2017-01-26 00:49:07 UTC +++ src/3rdparty/chromium/base/trace_event/process_memory_dump.cc -@@ -52,7 +52,7 @@ size_t ProcessMemoryDump::CountResidentB - const size_t page_count = (chunk_size + page_size - 1) / page_size; - size_t resident_page_count = 0; - +@@ -83,7 +83,7 @@ size_t ProcessMemoryDump::CountResidentB + const size_t kMaxChunkSize = 8 * 1024 * 1024; + size_t max_vec_size = + GetSystemPageCount(std::min(mapped_size, kMaxChunkSize), page_size); -#if defined(OS_MACOSX) || defined(OS_IOS) +#if defined(OS_MACOSX) || defined(OS_IOS) || defined(OS_BSD) - std::vector vec(page_count + 1); - // mincore in MAC does not fail with EAGAIN. - result = mincore(chunk_start, chunk_size, vec.data()); -@@ -61,7 +61,7 @@ size_t ProcessMemoryDump::CountResidentB - - for (size_t i = 0; i < page_count; i++) - resident_page_count += vec[i] & MINCORE_INCORE ? 1 : 0; --#else // defined(OS_MACOSX) || defined(OS_IOS) -+#else // defined(OS_MACOSX) || defined(OS_IOS) || defined(OS_BSD) - std::vector vec(page_count + 1); - int error_counter = 0; - // HANDLE_EINTR tries for 100 times. So following the same pattern. -@@ -73,7 +73,7 @@ size_t ProcessMemoryDump::CountResidentB - - for (size_t i = 0; i < page_count; i++) - resident_page_count += vec[i]; --#endif // defined(OS_MACOSX) || defined(OS_IOS) -+#endif // defined(OS_MACOSX) || defined(OS_IOS) || defined(OS_BSD) - - total_resident_size += resident_page_count * page_size; - offset += kMaxChunkSize; + std::unique_ptr vec(new char[max_vec_size]); + #elif defined(OS_WIN) + std::unique_ptr vec( diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_tracked__objects.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_tracked__objects.cc deleted file mode 100644 index 39d258eae823..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_tracked__objects.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/base/tracked_objects.cc.orig 2017-04-11 14:08:45 UTC -+++ src/3rdparty/chromium/base/tracked_objects.cc -@@ -431,7 +431,7 @@ void ThreadData::OnThreadTerminationCleanup() { - } - // We must NOT do any allocations during this callback. - // Using the simple linked lists avoids all allocations. -- DCHECK_EQ(this->next_retired_worker_, reinterpret_cast(NULL)); -+ DCHECK_EQ(this->next_retired_worker_, reinterpret_cast(0)); - this->next_retired_worker_ = first_retired_worker_; - first_retired_worker_ = this; - } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_breakpad_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_breakpad_BUILD.gn new file mode 100644 index 000000000000..13eade349dc0 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_breakpad_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/breakpad/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/breakpad/BUILD.gn +@@ -468,7 +468,7 @@ if (is_mac) { + } + } + +-if (is_linux || is_android) { ++if (is_linux || is_bsd || is_android) { + if (current_toolchain == host_toolchain) { + executable("symupload") { + sources = [ diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_common.gypi b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_common.gypi deleted file mode 100644 index 7c34edb4b2a0..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_common.gypi +++ /dev/null @@ -1,16 +0,0 @@ ---- src/3rdparty/chromium/build/common.gypi.orig 2017-04-11 14:08:45 UTC -+++ src/3rdparty/chromium/build/common.gypi -@@ -4781,6 +4781,13 @@ - 'ldflags': [ - '-Wl,--no-keep-memory', - ], -+ 'ldflags!': [ -+ '-ldl', -+ '-pie', -+ ], -+ 'libraries!': [ -+ '-ldl', -+ ], - }, - }], - # Android-specific options; note that most are set above with Linux. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn new file mode 100644 index 000000000000..bc0b80ebb83f --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_BUILD.gn @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/build/config/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/build/config/BUILD.gn +@@ -224,7 +224,7 @@ config("debug") { + # builds, and we have to tell it to turn it off. + defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] + } +- } else if (is_linux && current_cpu == "x64" && enable_iterator_debugging) { ++ } else if ((is_linux || is_bsd) && current_cpu == "x64" && enable_iterator_debugging) { + # Enable libstdc++ debugging facilities to help catch problems early, see + # http://crbug.com/65151 . + # TODO(phajdan.jr): Should we enable this for all of POSIX? +@@ -338,7 +338,7 @@ config("executable_config") { + ] + } else if (is_ios) { + configs += [ "//build/config/ios:ios_dynamic_flags" ] +- } else if (is_linux || is_android) { ++ } else if (is_linux || is_android || is_bsd) { + configs += [ "//build/config/gcc:executable_ldconfig" ] + if (is_android) { + configs += [ "//build/config/android:executable_config" ] diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn new file mode 100644 index 000000000000..ff60f64706ec --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_BUILDCONFIG.gn @@ -0,0 +1,66 @@ +--- src/3rdparty/chromium/build/config/BUILDCONFIG.gn.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/build/config/BUILDCONFIG.gn +@@ -134,12 +134,13 @@ declare_args() { + is_debug = !is_official_build + + # Whether we're a traditional desktop unix. +- is_desktop_linux = current_os == "linux" ++ is_desktop_linux = current_os == "linux" || current_os == "bsd" + + # Set to true when compiling with the Clang compiler. Typically this is used + # to configure warnings. + is_clang = current_os == "mac" || current_os == "ios" || +- current_os == "linux" || current_os == "chromeos" ++ current_os == "linux" || current_os == "chromeos" || ++ current_os == "bsd" + + # Allows the path to a custom target toolchain to be injected as a single + # argument, and set as the default toolchain. +@@ -183,8 +184,8 @@ if (host_toolchain == "") { + # TODO(dpranke): Add some sort of assert here that verifies that + # no toolchain omitted host_toolchain from its toolchain_args(). + +- if (host_os == "linux") { +- if (target_os != "linux") { ++ if (host_os == "linux" || host_os == "bsd") { ++ if (target_os != "linux" || target_os != "bsd") { + # TODO(dpranke) - is_clang normally applies only to the target + # build, and there is no way to indicate that you want to override + # it for both the target build *and* the host build. Do we need to +@@ -220,7 +221,7 @@ if (target_os == "android") { + } else { + _default_toolchain = "//build/toolchain/android:android_$target_cpu" + } +-} else if (target_os == "chromeos" || target_os == "linux") { ++} else if (target_os == "chromeos" || target_os == "linux" || target_os == "bsd") { + # See comments in build/toolchain/cros/BUILD.gn about board compiles. + if (is_clang) { + _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" +@@ -340,8 +341,17 @@ if (current_os == "win" || current_os == + is_nacl = false + is_posix = true + is_win = false ++} else if (current_os == "bsd") { ++ is_android = false ++ is_chromeos = false ++ is_ios = false ++ is_linux = false ++ is_bsd = true ++ is_mac = false ++ is_nacl = false ++ is_posix = true ++ is_win = false + } +- + # ============================================================================= + # SOURCES FILTERS + # ============================================================================= +@@ -410,7 +420,7 @@ if (!is_ios) { + if (!is_mac && !is_ios) { + sources_assignment_filter += [ "*.mm" ] + } +-if (!is_linux) { ++if (!is_linux && !is_bsd) { + sources_assignment_filter += [ + "*_linux.h", + "*_linux.cc", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_allocator.gni b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_allocator.gni new file mode 100644 index 000000000000..bff3a485ed3b --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_allocator.gni @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/build/config/allocator.gni.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/build/config/allocator.gni +@@ -44,7 +44,7 @@ assert(use_allocator == "none" || use_al + assert(!is_win || use_allocator == "none", "Tcmalloc doesn't work on Windows.") + + assert( +- !use_experimental_allocator_shim || is_linux || is_android || is_win, ++ !use_experimental_allocator_shim || is_linux || is_android || is_win || is_bsd, + "use_experimental_allocator_shim supported only on Linux, Android and Windows targets") + + if (is_win && use_experimental_allocator_shim) { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_clang_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_clang_BUILD.gn new file mode 100644 index 000000000000..26e969138b97 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_clang_BUILD.gn @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/build/config/clang/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/build/config/clang/BUILD.gn +@@ -20,7 +20,7 @@ config("find_bad_constructs") { + rebase_path("${clang_base_path}/lib/libFindBadConstructs.dylib", + root_build_dir), + ] +- } else if (is_linux || is_android) { ++ } else if (is_linux || is_bsd || is_android) { + cflags += [ + "-Xclang", + "-load", +@@ -37,7 +37,7 @@ config("find_bad_constructs") { + "find-bad-constructs", + ] + +- if ((is_linux || is_android) && !is_chromecast) { ++ if ((is_linux || is_bsd || is_android) && !is_chromecast) { + cflags += [ + "-Xclang", + "-plugin-arg-find-bad-constructs", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn new file mode 100644 index 000000000000..b8679ae3f2a3 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn @@ -0,0 +1,100 @@ +--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/build/config/compiler/BUILD.gn +@@ -150,7 +150,7 @@ config("compiler") { + configs += [ "//build/config/win:compiler" ] + } else if (is_android) { + configs += [ "//build/config/android:compiler" ] +- } else if (is_linux) { ++ } else if (is_linux || is_bsd) { + configs += [ "//build/config/linux:compiler" ] + } else if (is_nacl) { + configs += [ "//build/config/nacl:compiler" ] +@@ -277,7 +277,7 @@ config("compiler") { + + # Linux/Android common flags setup. + # --------------------------------- +- if (is_linux || is_android) { ++ if (is_linux || is_bsd || is_android) { + cflags += [ + "-fPIC", + "-pipe", # Use pipes for communicating between sub-processes. Faster. +@@ -401,14 +401,14 @@ config("compiler") { + # clang-cl (used if is_win) doesn't expose this flag. + # Currently disabled for nacl since its toolchain lacks this flag (too old). + # TODO(zforman): Once nacl's toolchain is updated, remove check. +- if (is_clang && is_linux) { ++ if (is_clang && (is_linux || is_bsd)) { + absolute_path = rebase_path("//.") + cflags += [ "-fdebug-prefix-map=$absolute_path=." ] + } + + # C++11 compiler flags setup. + # --------------------------- +- if (is_linux || is_android || (is_nacl && is_clang)) { ++ if (is_linux || is_bsd || is_android || (is_nacl && is_clang)) { + # gnu++11 instead of c++11 is needed because some code uses typeof() (a + # GNU extension). + # TODO(thakis): Eventually switch this to c++11 instead, +@@ -458,7 +458,7 @@ config("compiler") { + ] + + # Apply a lower LTO optimization level as the default is too slow. +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (use_lld) { + ldflags += [ "-Wl,--lto-O1" ] + } else { +@@ -478,7 +478,7 @@ config("compiler") { + # targeting ARM, without this flag, LTO produces a .text section that is + # larger than the maximum call displacement, preventing the linker from + # relocating calls (http://llvm.org/PR22999). +- if (is_linux) { ++ if (is_linux || is_bsd) { + ldflags += [ "-Wl,-plugin-opt,-function-sections" ] + } + } +@@ -742,7 +742,7 @@ config("compiler_codegen") { + # configs -= [ "//build/config/compiler:clang_stackrealign" ] + # See https://crbug.com/556393 for details of where it must be avoided. + config("clang_stackrealign") { +- if (is_clang && current_cpu == "x86" && is_linux) { ++ if (is_clang && current_cpu == "x86" && (is_linux || is_bsd)) { + cflags = [ + # Align the stack on 16-byte boundaries, http://crbug.com/418554. + "-mstack-alignment=16", +@@ -788,7 +788,7 @@ config("runtime_library") { + # smaller. + if (is_win) { + configs += [ "//build/config/win:runtime_library" ] +- } else if (is_linux) { ++ } else if (is_linux || is_bsd) { + configs += [ "//build/config/linux:runtime_library" ] + } else if (is_ios) { + configs += [ "//build/config/ios:runtime_library" ] +@@ -1038,7 +1038,7 @@ config("default_warnings") { + "-Wno-nonportable-include-path", + + # TODO(hans): https://crbug.com/637306 +- "-Wno-address-of-packed-member", ++ # "-Wno-address-of-packed-member", + ] + } + } +@@ -1070,7 +1070,7 @@ config("chromium_code") { + ] + + if (!is_debug && !using_sanitizer && +- (!is_linux || !is_clang || is_official_build)) { ++ (!is_linux || !is_bsd || !is_clang || is_official_build)) { + # _FORTIFY_SOURCE isn't really supported by Clang now, see + # http://llvm.org/bugs/show_bug.cgi?id=16821. + # It seems to work fine with Ubuntu 12 headers though, so use it in +@@ -1128,7 +1128,7 @@ config("no_chromium_code") { + ] + } + +- if (is_linux || is_android) { ++ if (is_linux || is_bsd || is_android) { + cflags_cc += [ + # Don't warn about hash_map in third-party code. + "-Wno-deprecated", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_crypto.gni b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_crypto.gni new file mode 100644 index 000000000000..4f4e8d34bdda --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_crypto.gni @@ -0,0 +1,9 @@ +--- src/3rdparty/chromium/build/config/crypto.gni.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/build/config/crypto.gni +@@ -21,5 +21,5 @@ declare_args() { + + # True if NSS is used for certificate handling. It is possible to use OpenSSL + # for the crypto library, but NSS for the platform certificate library. +- use_nss_certs = is_linux ++ use_nss_certs = is_linux || is_bsd + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_features.gni b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_features.gni new file mode 100644 index 000000000000..7a1bfc213bcc --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_features.gni @@ -0,0 +1,19 @@ +--- src/3rdparty/chromium/build/config/features.gni.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/build/config/features.gni +@@ -67,13 +67,13 @@ declare_args() { + # libudev usage. This currently only affects the content layer. + use_udev = is_linux && !is_chromecast + +- use_dbus = is_linux && !is_chromecast ++ use_dbus = (is_linux || is_bsd) && !is_chromecast + + # Option controlling the use of GConf (the classic GNOME configuration + # system). +- use_gconf = is_linux && !is_chromeos && !is_chromecast ++ use_gconf = (is_linux || is_bsd) && !is_chromeos && !is_chromecast + +- use_gio = is_linux && !is_chromeos && !is_chromecast ++ use_gio = (is_linux || is_bsd) && !is_chromeos && !is_chromecast + + # Whether or not to use external popup menu. + use_external_popup_menu = is_android || is_mac diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_linux_gtk2_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_linux_gtk2_BUILD.gn new file mode 100644 index 000000000000..de4ab4cdc7bb --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_linux_gtk2_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/build/config/linux/gtk2/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/build/config/linux/gtk2/BUILD.gn +@@ -4,7 +4,7 @@ + + import("//build/config/linux/pkg_config.gni") + +-assert(is_linux, "This file should only be referenced on Linux") ++assert(is_linux || is_bsd, "This file should only be referenced on Linux") + + # Depend on //build/config/linux/gtk2 to use GTKv2. + # diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_linux_gtk3_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_linux_gtk3_BUILD.gn new file mode 100644 index 000000000000..b3218a871537 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_linux_gtk3_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/build/config/linux/gtk3/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/build/config/linux/gtk3/BUILD.gn +@@ -4,7 +4,7 @@ + + import("//build/config/linux/pkg_config.gni") + +-assert(is_linux, "This file should only be referenced on Linux") ++assert(is_linux || is_bsd, "This file should only be referenced on Linux") + + # Depend on //build/config/linux/gtk3 to use GTKv3. + # diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_linux_pkg-config.py b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_linux_pkg-config.py new file mode 100644 index 000000000000..9da27eddc795 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_linux_pkg-config.py @@ -0,0 +1,26 @@ +--- src/3rdparty/chromium/build/config/linux/pkg-config.py.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/build/config/linux/pkg-config.py +@@ -57,8 +57,12 @@ def SetConfigPath(options): + print "You must specify an architecture via -a if using a sysroot." + sys.exit(1) + +- libdir = sysroot + '/usr/' + options.system_libdir + '/pkgconfig' +- libdir += ':' + sysroot + '/usr/share/pkgconfig' ++ if "linux" in sys.platform: ++ libdir = sysroot + '/libdata/' + options.system_libdir + '/pkgconfig' ++ libdir += ':' + sysroot + '/usr/share/pkgconfig' ++ elif "bsd" in sys.platform: ++ libdir = sysroot + '/libdata/pkgconfig' ++ libdir += ':' + '/usr/libdata/pkgconfig' + os.environ['PKG_CONFIG_LIBDIR'] = libdir + return libdir + +@@ -107,7 +111,7 @@ def main(): + # If this is run on non-Linux platforms, just return nothing and indicate + # success. This allows us to "kind of emulate" a Linux build from other + # platforms. +- if "linux" not in sys.platform: ++ if "bsd" not in sys.platform: + print "[[],[],[],[],[]]" + return 0 + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_sanitizers_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_sanitizers_BUILD.gn new file mode 100644 index 000000000000..ee1e4f0b678d --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_sanitizers_BUILD.gn @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/build/config/sanitizers/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/build/config/sanitizers/BUILD.gn +@@ -405,7 +405,7 @@ config("lsan_flags") { + + config("msan_flags") { + if (is_msan) { +- assert(is_linux, "msan only supported on linux x86_64") ++ assert(is_linux || is_bsd, "msan only supported on linux x86_64") + msan_blacklist_path = + rebase_path("//tools/msan/blacklist.txt", root_build_dir) + cflags = [ +@@ -418,7 +418,7 @@ config("msan_flags") { + + config("tsan_flags") { + if (is_tsan) { +- assert(is_linux, "tsan only supported on linux x86_64") ++ assert(is_linux || is_bsd, "tsan only supported on linux x86_64") + tsan_blacklist_path = + rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir) + cflags = [ diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_sanitizers_sanitizers.gni b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_sanitizers_sanitizers.gni new file mode 100644 index 000000000000..b31d3bc5c864 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_sanitizers_sanitizers.gni @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/build/config/sanitizers/sanitizers.gni.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/build/config/sanitizers/sanitizers.gni +@@ -54,8 +54,9 @@ declare_args() { + # See http://clang.llvm.org/docs/ControlFlowIntegrity.html + # + # TODO(pcc): Remove this flag if/when CFI is enabled in all official builds. +- is_cfi = target_os == "linux" && !is_chromeos && target_cpu == "x64" && +- is_chrome_branded && is_official_build && allow_posix_link_time_opt ++ is_cfi = (target_os == "linux" || target_os == "bsd") && !is_chromeos && ++ target_cpu == "x64" && is_chrome_branded && is_official_build && ++ allow_posix_link_time_opt + + # Enable checks for bad casts: derived cast and unrelated cast. + # TODO(krasin): remove this, when we're ready to add these checks by default. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_ui.gni b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_ui.gni new file mode 100644 index 000000000000..7667d107124d --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_ui.gni @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/build/config/ui.gni ++++ src/3rdparty/chromium/build/config/ui.gni +@@ -32,7 +32,7 @@ declare_args() { + + # Indicates if Aura is enabled. Aura is a low-level windowing library, sort + # of a replacement for GDI or GTK. +- use_aura = is_win || is_linux ++ use_aura = is_win || is_linux || is_bsd + + # True means the UI is built using the "views" framework. + toolkit_views = +@@ -48,7 +48,7 @@ declare_args() { + use_xkbcommon = false + + # Whether we should use glib, a low level C utility library. +- use_glib = is_linux ++ use_glib = is_linux || is_bsd + + # Indicates if Wayland display server support is enabled. + enable_wayland_server = is_chromeos +@@ -68,7 +68,7 @@ declare_args() { + ui_compositor_image_transport = use_aura && is_linux && !use_qt + + # Indicates if the UI toolkit depends on X11. +-use_x11 = is_linux && !use_ozone ++use_x11 = (is_linux || is_bsd) && !use_ozone + + # Indicates if the UI toolkit depends on GTK. + use_gtk = use_x11 && !use_qt diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_linux_libpci_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_linux_libpci_BUILD.gn new file mode 100644 index 000000000000..dbd044e067da --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_linux_libpci_BUILD.gn @@ -0,0 +1,53 @@ +--- src/3rdparty/chromium/build/linux/libpci/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/build/linux/libpci/BUILD.gn +@@ -3,20 +3,36 @@ + # found in the LICENSE file. + + import("//tools/generate_library_loader/generate_library_loader.gni") ++import("//build/config/linux/pkg_config.gni") + +-# This generates a target named "libpci". +-generate_library_loader("libpci") { +- name = "LibPciLoader" +- output_h = "libpci.h" +- output_cc = "libpci_loader.cc" +- header = "" ++declare_args() { ++ use_system_libpci = is_bsd ++} + +- functions = [ +- "pci_alloc", +- "pci_init", +- "pci_cleanup", +- "pci_scan_bus", +- "pci_fill_info", +- "pci_lookup_name", +- ] ++if (use_system_libpci) { ++ pkg_config("system_libpci") { ++ packages = [ "libpci" ] ++ } ++ ++ source_set("libpci") { ++ public_configs = [ ":system_libpci" ] ++ } ++ ++} else { ++ # This generates a target named "libpci". ++ generate_library_loader("libpci") { ++ name = "LibPciLoader" ++ output_h = "libpci.h" ++ output_cc = "libpci_loader.cc" ++ header = "" ++ ++ functions = [ ++ "pci_alloc", ++ "pci_init", ++ "pci_cleanup", ++ "pci_scan_bus", ++ "pci_fill_info", ++ "pci_lookup_name", ++ ] ++ } + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libusb.gyp b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libusb.gyp deleted file mode 100644 index bcf7ec48ea4b..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libusb.gyp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/build/linux/unbundle/libusb.gyp.orig 2017-04-11 14:08:45 UTC -+++ src/3rdparty/chromium/build/linux/unbundle/libusb.gyp -@@ -18,14 +18,14 @@ - ], - 'direct_dependent_settings': { - 'cflags': [ -- ' 0) { + float ratio = clamped_current_pos / maximum; +- float max_offset = track_length - thumb_length; +- thumb_offset += static_cast(ratio * max_offset); ++ float _max_offset = track_length - thumb_length; ++ thumb_offset += static_cast(ratio * _max_offset); + } + + float thumb_thickness_adjustment = diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_cc_trees_property__tree.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_cc_trees_property__tree.cc new file mode 100644 index 000000000000..acf72fb6af65 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_cc_trees_property__tree.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/cc/trees/property_tree.cc.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/cc/trees/property_tree.cc +@@ -1113,13 +1113,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollO + + gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id); + +- gfx::ScrollOffset max_offset( ++ gfx::ScrollOffset _max_offset( + scaled_scroll_bounds.width() - clip_layer_bounds.width(), + scaled_scroll_bounds.height() - clip_layer_bounds.height()); + +- max_offset.Scale(1 / scale_factor); +- max_offset.SetToMax(gfx::ScrollOffset()); +- return max_offset; ++ _max_offset.Scale(1 / scale_factor); ++ _max_offset.SetToMax(gfx::ScrollOffset()); ++ return _max_offset; + } + + void ScrollTree::OnScrollOffsetAnimated(int layer_id, diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_BUILD.gn new file mode 100644 index 000000000000..02c4c63b5da8 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_BUILD.gn @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/chrome/BUILD.gn.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/chrome/BUILD.gn +@@ -132,7 +132,7 @@ if (!is_android && !is_mac) { + data = [ + "$root_out_dir/resources.pak", + ] +- if (is_linux || is_win) { ++ if (is_linux || is_bsd || is_win) { + data += [ + "$root_out_dir/chrome_100_percent.pak", + "$root_out_dir/locales/en-US.pak", +@@ -212,7 +212,7 @@ if (!is_android && !is_mac) { + sources += [ "app/chrome_exe_main_aura.cc" ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ + "app/chrome_dll_resource.h", + "app/chrome_main.cc", +@@ -1539,7 +1539,7 @@ if (enable_resource_whitelist_generation + } + } + +-if (is_linux) { ++if (is_linux || is_bsd) { + action("manpage") { + if (is_chrome_branded) { + name = "Google Chrome" diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_chromium__strings.grd b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_chromium__strings.grd new file mode 100644 index 000000000000..0f7e08915460 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_chromium__strings.grd @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chrome/app/chromium_strings.grd.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/chrome/app/chromium_strings.grd +@@ -939,7 +939,7 @@ Signing in anyway will merge Chromium in + + + +- ++ + + The profile appears to be in use by another Chromium process ($112345) on another computer ($2example.com). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium. + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_generated__resources.grd b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_generated__resources.grd new file mode 100644 index 000000000000..0b722cb5015d --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_generated__resources.grd @@ -0,0 +1,38 @@ +--- src/3rdparty/chromium/chrome/app/generated_resources.grd.orig 2017-01-26 00:49:07 UTC ++++ src/3rdparty/chromium/chrome/app/generated_resources.grd +@@ -6939,7 +6939,7 @@ Keep your key file in a safe place. You + + Right-to-left + +- ++ + + Enable Input IME API + +@@ -10334,7 +10334,7 @@ I don't think this site should be blocke + + Appearance + +- ++ + + Themes + +@@ -10342,7 +10342,7 @@ I don't think this site should be blocke + + Reset to default theme + +- ++ + + Use GTK+ theme + +@@ -11663,7 +11663,7 @@ Tell us what happened exactly before you + Set as default + + +- ++ + + Use system title bar and borders + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_resources_locale__settings.grd b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_resources_locale__settings.grd new file mode 100644 index 000000000000..1d8803bf8028 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_resources_locale__settings.grd @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chrome/app/resources/locale_settings.grd.orig 2017-01-26 00:49:08 UTC ++++ src/3rdparty/chromium/chrome/app/resources/locale_settings.grd +@@ -151,7 +151,7 @@ + 55 + + +- ++ + + + 300 diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_BUILD.gn new file mode 100644 index 000000000000..8eafcf7e12ff --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_BUILD.gn @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/chrome/browser/BUILD.gn.orig 2017-01-26 00:49:08 UTC ++++ src/3rdparty/chromium/chrome/browser/BUILD.gn +@@ -2142,7 +2142,7 @@ split_static_library("browser") { + deps += [ "//device/udev_linux" ] + } + +- if (is_linux && !is_chromeos) { ++ if ((is_linux || is_bsd) && !is_chromeos) { + deps += [ "//third_party/speech-dispatcher" ] + } + +@@ -3507,7 +3507,7 @@ split_static_library("browser") { + } + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (use_aura) { + deps += [ "//build/linux:fontconfig" ] + if (use_dbus) { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_BUILD.gn new file mode 100644 index 000000000000..e7460b8bec5f --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_BUILD.gn @@ -0,0 +1,24 @@ +--- src/3rdparty/chromium/chrome/browser/extensions/BUILD.gn.orig 2017-01-26 00:49:08 UTC ++++ src/3rdparty/chromium/chrome/browser/extensions/BUILD.gn +@@ -1024,7 +1024,7 @@ static_library("extensions") { + sources -= [ "global_shortcut_listener_ozone.cc" ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + deps += [ "//build/linux:fontconfig" ] + + if (use_dbus) { +@@ -1115,6 +1115,12 @@ static_library("extensions") { + defines += [ "ENABLE_HOTWORDING" ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "api/image_writer_private/removable_storage_provider_linux.cc", ++ ] ++ } ++ + if (enable_service_discovery) { + sources += [ + "api/gcd_private/gcd_private_api.cc", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc new file mode 100644 index 000000000000..089672e8f8ac --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc @@ -0,0 +1,15 @@ +--- src/3rdparty/chromium/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2017-01-26 00:49:08 UTC ++++ src/3rdparty/chromium/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc +@@ -166,10 +166,12 @@ ImageWriterPrivateListRemovableStorageDe + } + + bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunAsync() { ++#if !defined(OS_FREEBSD) + RemovableStorageProvider::GetAllDevices( + base::Bind( + &ImageWriterPrivateListRemovableStorageDevicesFunction::OnDeviceListReady, + this)); ++#endif + return true; + } + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_input__ime_input__ime__api.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_input__ime_input__ime__api.h new file mode 100644 index 000000000000..d165c8fe497a --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_input__ime_input__ime__api.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chrome/browser/extensions/api/input_ime/input_ime_api.h.orig 2017-01-26 00:49:08 UTC ++++ src/3rdparty/chromium/chrome/browser/extensions/api/input_ime/input_ime_api.h +@@ -28,7 +28,7 @@ + + #if defined(OS_CHROMEOS) + #include "chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h" +-#elif defined(OS_LINUX) || defined(OS_WIN) ++#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + #include "chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.h" + #endif // defined(OS_CHROMEOS) + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_messaging_message__service.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_messaging_message__service.cc new file mode 100644 index 000000000000..247fe039d57d --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_messaging_message__service.cc @@ -0,0 +1,35 @@ +--- src/3rdparty/chromium/chrome/browser/extensions/api/messaging/message_service.cc.orig 2017-01-26 00:49:08 UTC ++++ src/3rdparty/chromium/chrome/browser/extensions/api/messaging/message_service.cc +@@ -119,7 +119,7 @@ MessageService::PolicyPermission Message + + const char kReceivingEndDoesntExistError[] = + "Could not establish connection. Receiving end does not exist."; +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + const char kMissingPermissionError[] = + "Access to native messaging requires nativeMessaging permission."; + const char kProhibitedByPoliciesError[] = +@@ -414,7 +414,7 @@ void MessageService::OpenChannelToNative + if (!source) + return; + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + content::WebContents* web_contents = + content::WebContents::FromRenderFrameHost(source); + ExtensionWebContentsObserver* extension_web_contents_observer = +@@ -477,12 +477,12 @@ void MessageService::OpenChannelToNative + channel->opener->IncrementLazyKeepaliveCount(); + + AddChannel(std::move(channel), receiver_port_id); +-#else // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)) ++#else // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)) + const char kNativeMessagingNotSupportedError[] = + "Native Messaging is not supported on this platform."; + DispatchOnDisconnect( + source, receiver_port_id, kNativeMessagingNotSupportedError); +-#endif // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)) ++#endif // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)) + } + + void MessageService::OpenChannelToTab(int source_process_id, diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_music__manager__private_device__id__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_music__manager__private_device__id__linux.cc new file mode 100644 index 000000000000..351c8c520637 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_music__manager__private_device__id__linux.cc @@ -0,0 +1,66 @@ +--- src/3rdparty/chromium/chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2017-01-26 00:49:08 UTC ++++ src/3rdparty/chromium/chrome/browser/extensions/api/music_manager_private/device_id_linux.cc +@@ -4,6 +4,10 @@ + + #include "chrome/browser/extensions/api/music_manager_private/device_id.h" + ++#if defined(OS_FREEBSD) ++#include ++#include ++#endif + #include + #include + #include +@@ -105,11 +109,33 @@ class MacAddressProcessor { + const char* const prefixes[], + size_t prefixes_count) { + const int MAC_LENGTH = 6; ++#if defined(OS_FREEBSD) ++ struct ifaddrs *ifap, *ifinfo; ++#else + struct ifreq ifinfo; ++#endif + + memset(&ifinfo, 0, sizeof(ifinfo)); +- strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1); + ++#if defined(OS_FREEBSD) ++ int result = getifaddrs(&ifap); ++ if (result != 0) ++ return true; ++ result = 1; // no MAC found yet ++ for (ifinfo = ifap; ifinfo != NULL; ifinfo = ifinfo->ifa_next) { ++ struct sockaddr* sa = ifinfo->ifa_addr; ++ if (sa->sa_family == AF_LINK && ++ !strncmp(ifinfo->ifa_name, ifaddr->ifa_name, ++ sizeof(ifinfo->ifa_name) - 1)) { ++ result = 0; ++ break; ++ } ++ } ++ ++ char mac_address[6]; ++ strncpy(mac_address, (const char*)LLADDR((struct sockaddr_dl*)ifinfo->ifa_addr), sizeof(mac_address)); ++#else ++ strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1); + int sd = socket(AF_INET, SOCK_DGRAM, 0); + int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo); + close(sd); +@@ -119,11 +145,17 @@ class MacAddressProcessor { + + const char* mac_address = + static_cast(ifinfo.ifr_hwaddr.sa_data); ++#endif + if (!is_valid_mac_address_.Run(mac_address, MAC_LENGTH)) + return true; + ++#if defined(OS_FREEBSD) ++ if (!IsValidPrefix(ifinfo->ifa_name, prefixes, prefixes_count)) ++ return true; ++#else + if (!IsValidPrefix(ifinfo.ifr_name, prefixes, prefixes_count)) + return true; ++#endif + + // Got one! + found_mac_address_ = diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_omnibox_omnibox__api.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_omnibox_omnibox__api.cc new file mode 100644 index 000000000000..74c07b43fbbf --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_extensions_api_omnibox_omnibox__api.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc.orig 2017-01-26 00:49:08 UTC ++++ src/3rdparty/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc +@@ -45,7 +45,7 @@ const char kBackgroundTabDisposition[] = + // Pref key for omnibox.setDefaultSuggestion. + const char kOmniboxDefaultSuggestion[] = "omnibox_default_suggestion"; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + static const int kOmniboxIconPaddingLeft = 2; + static const int kOmniboxIconPaddingRight = 2; + #elif defined(OS_MACOSX) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_safe__browsing_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_safe__browsing_BUILD.gn new file mode 100644 index 000000000000..f052faf1fe70 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_safe__browsing_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chrome/browser/resources/safe_browsing/BUILD.gn.orig 2017-01-26 00:49:09 UTC ++++ src/3rdparty/chromium/chrome/browser/resources/safe_browsing/BUILD.gn +@@ -29,6 +29,8 @@ action("make_file_types_protobuf") { + target_arch = "mac" + } else if (is_linux) { + target_arch = "linux" ++ } else if (is_bsd) { ++ target_arch = "bsd" + } else { + # This will cause the script to fail. + target_arch = "unknown_target_arch" diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_safe__browsing_gen__file__type__proto.py b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_safe__browsing_gen__file__type__proto.py new file mode 100644 index 000000000000..dbef30dbe828 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_resources_safe__browsing_gen__file__type__proto.py @@ -0,0 +1,19 @@ +--- src/3rdparty/chromium/chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig 2017-01-26 00:49:09 UTC ++++ src/3rdparty/chromium/chrome/browser/resources/safe_browsing/gen_file_type_proto.py +@@ -50,6 +50,7 @@ def PlatformTypes(): + "android": config_pb2.DownloadFileType.PLATFORM_ANDROID, + "chromeos": config_pb2.DownloadFileType.PLATFORM_CHROME_OS, + "linux": config_pb2.DownloadFileType.PLATFORM_LINUX, ++ "bsd": config_pb2.DownloadFileType.PLATFORM_LINUX, + "mac": config_pb2.DownloadFileType.PLATFORM_MAC, + "win": config_pb2.DownloadFileType.PLATFORM_WINDOWS, + } +@@ -201,7 +202,7 @@ def main(): + 'Outfile must have a %d for version and %s for platform.') + parser.add_option('-t', '--type', + help='The platform type. One of android, chromeos, ' + +- 'linux, mac, win') ++ 'linux, bsd, mac, win') + parser.add_option('-i', '--infile', + help='The ASCII DownloadFileType-proto file to read.') + parser.add_option('-d', '--outdir', diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_BUILD.gn new file mode 100644 index 000000000000..eb61c5639f25 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chrome/browser/ui/BUILD.gn.orig 2017-01-26 00:49:09 UTC ++++ src/3rdparty/chromium/chrome/browser/ui/BUILD.gn +@@ -3090,7 +3090,7 @@ split_static_library("ui") { + ] + } + } +- if (is_linux) { # Both desktop Linux and ChromeOS. ++ if (is_linux || is_bsd) { # Both desktop Linux and ChromeOS. + sources += [ + "certificate_dialogs.cc", + "certificate_dialogs.h", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_libgtkui_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_libgtkui_BUILD.gn new file mode 100644 index 000000000000..693bef427be8 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_libgtkui_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chrome/browser/ui/libgtkui/BUILD.gn.orig 2017-01-26 00:49:09 UTC ++++ src/3rdparty/chromium/chrome/browser/ui/libgtkui/BUILD.gn +@@ -2,7 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-assert(is_linux, "This file should only be referenced on Linux") ++assert(is_linux || is_bsd, "This file should only be referenced on Linux") + + import("//build/config/features.gni") + import("//build/config/ui.gni") diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_BUILD.gn new file mode 100644 index 000000000000..ea735ef83bea --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_BUILD.gn @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/chrome/common/BUILD.gn.orig 2017-01-26 00:49:09 UTC ++++ src/3rdparty/chromium/chrome/common/BUILD.gn +@@ -243,6 +243,13 @@ static_library("common") { + public_deps += [ "//ppapi/shared_impl" ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "component_flash_hint_file_linux.cc", ++ "component_flash_hint_file_linux.h", ++ ] ++ } ++ + if (enable_extensions) { + sources += [ + "cast_messages.cc", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc new file mode 100644 index 000000000000..70e4ab372b89 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc @@ -0,0 +1,53 @@ +--- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig 2017-01-26 00:49:09 UTC ++++ src/3rdparty/chromium/chrome/common/chrome_paths.cc +@@ -197,7 +197,7 @@ bool PathProvider(int key, base::FilePat + return false; + break; + case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: +-#if defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + if (!GetUserDownloadsDirectorySafe(&cur)) + return false; + break; +@@ -480,10 +480,12 @@ bool PathProvider(int key, base::FilePat + if (!base::PathExists(cur)) // We don't want to create this + return false; + break; +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) + case chrome::DIR_POLICY_FILES: { + #if defined(GOOGLE_CHROME_BUILD) + cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); ++#elif defined(OS_BSD) ++ cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies")); + #else + cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); + #endif +@@ -534,7 +536,7 @@ bool PathProvider(int key, base::FilePat + #endif + break; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + case chrome::DIR_NATIVE_MESSAGING: + #if defined(OS_MACOSX) + #if defined(GOOGLE_CHROME_BUILD) +@@ -548,6 +550,9 @@ bool PathProvider(int key, base::FilePat + #if defined(GOOGLE_CHROME_BUILD) + cur = base::FilePath(FILE_PATH_LITERAL( + "/etc/opt/chrome/native-messaging-hosts")); ++#elif defined(OS_BSD) ++ cur = base::FilePath(FILE_PATH_LITERAL( ++ "/usr/local/etc/chrome/native-messaging-hosts")); + #else + cur = base::FilePath(FILE_PATH_LITERAL( + "/etc/chromium/native-messaging-hosts")); +@@ -560,7 +565,7 @@ bool PathProvider(int key, base::FilePat + return false; + cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); + break; +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + #if !defined(OS_ANDROID) + case chrome::DIR_GLOBAL_GCM_STORE: + if (!PathService::Get(chrome::DIR_USER_DATA, &cur)) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.h new file mode 100644 index 000000000000..9baa579bf344 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.h @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/chrome/common/chrome_paths.h.orig 2017-01-26 00:49:09 UTC ++++ src/3rdparty/chromium/chrome/common/chrome_paths.h +@@ -49,7 +49,7 @@ enum { + // to set policies for chrome. This directory + // contains subdirectories. + #endif +-#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \ ++#if defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) || \ + defined(OS_MACOSX) + DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions + // on Chrome Mac and Chromium Linux. +@@ -58,7 +58,7 @@ enum { + // create it. + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' + // definition manifest files that + // describe extensions which are to be +@@ -112,7 +112,7 @@ enum { + DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized + // supervised user whitelists are + // installed. +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_MACOSX) + DIR_NATIVE_MESSAGING, // System directory where native messaging host + // manifest files are stored. + DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths__internal.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths__internal.h new file mode 100644 index 000000000000..3fae54f11b05 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths__internal.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chrome/common/chrome_paths_internal.h.orig 2017-01-26 00:49:09 UTC ++++ src/3rdparty/chromium/chrome/common/chrome_paths_internal.h +@@ -39,7 +39,7 @@ void GetUserCacheDirectory(const base::F + // Get the path to the user's documents directory. + bool GetUserDocumentsDirectory(base::FilePath* result); + +-#if defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + // Gets the path to a safe default download directory for a user. + bool GetUserDownloadsDirectorySafe(base::FilePath* result); + #endif diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.cc new file mode 100644 index 000000000000..5f603cd708cd --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chrome/common/chrome_switches.cc.orig 2017-01-26 00:49:09 UTC ++++ src/3rdparty/chromium/chrome/common/chrome_switches.cc +@@ -1263,7 +1263,7 @@ const char kAllowNaClSocketAPI[] + const char kEnableWaylandServer[] = "enable-wayland-server"; + #endif + +-#if defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + extern const char kDisableInputImeAPI[] = "disable-input-ime-api"; + extern const char kEnableInputImeAPI[] = "enable-input-ime-api"; + #endif diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.h new file mode 100644 index 000000000000..2330ee8c9630 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__switches.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chrome/common/chrome_switches.h.orig 2017-01-26 00:49:09 UTC ++++ src/3rdparty/chromium/chrome/common/chrome_switches.h +@@ -385,7 +385,7 @@ extern const char kAllowNaClSocketAPI[]; + extern const char kEnableWaylandServer[]; + #endif + +-#if defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + extern const char kDisableInputImeAPI[]; + extern const char kEnableInputImeAPI[]; + #endif diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_extensions_api_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_extensions_api_BUILD.gn new file mode 100644 index 000000000000..75f12f04b57a --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_extensions_api_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chrome/common/extensions/api/BUILD.gn.orig 2017-12-15 17:02:55.964660000 -0500 ++++ src/3rdparty/chromium/chrome/common/extensions/api/BUILD.gn 2017-12-15 17:03:23.878684000 -0500 +@@ -117,7 +117,7 @@ + "wallpaper.json", + "wallpaper_private.json", + ] +-} else if (is_linux || is_win) { ++} else if (is_linux || is_bsd || is_win) { + schema_sources += [ "input_ime.json" ] + } + if (enable_service_discovery) { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_features.gni b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_features.gni new file mode 100644 index 000000000000..1f84d45500e5 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_features.gni @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chrome/common/features.gni.orig 2017-01-26 00:49:10 UTC ++++ src/3rdparty/chromium/chrome/common/features.gni +@@ -43,7 +43,7 @@ declare_args() { + enable_hotwording = is_chrome_branded && is_chromeos + + enable_one_click_signin = +- is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast) ++ is_win || is_mac || is_bsd || (is_linux && !is_chromeos && !is_chromecast) + + # Set to true to bundle all the mash related mojo services into chrome. + # Specify --mash to chrome to have chrome start the mash environment. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_renderer_pepper_pepper__flash__font__file__host.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_renderer_pepper_pepper__flash__font__file__host.cc new file mode 100644 index 000000000000..a3a4cfbd5527 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_renderer_pepper_pepper__flash__font__file__host.cc @@ -0,0 +1,38 @@ +--- src/3rdparty/chromium/chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2017-01-26 00:49:10 UTC ++++ src/3rdparty/chromium/chrome/renderer/pepper/pepper_flash_font_file_host.cc +@@ -14,7 +14,7 @@ + #include "ppapi/proxy/ppapi_messages.h" + #include "ppapi/proxy/serialized_structs.h" + +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "content/public/common/child_process_sandbox_support_linux.h" + #elif defined(OS_WIN) + #include "third_party/skia/include/ports/SkFontMgr.h" +@@ -27,7 +27,7 @@ PepperFlashFontFileHost::PepperFlashFont + const ppapi::proxy::SerializedFontDescription& description, + PP_PrivateFontCharset charset) + : ResourceHost(host->GetPpapiHost(), instance, resource) { +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) + fd_.reset(content::MatchFontWithFallback( + description.face, + description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD, +@@ -44,7 +44,7 @@ PepperFlashFontFileHost::PepperFlashFont + sk_sp font_mgr(SkFontMgr::RefDefault()); + typeface_ = sk_sp( + font_mgr->matchFamilyStyle(description.face.c_str(), style)); +-#endif // defined(OS_LINUX) || defined(OS_OPENBSD) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + } + + PepperFlashFontFileHost::~PepperFlashFontFileHost() {} +@@ -63,7 +63,7 @@ bool PepperFlashFontFileHost::GetFontDat + void* buffer, + size_t* length) { + bool result = false; +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) + int fd = fd_.get(); + if (fd != -1) + result = content::GetFontTable(fd, table, 0 /* offset */, diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_renderer_pepper_pepper__flash__font__file__host.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_renderer_pepper_pepper__flash__font__file__host.h new file mode 100644 index 000000000000..4b422bb20958 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_renderer_pepper_pepper__flash__font__file__host.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2017-01-26 00:49:10 UTC ++++ src/3rdparty/chromium/chrome/renderer/pepper/pepper_flash_font_file_host.h +@@ -14,7 +14,7 @@ + #include "ppapi/c/private/pp_private_font_charset.h" + #include "ppapi/host/resource_host.h" + +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/files/scoped_file.h" + #elif defined(OS_WIN) + #include "third_party/skia/include/core/SkRefCnt.h" +@@ -50,7 +50,7 @@ class PepperFlashFontFileHost : public p + uint32_t table); + bool GetFontData(uint32_t table, void* buffer, size_t* length); + +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) + base::ScopedFD fd_; + #elif defined(OS_WIN) + sk_sp typeface_; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_test_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_test_BUILD.gn new file mode 100644 index 000000000000..7390aaad3a70 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_test_BUILD.gn @@ -0,0 +1,158 @@ +--- src/3rdparty/chromium/chrome/test/BUILD.gn.orig 2017-12-15 16:54:01.114272000 -0500 ++++ src/3rdparty/chromium/chrome/test/BUILD.gn 2017-12-15 17:01:33.586269000 -0500 +@@ -186,7 +186,7 @@ + ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + public_deps += [ "//crypto:platform" ] + } + if (is_mac) { +@@ -396,7 +396,7 @@ + "$root_out_dir/test_page.css.mock-http-headers", + "$root_out_dir/ui_test.pak", + ] +- if (is_linux || is_win) { ++ if (is_linux || is_bsd || is_win) { + data += [ + "$root_out_dir/chrome_100_percent.pak", + "$root_out_dir/chrome_200_percent.pak", +@@ -405,7 +405,7 @@ + "$root_out_dir/resources.pak", + ] + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + data += [ "$root_out_dir/libppapi_tests.so" ] + } + +@@ -512,7 +512,7 @@ + "base/interactive_test_utils_views.cc", + ] + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (!is_chromeos) { + # Desktop linux. + sources -= [ +@@ -1890,14 +1890,14 @@ + sources += [ "//third_party/liblouis/nacl_wrapper/liblouis_wrapper_browsertest.cc" ] + deps += [ "//chrome/browser/chromeos" ] + data_deps += [ "//third_party/liblouis:liblouis_test_data" ] +- } else if (is_linux || is_win) { ++ } else if (is_linux || is_bsd || is_win) { + sources += [ + "../browser/ui/views/ime/ime_warning_bubble_browsertest.cc", + "../browser/ui/views/ime/ime_window_browsertest.cc", + ] + } + +- if (is_win || is_linux) { ++ if (is_win || is_linux || is_bsd) { + sources += [ "../browser/nacl_host/test/nacl_gdb_browsertest.cc" ] + data_deps += [ "//chrome/browser/nacl_host/test:mock_nacl_gdb" ] + } +@@ -1909,7 +1909,7 @@ + configs += + [ "//build/config/win:default_large_module_incremental_linking" ] + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + data_deps += [ "//components/nacl/loader:nacl_helper" ] + + if (enable_nacl_nonsfi) { +@@ -2016,7 +2016,7 @@ + } + } + +- if (is_linux && !is_component_build) { ++ if ((is_linux || is_bsd) && !is_component_build) { + # Set rpath to find the CDM adapter even in a non-component build. + configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] + } +@@ -2243,7 +2243,7 @@ + if (toolkit_views) { + sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ] + } +- if (is_win || is_linux) { ++ if (is_win || is_linux || is_bsd) { + sources += + [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ] + } +@@ -2438,7 +2438,7 @@ + "../browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc", + ] + } +- if (is_mac || is_win || (is_linux && !is_chromeos)) { ++ if (is_mac || is_win || is_bsd || (is_linux && !is_chromeos)) { + sources += [ + # Tests for non mobile and non CrOS (includes Linux, Win, Mac). + "../browser/metrics/desktop_session_duration/audible_contents_tracker_browsertest.cc", +@@ -2626,7 +2626,7 @@ + "$root_out_dir/pyproto/", + ] + +- if (is_linux || is_win) { ++ if (is_linux || is_bsd || is_win) { + data += [ + "$root_out_dir/chrome_100_percent.pak", + "$root_out_dir/chrome_200_percent.pak", +@@ -3991,7 +3991,7 @@ + "//ui/wm", + ] + } +- if (!is_chromeos && is_linux) { ++ if (!is_chromeos && (is_linux || is_bsd)) { + sources += [ + "../browser/password_manager/native_backend_kwallet_x_unittest.cc", + "../browser/shell_integration_linux_unittest.cc", +@@ -4011,7 +4011,7 @@ + if (use_gio) { + deps += [ "//build/linux/libgio" ] + } +- if (!is_chromeos && !use_ozone && is_linux && use_gtk) { ++ if (!is_chromeos && !use_ozone && (is_linux || is_bsd) && use_gtk) { + if (use_gtk3) { + deps += [ "//chrome/browser/ui/libgtkui:libgtk3ui" ] + } else { +@@ -4305,18 +4305,18 @@ + "//components/os_crypt:gnome_keyring_direct", + ] + } +- if (is_linux && !is_chromeos && !use_ozone) { ++ if ((is_linux || is_bsd) && !is_chromeos && !use_ozone) { + sources += + [ "../browser/password_manager/native_backend_libsecret_unittest.cc" ] + deps += [ "//third_party/libsecret" ] + } +- if (is_linux && use_aura) { ++ if ((is_linux || is_bsd) && use_aura) { + deps += [ "//ui/aura:test_support" ] + if (use_dbus) { + deps += [ "//dbus:test_support" ] + } + } +- if (is_linux && is_chrome_branded && current_cpu == "x86") { ++ if ((is_linux || is_bsd) && is_chrome_branded && current_cpu == "x86") { + ldflags = [ "-Wl,--strip-debug" ] + } + if (is_mac) { +@@ -4822,7 +4822,7 @@ + } + } + +-if (!is_android) { ++if (!is_android && !is_bsd) { + # TODO(609855): Make this compile on Android and run on the bots. + test("chrome_app_unittests") { + sources = [ +@@ -4848,7 +4848,7 @@ + } + } + +-if (!is_android && !is_ios && !is_chromecast) { ++if (!is_android && !is_ios && !is_chromecast && !is_bsd) { + test("performance_browser_tests") { + sources = [ + "../app/chrome_version.rc.version", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chromecast_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chromecast_BUILD.gn new file mode 100644 index 000000000000..1453e1735836 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chromecast_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chromecast/BUILD.gn.orig 2017-01-26 00:49:11 UTC ++++ src/3rdparty/chromium/chromecast/BUILD.gn +@@ -51,7 +51,7 @@ cast_test_group("cast_tests") { + tests += [ "//gpu:gpu_unittests" ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + tests += [ "//chromecast/crash:cast_crash_unittests" ] + } + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chromecast_browser_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chromecast_browser_BUILD.gn new file mode 100644 index 000000000000..35af0c17b7ba --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chromecast_browser_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chromecast/browser/BUILD.gn.orig 2017-01-26 00:49:11 UTC ++++ src/3rdparty/chromium/chromecast/browser/BUILD.gn +@@ -120,7 +120,7 @@ source_set("browser") { + "//ui/gl", + ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ + "cast_memory_pressure_monitor.cc", + "cast_memory_pressure_monitor.h", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chromecast_browser_metrics_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chromecast_browser_metrics_BUILD.gn new file mode 100644 index 000000000000..24a68e140384 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chromecast_browser_metrics_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chromecast/browser/metrics/BUILD.gn.orig 2017-01-26 00:49:11 UTC ++++ src/3rdparty/chromium/chromecast/browser/metrics/BUILD.gn +@@ -26,7 +26,7 @@ source_set("metrics") { + "//content/public/common", + ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ + "external_metrics.cc", + "external_metrics.h", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chromecast_crash_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chromecast_crash_BUILD.gn new file mode 100644 index 000000000000..23836f20db01 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chromecast_crash_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/chromecast/crash/BUILD.gn.orig 2017-01-26 00:49:11 UTC ++++ src/3rdparty/chromium/chromecast/crash/BUILD.gn +@@ -78,7 +78,7 @@ source_set("test_support") { + ] + } + +-if (is_linux) { ++if (is_linux || is_bsd) { + test("cast_crash_unittests") { + sources = [ + "cast_crashdump_uploader_unittest.cc", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_BUILD.gn new file mode 100644 index 000000000000..7b2aee02eb9d --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_BUILD.gn @@ -0,0 +1,13 @@ +--- src/3rdparty/chromium/components/BUILD.gn.orig 2017-01-26 00:49:11 UTC ++++ src/3rdparty/chromium/components/BUILD.gn +@@ -168,8 +168,8 @@ test("components_unittests") { + "//components/certificate_reporting:unit_tests", + "//components/certificate_transparency:unit_tests", + "//components/contextual_search:unit_tests", +- "//components/crash/content/app:unit_tests", +- "//components/crash/core/common:unit_tests", ++ #"//components/crash/content/app:unit_tests", ++ #"//components/crash/core/common:unit_tests", + "//components/data_reduction_proxy/content/browser:unit_tests", + "//components/data_reduction_proxy/core/browser:unit_tests", + "//components/data_reduction_proxy/core/common:unit_tests", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_autofill_content_renderer_password__form__conversion__utils.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_autofill_content_renderer_password__form__conversion__utils.cc new file mode 100644 index 000000000000..877cc9c306d3 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_autofill_content_renderer_password__form__conversion__utils.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2017-01-26 00:49:11 UTC ++++ src/3rdparty/chromium/components/autofill/content/renderer/password_form_conversion_utils.cc +@@ -28,7 +28,11 @@ + #include "third_party/WebKit/public/web/WebFormControlElement.h" + #include "third_party/WebKit/public/web/WebFrame.h" + #include "third_party/WebKit/public/web/WebInputElement.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + using blink::WebDocument; + using blink::WebFormControlElement; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_content__settings_core_browser_website__settings__registry.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_content__settings_core_browser_website__settings__registry.cc new file mode 100644 index 000000000000..07903c7432cb --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_content__settings_core_browser_website__settings__registry.cc @@ -0,0 +1,12 @@ +--- src/3rdparty/chromium/components/content_settings/core/browser/website_settings_registry.cc.orig 2017-01-26 00:49:11 UTC ++++ src/3rdparty/chromium/components/content_settings/core/browser/website_settings_registry.cc +@@ -88,6 +88,9 @@ const WebsiteSettingsInfo* WebsiteSettin + // doesn't allow the settings to be managed in the same way. See + // crbug.com/642184. + sync_status = WebsiteSettingsInfo::UNSYNCABLE; ++#elif defined(OS_BSD) ++ if (!(platform & PLATFORM_BSD)) ++ return nullptr; + #else + #error "Unsupported platform" + #endif diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_content__settings_core_browser_website__settings__registry.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_content__settings_core_browser_website__settings__registry.h new file mode 100644 index 000000000000..66850098f6b7 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_content__settings_core_browser_website__settings__registry.h @@ -0,0 +1,15 @@ +--- src/3rdparty/chromium/components/content_settings/core/browser/website_settings_registry.h.orig 2017-01-26 00:49:11 UTC ++++ src/3rdparty/chromium/components/content_settings/core/browser/website_settings_registry.h +@@ -36,10 +36,11 @@ class WebsiteSettingsRegistry { + PLATFORM_MAC = 1 << 3, + PLATFORM_ANDROID = 1 << 4, + PLATFORM_IOS = 1 << 5, ++ PLATFORM_BSD = 1 << 6, + + // Settings only applied to win, mac, linux and chromeos. + DESKTOP = +- PLATFORM_WINDOWS | PLATFORM_LINUX | PLATFORM_CHROMEOS | PLATFORM_MAC, ++ PLATFORM_WINDOWS | PLATFORM_LINUX | PLATFORM_CHROMEOS | PLATFORM_MAC | PLATFORM_BSD, + + // Settings applied to all platforms, including win, mac, linux, chromeos, + // android, ios. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_cookie__config_cookie__store__util.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_cookie__config_cookie__store__util.cc new file mode 100644 index 000000000000..13a088410487 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_cookie__config_cookie__store__util.cc @@ -0,0 +1,24 @@ +--- src/3rdparty/chromium/components/cookie_config/cookie_store_util.cc.orig 2017-01-26 00:49:11 UTC ++++ src/3rdparty/chromium/components/cookie_config/cookie_store_util.cc +@@ -11,7 +11,7 @@ + + namespace cookie_config { + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + namespace { + + // Use the operating system's mechanisms to encrypt cookies before writing +@@ -63,10 +63,10 @@ base::LazyInstance ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + using re2::RE2; + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc new file mode 100644 index 000000000000..71ad5583288a --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_flags__ui_flags__state.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/flags_ui/flags_state.cc.orig 2017-01-26 00:49:11 UTC ++++ src/3rdparty/chromium/components/flags_ui/flags_state.cc +@@ -544,7 +544,7 @@ int FlagsState::GetCurrentPlatform() { + return kOsWin; + #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. + return kOsCrOS; +-#elif defined(OS_LINUX) || defined(OS_OPENBSD) ++#elif defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_FREEBSD) + return kOsLinux; + #elif defined(OS_ANDROID) + return kOsAndroid; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_json__schema_json__schema__validator.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_json__schema_json__schema__validator.cc new file mode 100644 index 000000000000..00c1d7e3eecd --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_json__schema_json__schema__validator.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/components/json_schema/json_schema_validator.cc.orig 2017-01-26 00:49:11 UTC ++++ src/3rdparty/chromium/components/json_schema/json_schema_validator.cc +@@ -21,7 +21,11 @@ + #include "base/strings/stringprintf.h" + #include "base/values.h" + #include "components/json_schema/json_schema_constants.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace schema = json_schema_constants; + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_keyed__service_core_dependency__graph__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_keyed__service_core_dependency__graph__unittest.cc new file mode 100644 index 000000000000..b95d02621378 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_keyed__service_core_dependency__graph__unittest.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/components/keyed_service/core/dependency_graph_unittest.cc.orig 2017-01-26 00:49:11 UTC ++++ src/3rdparty/chromium/components/keyed_service/core/dependency_graph_unittest.cc +@@ -9,7 +9,11 @@ + #include "components/keyed_service/core/dependency_graph.h" + #include "components/keyed_service/core/dependency_node.h" + #include "testing/gtest/include/gtest/gtest.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace { + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_BUILD.gn new file mode 100644 index 000000000000..10eb1234e1b6 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_BUILD.gn @@ -0,0 +1,34 @@ +--- src/3rdparty/chromium/components/metrics/BUILD.gn.orig 2017-01-26 00:49:12 UTC ++++ src/3rdparty/chromium/components/metrics/BUILD.gn +@@ -107,6 +107,13 @@ static_library("metrics") { + if (is_win) { + sources -= [ "machine_id_provider_stub.cc" ] + } ++ ++ if (is_bsd) { ++ sources -= [ ++ "system_memory_stats_recorder_linux.cc" ++ ] ++ } ++ + } + + if (!is_ios) { +@@ -282,7 +289,7 @@ static_library("test_support") { + ] + } + +-if (is_linux) { ++if (is_linux || is_bsd) { + static_library("serialization") { + sources = [ + "serialization/metric_sample.cc", +@@ -341,7 +348,7 @@ source_set("unit_tests") { + "//ui/gfx/geometry", + ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ "serialization/serialization_utils_unittest.cc" ] + deps += [ ":serialization" ] + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_drive__metrics__provider__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_drive__metrics__provider__linux.cc new file mode 100644 index 000000000000..dc4beaaa0b41 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_drive__metrics__provider__linux.cc @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/components/metrics/drive_metrics_provider_linux.cc.orig 2017-01-26 00:49:12 UTC ++++ src/3rdparty/chromium/components/metrics/drive_metrics_provider_linux.cc +@@ -4,7 +4,13 @@ + + #include "components/metrics/drive_metrics_provider.h" + ++#if defined(OS_BSD) ++#include ++#define MAJOR(dev) major(dev) ++#define MINOR(dev) minor(dev) ++#else + #include // For MAJOR()/MINOR(). ++#endif + #include + #include + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_system__memory__stats__recorder__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_system__memory__stats__recorder__linux.cc new file mode 100644 index 000000000000..fea99313b8c6 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_metrics_system__memory__stats__recorder__linux.cc @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/components/metrics/system_memory_stats_recorder_linux.cc.orig 2017-01-26 00:49:12 UTC ++++ src/3rdparty/chromium/components/metrics/system_memory_stats_recorder_linux.cc +@@ -30,6 +30,7 @@ namespace metrics { + UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50) + + void RecordMemoryStats(RecordMemoryStatsType type) { ++#if !defined(OS_FREEBSD) + base::SystemMemoryInfoKB memory; + if (!base::GetSystemMemoryInfo(&memory)) + return; +@@ -93,6 +94,7 @@ void RecordMemoryStats(RecordMemoryStats + break; + } + } ++#endif // !defined(OS_FREEBSD) + } + + } // namespace metrics diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js new file mode 100644 index 000000000000..2095dfe0043c --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/neterror/resources/neterror.js.orig 2017-01-26 00:49:12 UTC ++++ src/3rdparty/chromium/components/neterror/resources/neterror.js +@@ -150,7 +150,7 @@ function setUpCachedButton(buttonStrings + } + + var primaryControlOnLeft = true; +- ++ + primaryControlOnLeft = false; + + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_os__crypt.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_os__crypt.h new file mode 100644 index 000000000000..2555adc57c05 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_os__crypt_os__crypt.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/components/os_crypt/os_crypt.h.orig 2017-01-26 00:49:12 UTC ++++ src/3rdparty/chromium/components/os_crypt/os_crypt.h +@@ -13,7 +13,7 @@ + #include "base/strings/string16.h" + #include "build/build_config.h" + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + #include "components/os_crypt/key_storage_linux.h" + #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) + +@@ -23,7 +23,7 @@ + // true for Linux, if a password management tool is available. + class OSCrypt { + public: +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // If |store_type| is a known password store, we will attempt to use it. + // In any other case, we default to auto-detecting the store. + // This should not be changed after OSCrypt has been used. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_import_csv__reader.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_import_csv__reader.cc new file mode 100644 index 000000000000..639816741f84 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_password__manager_core_browser_import_csv__reader.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/components/password_manager/core/browser/import/csv_reader.cc.orig 2017-01-26 00:49:12 UTC ++++ src/3rdparty/chromium/components/password_manager/core/browser/import/csv_reader.cc +@@ -9,7 +9,11 @@ + #include "base/logging.h" + #include "base/macros.h" + #include "base/strings/string_util.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace { + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_plugins_renderer_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_plugins_renderer_BUILD.gn new file mode 100644 index 000000000000..a8cf37fc1594 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_plugins_renderer_BUILD.gn @@ -0,0 +1,17 @@ +--- src/3rdparty/chromium/components/plugins/renderer/BUILD.gn.orig 2017-01-26 00:49:12 UTC ++++ src/3rdparty/chromium/components/plugins/renderer/BUILD.gn +@@ -19,6 +19,7 @@ static_library("renderer") { + } + + deps = [ ++ "//v8", + "//content/public/child", + "//content/public/common", + "//content/public/renderer", +@@ -27,6 +28,5 @@ static_library("renderer") { + "//third_party/WebKit/public:blink", + "//third_party/re2", + "//ui/base", +- "//v8", + ] + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_plugins_renderer_plugin__placeholder.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_plugins_renderer_plugin__placeholder.cc new file mode 100644 index 000000000000..9fde7c0b907f --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_plugins_renderer_plugin__placeholder.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/components/plugins/renderer/plugin_placeholder.cc.orig 2017-01-26 00:49:12 UTC ++++ src/3rdparty/chromium/components/plugins/renderer/plugin_placeholder.cc +@@ -11,7 +11,11 @@ + #include "gin/object_template_builder.h" + #include "third_party/WebKit/public/web/WebElement.h" + #include "third_party/WebKit/public/web/WebPluginContainer.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace plugins { + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_policy_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_policy_BUILD.gn new file mode 100644 index 000000000000..d2848ad0ee61 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_policy_BUILD.gn @@ -0,0 +1,19 @@ +--- src/3rdparty/chromium/components/policy/BUILD.gn.orig 2017-01-26 00:49:12 UTC ++++ src/3rdparty/chromium/components/policy/BUILD.gn +@@ -14,6 +14,7 @@ import("//tools/grit/grit_rule.gni") + gen_policy_templates_common = true + gen_policy_templates_win = is_win + gen_policy_templates_linux = is_linux ++gen_policy_templates_bsd = is_bsd + gen_policy_templates_android = is_android + gen_policy_templates_mac = is_mac + +@@ -126,7 +127,7 @@ if (enable_configuration_policy) { + outputs += policy_templates_android_outputs + defines += [ "gen_policy_templates_android" ] + } +- if (gen_policy_templates_linux) { ++ if (gen_policy_templates_linux || gen_policy_templates_bsd) { + outputs += policy_templates_linux_outputs + defines += [ "gen_policy_templates_linux" ] + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_BUILD.gn new file mode 100644 index 000000000000..5218e0c347eb --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_BUILD.gn @@ -0,0 +1,24 @@ +--- src/3rdparty/chromium/components/storage_monitor/BUILD.gn.orig 2017-01-26 00:49:12 UTC ++++ src/3rdparty/chromium/components/storage_monitor/BUILD.gn +@@ -65,6 +65,21 @@ static_library("storage_monitor") { + ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "mtab_watcher_linux.cc", ++ "mtab_watcher_linux.h", ++ "storage_monitor_linux.cc", ++ "storage_monitor_linux.h", ++ "udev_util_linux.cc", ++ "udev_util_linux.h", ++ ] ++ sources += [ ++ "storage_monitor_freebsd.cc", ++ "storage_monitor_freebsd.h", ++ ] ++ } ++ + if (use_udev) { + deps += [ "//device/udev_linux" ] + } else if (is_linux) { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_storage__monitor.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_storage__monitor.cc new file mode 100644 index 000000000000..d8e0957e8ec5 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_storage__monitor.cc @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/components/storage_monitor/storage_monitor.cc.orig 2017-01-26 00:49:12 UTC ++++ src/3rdparty/chromium/components/storage_monitor/storage_monitor.cc +@@ -85,6 +85,7 @@ std::vector StorageMonitor: + + void StorageMonitor::EnsureInitialized(base::Closure callback) { + DCHECK(thread_checker_.CalledOnValidThread()); ++//#if !defined(OS_BSD) //XXX(rene) why disabled? + if (initialized_) { + if (!callback.is_null()) + callback.Run(); +@@ -100,6 +101,7 @@ void StorageMonitor::EnsureInitialized(b + + initializing_ = true; + Init(); ++//#endif + } + + bool StorageMonitor::IsInitialized() const { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_storage__monitor__freebsd.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_storage__monitor__freebsd.cc new file mode 100644 index 000000000000..3b8928961207 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_storage__monitor__freebsd.cc @@ -0,0 +1,104 @@ +--- src/3rdparty/chromium/components/storage_monitor/storage_monitor_freebsd.cc.orig 2017-01-29 22:59:23 UTC ++++ src/3rdparty/chromium/components/storage_monitor/storage_monitor_freebsd.cc +@@ -0,0 +1,101 @@ ++// Copyright 2014 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++// StorageMonitorFreeBSD implementation. ++ ++#include "components/storage_monitor/storage_monitor_freebsd.h" ++ ++#include ++ ++#include ++ ++#include "base/bind.h" ++#include "base/metrics/histogram.h" ++#include "base/process/kill.h" ++#include "base/process/launch.h" ++#include "base/stl_util.h" ++#include "base/strings/string_number_conversions.h" ++#include "base/strings/string_util.h" ++#include "base/strings/utf_string_conversions.h" ++#include "components/storage_monitor/media_storage_util.h" ++#include "components/storage_monitor/removable_device_constants.h" ++#include "components/storage_monitor/storage_info.h" ++ ++using content::BrowserThread; ++ ++namespace storage_monitor { ++ ++namespace { ++ ++// udev device property constants. ++const char kBlockSubsystemKey[] = "block"; ++const char kDiskDeviceTypeKey[] = "disk"; ++const char kFsUUID[] = "ID_FS_UUID"; ++const char kLabel[] = "ID_FS_LABEL"; ++const char kModel[] = "ID_MODEL"; ++const char kModelID[] = "ID_MODEL_ID"; ++const char kRemovableSysAttr[] = "removable"; ++const char kSerialShort[] = "ID_SERIAL_SHORT"; ++const char kSizeSysAttr[] = "size"; ++const char kVendor[] = "ID_VENDOR"; ++const char kVendorID[] = "ID_VENDOR_ID"; ++ ++StorageMonitor::EjectStatus EjectPathOnFileThread( ++ const base::FilePath& path, ++ const base::FilePath& device) { ++ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); ++ ++ static const char kUmountBinary[] = "/sbin/umount"; ++ std::vector command; ++ command.push_back(kUmountBinary); ++ command.push_back(path.value()); ++ ++ base::LaunchOptions options; ++ base::Process process = base::LaunchProcess(command, options); ++ if (!process.IsValid()) ++ return StorageMonitor::EJECT_FAILURE; ++ ++ int exit_code = -1; ++ if (!process.WaitForExitWithTimeout(base::TimeDelta::FromMilliseconds(3000), ++ &exit_code)) { ++ process.Terminate(-1, false); ++ base::EnsureProcessTerminated(std::move(process)); ++ return StorageMonitor::EJECT_FAILURE; ++ } ++ ++ // TODO(gbillock): Make sure this is found in documentation ++ // somewhere. Experimentally it seems to hold that exit code ++ // 1 means device is in use. ++ if (exit_code == 1) ++ return StorageMonitor::EJECT_IN_USE; ++ if (exit_code != 0) ++ return StorageMonitor::EJECT_FAILURE; ++ ++ return StorageMonitor::EJECT_OK; ++} ++ ++} // namespace ++ ++StorageMonitorFreeBSD::StorageMonitorFreeBSD() { ++ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); ++} ++ ++StorageMonitorFreeBSD::~StorageMonitorFreeBSD() { ++ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); ++} ++ ++void StorageMonitorFreeBSD::Init() { ++} ++ ++bool StorageMonitorFreeBSD::GetStorageInfoForPath( ++ const base::FilePath& path, ++ StorageInfo* device_info) const { ++ return false; // TODO ++} ++ ++StorageMonitor* StorageMonitor::CreateInternal() { ++ return new StorageMonitorFreeBSD(); ++} ++ ++} // namespace storage_monitor diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_storage__monitor__freebsd.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_storage__monitor__freebsd.h new file mode 100644 index 000000000000..0194a8cc6d9a --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_storage__monitor_storage__monitor__freebsd.h @@ -0,0 +1,48 @@ +--- src/3rdparty/chromium/components/storage_monitor/storage_monitor_freebsd.h.orig 2017-01-29 22:59:23 UTC ++++ src/3rdparty/chromium/components/storage_monitor/storage_monitor_freebsd.h +@@ -0,0 +1,45 @@ ++// Copyright 2014 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++// StorageMonitorFreeBSD processes mount point change events, notifies listeners ++// about the addition and deletion of media devices, and answers queries about ++// mounted devices. ++// StorageMonitorFreeBSD lives on the UI thread, and uses ??? ++// the FILE thread to get mount point change events. ++ ++#ifndef COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_ ++#define COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_ ++ ++#include ++#include ++ ++#include "base/compiler_specific.h" ++#include "base/files/file_path.h" ++#include "base/files/file_path_watcher.h" ++#include "base/memory/weak_ptr.h" ++#include "components/storage_monitor/storage_monitor.h" ++#include "content/public/browser/browser_thread.h" ++ ++namespace storage_monitor { ++ ++class StorageMonitorFreeBSD : public StorageMonitor { ++ public: ++ // Should only be called by browser start up code. ++ // Use StorageMonitor::GetInstance() instead. ++ explicit StorageMonitorFreeBSD(); ++ virtual ~StorageMonitorFreeBSD(); ++ ++ // Must be called for StorageMonitorFreeBSD to work. ++ virtual void Init() override; ++ private: ++ // StorageMonitor implementation. ++ virtual bool GetStorageInfoForPath(const base::FilePath& path, ++ StorageInfo* device_info) const override; ++ ++ DISALLOW_COPY_AND_ASSIGN(StorageMonitorFreeBSD); ++}; ++ ++} // namespace storage_monitor ++ ++#endif // COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_ diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_update__client_update__query__params.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_update__client_update__query__params.cc new file mode 100644 index 000000000000..c80bdd0f6eba --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_update__client_update__query__params.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/components/update_client/update_query_params.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/components/update_client/update_query_params.cc +@@ -31,6 +31,8 @@ const char kOs[] = + "linux"; + #elif defined(OS_OPENBSD) + "openbsd"; ++#elif defined(OS_FREEBSD) ++ "freebsd"; + #else + #error "unknown os" + #endif diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_url__matcher_regex__set__matcher.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_url__matcher_regex__set__matcher.cc new file mode 100644 index 000000000000..aed9000b28c8 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_url__matcher_regex__set__matcher.cc @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/components/url_matcher/regex_set_matcher.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/components/url_matcher/regex_set_matcher.cc +@@ -10,8 +10,13 @@ + #include "base/memory/ptr_util.h" + #include "base/strings/string_util.h" + #include "components/url_matcher/substring_set_matcher.h" ++#if defined(OS_BSD) ++#include ++#include ++#else + #include "third_party/re2/src/re2/filtered_re2.h" + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace url_matcher { + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_url__matcher_url__matcher__factory.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_url__matcher_url__matcher__factory.cc new file mode 100644 index 000000000000..9936a04158ec --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_url__matcher_url__matcher__factory.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/components/url_matcher/url_matcher_factory.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/components/url_matcher/url_matcher_factory.cc +@@ -16,7 +16,11 @@ + #include "base/values.h" + #include "components/url_matcher/url_matcher_constants.h" + #include "components/url_matcher/url_matcher_helpers.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace url_matcher { + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_variations_proto_study.proto b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_variations_proto_study.proto new file mode 100644 index 000000000000..612325bf8d0d --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_variations_proto_study.proto @@ -0,0 +1,10 @@ +--- src/3rdparty/chromium/components/variations/proto/study.proto.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/components/variations/proto/study.proto +@@ -186,6 +186,7 @@ message Study { + PLATFORM_CHROMEOS = 3; + PLATFORM_ANDROID = 4; + PLATFORM_IOS = 5; ++ PLATFORM_BSD = 6; + } + + // Possible form factors Chrome is running on. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_webcrypto_algorithms_test__helpers.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_webcrypto_algorithms_test__helpers.cc new file mode 100644 index 000000000000..b6925a13513f --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_webcrypto_algorithms_test__helpers.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/components/webcrypto/algorithms/test_helpers.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/components/webcrypto/algorithms/test_helpers.cc +@@ -25,7 +25,11 @@ + #include "components/webcrypto/status.h" + #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h" + #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace webcrypto { + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_app_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_app_BUILD.gn new file mode 100644 index 000000000000..10252e709263 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_app_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/app/BUILD.gn.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/app/BUILD.gn +@@ -68,7 +68,7 @@ template("implement_content_app") { + ] + } + +- if (is_linux && enable_plugins) { ++ if ((is_linux || is_bsd) && enable_plugins) { + content_app_deps += [ "//content/ppapi_plugin:ppapi_plugin_sources" ] + } + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner.cc index 463bf3fe17c2..623d39b8bc9e 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_app_content__main__runner.cc @@ -1,7 +1,19 @@ -We currently do not use the zygote code that Linux does. ---- src/3rdparty/chromium/content/app/content_main_runner.cc.orig 2017-04-19 16:52:23 UTC +--- src/3rdparty/chromium/content/app/content_main_runner.cc.orig 2017-01-26 00:49:13 UTC +++ src/3rdparty/chromium/content/app/content_main_runner.cc -@@ -265,7 +265,7 @@ struct MainFunction { +@@ -97,10 +97,10 @@ + #include "base/posix/global_descriptors.h" + #include "content/public/common/content_descriptors.h" + +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) + #include "content/public/common/zygote_fork_delegate_linux.h" + #endif +-#if !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + #include "content/zygote/zygote_main.h" + #endif + +@@ -290,7 +290,7 @@ struct MainFunction { int (*function)(const MainFunctionParams&); }; @@ -10,16 +22,16 @@ We currently do not use the zygote code that Linux does. // On platforms that use the zygote, we have a special subset of // subprocesses that are launched via the zygote. This function // fills in some process-launching bits around ZygoteMain(). -@@ -314,7 +314,7 @@ int RunZygote(const MainFunctionParams& +@@ -342,7 +342,7 @@ int RunZygote(const MainFunctionParams& NOTREACHED() << "Unknown zygote process type: " << process_type; return 1; } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - #if !defined(OS_IOS) static void RegisterMainThreadFactories() { -@@ -385,7 +385,7 @@ int RunNamedProcessTypeMain( + #if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD) +@@ -409,7 +409,7 @@ int RunNamedProcessTypeMain( } } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn new file mode 100644 index 000000000000..4d27ac0a447e --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_BUILD.gn @@ -0,0 +1,68 @@ +--- src/3rdparty/chromium/content/browser/BUILD.gn.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/browser/BUILD.gn +@@ -1421,10 +1421,11 @@ source_set("browser") { + "memory/memory_monitor_chromeos.cc", + "memory/memory_monitor_chromeos.h", + ] +- } else { +- sources += [ +- "memory/memory_monitor_linux.cc", +- "memory/memory_monitor_linux.h", ++ } ++ ++ if (is_bsd) { ++ sources -= [ ++ "download/quarantine_linux.cc", + ] + } + +@@ -1490,7 +1491,7 @@ source_set("browser") { + if (!is_ios) { + defines += [ "ENABLE_SCREEN_CAPTURE=1" ] + } +- if (is_linux || is_mac || is_win) { ++ if (is_linux || is_bsd || is_mac || is_win) { + sources += [ + "media/capture/desktop_capture_device.cc", + "media/capture/desktop_capture_device.h", +@@ -1657,7 +1658,7 @@ source_set("browser") { + } + } + +- if (is_linux && use_aura) { ++ if ((is_linux || is_bsd) && use_aura) { + deps += [ "//build/linux:fontconfig" ] + } + +@@ -1807,6 +1808,17 @@ source_set("browser") { + "//chromeos", + "//chromeos:power_manager_proto", + ] ++ } else if (is_bsd) { ++ sources -= [ ++ "zygote_host/zygote_communication_linux.cc", ++ "zygote_host/zygote_communication_linux.h", ++ "zygote_host/zygote_handle_linux.cc", ++ "zygote_host/zygote_host_impl_linux.cc", ++ "zygote_host/zygote_host_impl_linux.h", ++ "../zygote/zygote_linux.cc", ++ "../zygote/zygote_linux.h", ++ "../zygote/zygote_main_linux.cc", ++ ] + } + + if (enable_mojo_media) { +@@ -1930,11 +1942,11 @@ source_set("browser") { + deps += [ "//third_party/flac" ] + } + +- if (is_linux && use_dbus) { ++ if ((is_linux || is_bsd) && use_dbus) { + deps += [ "//dbus" ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + deps += [ "//third_party/boringssl" ] + } + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_accessibility_browser__accessibility__manager.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_accessibility_browser__accessibility__manager.h new file mode 100644 index 000000000000..6cb12aaeb8d4 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_accessibility_browser__accessibility__manager.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/content/browser/accessibility/browser_accessibility_manager.h.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/browser/accessibility/browser_accessibility_manager.h +@@ -34,7 +34,7 @@ class BrowserAccessibilityManager; + class BrowserAccessibilityManagerAndroid; + #elif defined(OS_WIN) + class BrowserAccessibilityManagerWin; +-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11) ++#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11) + class BrowserAccessibilityManagerAuraLinux; + #elif defined(OS_MACOSX) + class BrowserAccessibilityManagerMac; +@@ -244,7 +244,7 @@ class CONTENT_EXPORT BrowserAccessibilit + BrowserAccessibilityManagerAndroid* ToBrowserAccessibilityManagerAndroid(); + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11) + BrowserAccessibilityManagerAuraLinux* + ToBrowserAccessibilityManagerAuraLinux(); + #endif diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc index 581ee661f289..109734a8e96c 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_browser__main__loop.cc @@ -1,6 +1,17 @@ ---- src/3rdparty/chromium/content/browser/browser_main_loop.cc.orig 2017-04-11 14:08:45 UTC +--- src/3rdparty/chromium/content/browser/browser_main_loop.cc.orig 2017-01-26 00:49:13 UTC +++ src/3rdparty/chromium/content/browser/browser_main_loop.cc -@@ -189,7 +189,7 @@ +@@ -203,6 +203,10 @@ + #include "gpu/vulkan/vulkan_implementation.h" + #endif + ++#if defined(OS_BSD) ++#include "content/common/child_process_sandbox_support_impl_linux.h" ++#endif ++ + // One of the linux specific headers defines this as a macro. + #ifdef DestroyAll + #undef DestroyAll +@@ -211,7 +215,7 @@ namespace content { namespace { @@ -8,13 +19,21 @@ +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) void SetupSandbox(const base::CommandLine& parsed_command_line) { TRACE_EVENT0("startup", "SetupSandbox"); - base::FilePath sandbox_binary; -@@ -440,7 +440,7 @@ void BrowserMainLoop::EarlyInitialization() { + if (parsed_command_line.HasSwitch(switches::kNoZygote)) { +@@ -482,10 +486,15 @@ void BrowserMainLoop::Init() { + void BrowserMainLoop::EarlyInitialization() { TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization"); - TRACK_SCOPED_REGION("Startup", "BrowserMainLoop::EarlyInitialization"); -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) // No thread should be created before this call, as SetupSandbox() // will end-up using fork(). SetupSandbox(parsed_command_line_); ++#elif defined(OS_BSD) ++ RenderSandboxHostLinux::GetInstance()->Init(); ++ base::FileHandleMappingVector fds_to_map; ++ const int sfd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket(); ++ fds_to_map.push_back(std::make_pair(sfd, GetSandboxFD())); + #endif + + #if defined(USE_X11) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher.cc index 09096ee56fd4..3c13b756ff22 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_child__process__launcher.cc @@ -1,15 +1,24 @@ ---- src/3rdparty/chromium/content/browser/child_process_launcher.cc.orig 2017-04-11 14:08:45 UTC +--- src/3rdparty/chromium/content/browser/child_process_launcher.cc.orig 2017-01-26 00:49:13 UTC +++ src/3rdparty/chromium/content/browser/child_process_launcher.cc -@@ -198,7 +198,7 @@ void LaunchOnLauncherThread(const NotifyCallback& call +@@ -249,7 +249,7 @@ void LaunchOnLauncherThread(const Notify // We need to close the client end of the IPC channel to reliably detect // child termination. -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) - if (use_zygote) { - base::ProcessHandle handle = ZygoteHostImpl::GetInstance()->ForkRequest( - cmd_line->argv(), std::move(files_to_register), process_type); -@@ -296,7 +296,7 @@ void TerminateOnLauncherThread(bool zygote, base::Proc + ZygoteHandle* zygote_handle = + !base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) + ? delegate->GetZygote() +@@ -267,7 +267,7 @@ void LaunchOnLauncherThread(const Notify + process = base::Process(handle); + } else + // Fall through to the normal posix case below when we're not zygoting. +-#endif // !defined(OS_MACOSX) ++#endif // !defined(OS_MACOSX) && !defined(OS_BSD) + { + // Convert FD mapping to FileHandleMappingVector + base::FileHandleMappingVector fds_to_map = +@@ -358,7 +358,7 @@ void TerminateOnLauncherThread(ZygoteHan process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. #if defined(OS_POSIX) @@ -18,18 +27,18 @@ if (zygote) { // If the renderer was created via a zygote, we have to proxy the reaping // through the zygote process. -@@ -398,7 +398,7 @@ void ChildProcessLauncher::Launch( +@@ -475,7 +475,7 @@ void ChildProcessLauncher::Launch(Sandbo void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) { DCHECK(CalledOnValidThread()); -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) if (zygote_) { - termination_status_ = ZygoteHostImpl::GetInstance()-> - GetTerminationStatus(process_.Handle(), known_dead, &exit_code_); -@@ -469,7 +469,7 @@ void ChildProcessLauncher::Notify( - starting_ = false; - process_ = std::move(process); + termination_status_ = zygote_->GetTerminationStatus( + process_.Handle(), known_dead, &exit_code_); +@@ -549,7 +549,7 @@ void ChildProcessLauncher::Notify(Zygote + mojo_child_token_, process_error_callback_); + } -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_device__sensors_data__fetcher__shared__memory.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_device__sensors_data__fetcher__shared__memory.h new file mode 100644 index 000000000000..088e7345670f --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_device__sensors_data__fetcher__shared__memory.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/browser/device_sensors/data_fetcher_shared_memory.h.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/browser/device_sensors/data_fetcher_shared_memory.h +@@ -45,7 +45,7 @@ class CONTENT_EXPORT DataFetcherSharedMe + bool Start(ConsumerType consumer_type, void* buffer) override; + bool Stop(ConsumerType consumer_type) override; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + #if !defined(OS_CHROMEOS) + DeviceMotionHardwareBuffer* motion_buffer_ = nullptr; + DeviceOrientationHardwareBuffer* orientation_buffer_ = nullptr; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_color__picker.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_color__picker.cc new file mode 100644 index 000000000000..daf564db3025 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_color__picker.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/browser/devtools/protocol/color_picker.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/browser/devtools/protocol/color_picker.cc +@@ -151,7 +151,7 @@ void ColorPicker::UpdateCursor() { + // magnified projection only with centered hotspot. + // Mac Retina requires cursor to be > 120px in order to render smoothly. + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + const float kCursorSize = 63; + const float kDiameter = 63; + const float kHotspotOffset = 32; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_download_base__file.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_download_base__file.cc new file mode 100644 index 000000000000..9d8de327d31e --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_download_base__file.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/content/browser/download/base_file.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/browser/download/base_file.cc +@@ -373,7 +373,7 @@ DownloadInterruptReason BaseFile::LogInt + return reason; + } + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + namespace { + +@@ -456,7 +456,7 @@ DownloadInterruptReason BaseFile::Annota + } + return DOWNLOAD_INTERRUPT_REASON_FILE_FAILED; + } +-#else // !OS_WIN && !OS_MACOSX && !OS_LINUX ++#else // !OS_WIN && !OS_MACOSX && !OS_LINUX && !OS_BSD + DownloadInterruptReason BaseFile::AnnotateWithSourceInformation( + const std::string& client_guid, + const GURL& source_url, diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_download_file__metadata__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_download_file__metadata__linux.cc deleted file mode 100644 index c74bda54f05f..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_download_file__metadata__linux.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/content/browser/download/file_metadata_linux.cc.orig 2017-04-20 13:00:41 UTC -+++ src/3rdparty/chromium/content/browser/download/file_metadata_linux.cc -@@ -6,7 +6,7 @@ - - #include - #include --#include -+#include - - #include "base/files/file_path.h" - #include "base/files/file_util.h" -@@ -21,7 +21,7 @@ const char kReferrerURLAttrName[] = "use - static void SetExtendedFileAttribute(const char* path, const char* name, - const char* value, size_t value_size, - int flags) { -- int result = setxattr(path, name, value, value_size, flags); -+ int result = extattr_set_file(path, EXTATTR_NAMESPACE_USER, name, value, value_size); - if (result) { - DPLOG(ERROR) - << "Could not set extended attribute " << name << " on file " << path; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_frame__host_render__widget__host__view__guest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_frame__host_render__widget__host__view__guest.cc deleted file mode 100644 index 5dca5f09aafc..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_frame__host_render__widget__host__view__guest.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- src/3rdparty/chromium/content/browser/frame_host/render_widget_host_view_guest.cc.orig 2017-04-11 14:08:45 UTC -+++ src/3rdparty/chromium/content/browser/frame_host/render_widget_host_view_guest.cc -@@ -338,11 +338,11 @@ gfx::NativeView RenderWidgetHostViewGuest::GetNativeVi - - gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const { - if (!guest_) -- return static_cast(NULL); -+ return reinterpret_cast(NULL); - - RenderWidgetHostView* rwhv = guest_->GetOwnerRenderWidgetHostView(); - if (!rwhv) -- return static_cast(NULL); -+ return reinterpret_cast(NULL); - return rwhv->GetNativeViewId(); - } - diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_geolocation_location__arbitrator__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_geolocation_location__arbitrator__impl.cc deleted file mode 100644 index 90c140e0224c..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_geolocation_location__arbitrator__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/content/browser/geolocation/location_arbitrator_impl.cc.orig 2017-04-19 16:57:24 UTC -+++ src/3rdparty/chromium/content/browser/geolocation/location_arbitrator_impl.cc -@@ -174,7 +174,7 @@ LocationProvider* LocationArbitratorImpl - } - - LocationProvider* LocationArbitratorImpl::NewSystemLocationProvider() { --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - return NULL; - #else - return content::NewSystemLocationProvider(); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.cc new file mode 100644 index 000000000000..4a6a78bff823 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.cc @@ -0,0 +1,45 @@ +--- src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.cc +@@ -376,7 +376,7 @@ bool GpuDataManagerImplPrivate::GpuAcces + // strings even if all features are blacklisted. If all GPU features are + // disabled, the GPU process will only initialize GL bindings, create a GL + // context, and collect full GPU info. +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) || !defined(OS_BSD) + if (reason) { + *reason = "All GPU features are blacklisted."; + } +@@ -493,8 +493,10 @@ void GpuDataManagerImplPrivate::SetGLStr + gpu_info.gl_renderer = gl_renderer; + gpu_info.gl_version = gl_version; + ++#if !defined(OS_BSD) + gpu::IdentifyActiveGPU(&gpu_info); + gpu::CollectDriverInfoGL(&gpu_info); ++#endif + + UpdateGpuInfo(gpu_info); + UpdateGpuSwitchingManager(gpu_info); +@@ -549,10 +551,12 @@ void GpuDataManagerImplPrivate::Initiali + // Skip collecting the basic driver info if SetGpuInfo() is already called. + if (IsCompleteGpuInfoAvailable()) { + gpu_info = gpu_info_; ++#ifndef OS_BSD + } else { + TRACE_EVENT0("startup", + "GpuDataManagerImpl::Initialize:CollectBasicGraphicsInfo"); + gpu::CollectBasicGraphicsInfo(&gpu_info); ++#endif + } + + if (command_line->HasSwitch(switches::kGpuTestingVendorId) && +@@ -664,7 +668,9 @@ void GpuDataManagerImplPrivate::UpdateGp + return; + + bool was_info_available = IsCompleteGpuInfoAvailable(); ++#ifndef OS_BSD + gpu::MergeGPUInfo(&gpu_info_, gpu_info); ++#endif + if (IsCompleteGpuInfoAvailable()) { + complete_gpu_info_already_requested_ = true; + } else if (was_info_available) { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.h new file mode 100644 index 000000000000..5471015b1163 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__data__manager__impl__private.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.h.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/browser/gpu/gpu_data_manager_impl_private.h +@@ -154,7 +154,7 @@ class CONTENT_EXPORT GpuDataManagerImplP + UnblockOtherDomainFrom3DAPIs); + FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplPrivateTest, + UnblockThisDomainFrom3DAPIs); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplPrivateTest, + SetGLStrings); + FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplPrivateTest, diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__internals__ui.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__internals__ui.cc new file mode 100644 index 000000000000..9d3cc82a5b97 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__internals__ui.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/content/browser/gpu/gpu_internals_ui.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/browser/gpu/gpu_internals_ui.cc +@@ -42,7 +42,7 @@ + #include "third_party/skia/include/core/SkMilestone.h" + #include "ui/gl/gpu_switching_manager.h" + +-#if defined(OS_LINUX) && defined(USE_X11) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11) + #include + #endif + #if defined(OS_WIN) +@@ -50,7 +50,7 @@ + #include "ui/gfx/win/physical_size.h" + #endif + +-#if defined(OS_LINUX) && defined(USE_X11) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11) + #include "ui/base/x/x11_util.h" // nogncheck + #include "ui/gfx/x/x11_atom_cache.h" // nogncheck + #endif +@@ -206,7 +206,7 @@ base::DictionaryValue* GpuInfoAsDictiona + gpu_info.gl_ws_version)); + basic_info->Append(NewDescriptionValuePair("Window system binding extensions", + gpu_info.gl_ws_extensions)); +-#if defined(OS_LINUX) && defined(USE_X11) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11) + basic_info->Append(NewDescriptionValuePair("Window manager", + ui::GuessWindowManagerName())); + { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc new file mode 100644 index 000000000000..3802f24a1c50 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_gpu_gpu__process__host.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/browser/gpu/gpu_process_host.cc +@@ -984,7 +984,7 @@ bool GpuProcessHost::LaunchGpuProcess(gp + base::CommandLine* cmd_line = + new base::CommandLine(base::CommandLine::NO_PROGRAM); + #else +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + int child_flags = gpu_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : + ChildProcessHost::CHILD_NORMAL; + #else diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__internals.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__internals.cc new file mode 100644 index 000000000000..840877de3500 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_media_media__internals.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/browser/media/media_internals.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/browser/media/media_internals.cc +@@ -755,7 +755,7 @@ void MediaInternals::UpdateVideoCaptureD + device_dict->SetString("name", descriptor.GetNameAndModel()); + device_dict->Set("formats", format_list); + #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +- defined(OS_ANDROID) ++ defined(OS_ANDROID) || defined(OS_BSD) + device_dict->SetString("captureApi", descriptor.GetCaptureApiTypeString()); + #endif + video_capture_capabilities_cached_data_.Append(std::move(device_dict)); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_memory_memory__coordinator__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_memory_memory__coordinator__impl.cc new file mode 100644 index 000000000000..87a6b9fd9718 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_memory_memory__coordinator__impl.cc @@ -0,0 +1,15 @@ +--- src/3rdparty/chromium/content/browser/memory/memory_coordinator_impl.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/browser/memory/memory_coordinator_impl.cc +@@ -116,8 +116,12 @@ void RecordMetricsOnStateChange(base::Me + struct MemoryCoordinatorSingletonTraits + : public base::LeakySingletonTraits { + static MemoryCoordinator* New() { ++#if defined(OS_BSD) ++ return NULL; ++#else + return new MemoryCoordinatorImpl(base::ThreadTaskRunnerHandle::Get(), + CreateMemoryMonitor()); ++#endif + } + }; + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_memory_memory__monitor.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_memory_memory__monitor.cc new file mode 100644 index 000000000000..b097734eed8b --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_memory_memory__monitor.cc @@ -0,0 +1,21 @@ +--- src/3rdparty/chromium/content/browser/memory/memory_monitor.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/browser/memory/memory_monitor.cc +@@ -8,6 +8,7 @@ + + namespace content { + ++#if !defined(OS_FREEBSD) + // static + MemoryMonitorDelegate* MemoryMonitorDelegate::GetInstance() { + return base::Singleton< +@@ -21,8 +22,9 @@ void MemoryMonitorDelegate::GetSystemMem + base::SystemMemoryInfoKB* mem_info) { + base::GetSystemMemoryInfo(mem_info); + } ++#endif // !defined(OS_FREEBSD) + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) && !defined(OS_FREEBSD) + // TODO(bashi,bcwhite): Remove when memory monitor for mac is available. + std::unique_ptr CreateMemoryMonitor() { + NOTREACHED(); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_ppapi__plugin__process__host.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_ppapi__plugin__process__host.cc new file mode 100644 index 000000000000..ff0b02f6d13b --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_ppapi__plugin__process__host.cc @@ -0,0 +1,48 @@ +--- src/3rdparty/chromium/content/browser/ppapi_plugin_process_host.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/browser/ppapi_plugin_process_host.cc +@@ -53,9 +53,9 @@ + + namespace content { + +-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + ZygoteHandle g_ppapi_zygote; +-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + + // NOTE: changes to this class need to be reviewed by the security team. + class PpapiPluginSandboxedProcessLauncherDelegate +@@ -109,7 +109,7 @@ class PpapiPluginSandboxedProcessLaunche + return true; + } + +-#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + ZygoteHandle* GetZygote() override { + const base::CommandLine& browser_command_line = + *base::CommandLine::ForCurrentProcess(); +@@ -203,13 +203,13 @@ PpapiPluginProcessHost* PpapiPluginProce + return NULL; + } + +-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + // static + void PpapiPluginProcessHost::EarlyZygoteLaunch() { + DCHECK(!g_ppapi_zygote); + g_ppapi_zygote = CreateZygote(); + } +-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + + // static + void PpapiPluginProcessHost::DidCreateOutOfProcessInstance( +@@ -361,7 +361,7 @@ bool PpapiPluginProcessHost::Init(const + base::CommandLine::StringType plugin_launcher = + browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + int flags = plugin_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : + ChildProcessHost::CHILD_NORMAL; + #else diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc new file mode 100644 index 000000000000..1e10e6794caf --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc @@ -0,0 +1,52 @@ +--- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc +@@ -368,11 +368,11 @@ SiteProcessMap* GetSiteProcessMapForBrow + return map; + } + +-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + // This static member variable holds the zygote communication information for + // the renderer. + ZygoteHandle g_render_zygote; +-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + + // NOTE: changes to this class need to be reviewed by the security team. + class RendererSandboxedProcessLauncherDelegate +@@ -395,7 +395,7 @@ class RendererSandboxedProcessLauncherDe + return GetContentClient()->browser()->PreSpawnRenderer(policy); + } + +-#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + ZygoteHandle* GetZygote() override { + const base::CommandLine& browser_command_line = + *base::CommandLine::ForCurrentProcess(); +@@ -635,7 +635,7 @@ void RenderProcessHost::SetMaxRendererPr + g_max_renderer_count_override = count; + } + +-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + // static + void RenderProcessHostImpl::EarlyZygoteLaunch() { + DCHECK(!g_render_zygote); +@@ -645,7 +645,7 @@ void RenderProcessHostImpl::EarlyZygoteL + ZygoteHostImpl::GetInstance()->SetRendererSandboxStatus( + (*GetGenericZygote())->GetSandboxStatus()); + } +-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + + RenderProcessHostImpl::RenderProcessHostImpl( + BrowserContext* browser_context, +@@ -788,7 +788,7 @@ bool RenderProcessHostImpl::Init() { + renderer_prefix = + browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF + : ChildProcessHost::CHILD_NORMAL; + #else diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc new file mode 100644 index 000000000000..966e2102e61d --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__widget__host__view__aura.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/browser/renderer_host/render_widget_host_view_aura.cc +@@ -107,7 +107,7 @@ + #include "ui/gfx/gdi_util.h" + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + #include "ui/base/ime/linux/text_edit_command_auralinux.h" + #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" + #endif +@@ -1961,7 +1961,7 @@ bool RenderWidgetHostViewAura::NeedsInpu + } + + bool RenderWidgetHostViewAura::NeedsMouseCapture() { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + return NeedsInputGrab(); + #endif + return false; +@@ -2158,7 +2158,7 @@ void RenderWidgetHostViewAura::ForwardKe + if (!target_host) + return; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + ui::TextEditKeyBindingsDelegateAuraLinux* keybinding_delegate = + ui::GetTextEditKeyBindingsDelegate(); + std::vector commands; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_tracing_tracing__controller__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_tracing_tracing__controller__impl.cc new file mode 100644 index 000000000000..555000c1125e --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_tracing_tracing__controller__impl.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/browser/tracing/tracing_controller_impl.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/browser/tracing/tracing_controller_impl.cc +@@ -475,7 +475,7 @@ void TracingControllerImpl::AddTraceMess + return; + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On Linux the browser process dumps process metrics for child process due to + // sandbox. + tracing::ProcessMetricsMemoryDumpProvider::RegisterForProcess( diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host__impl.cc new file mode 100644 index 000000000000..df4c7aeca5e5 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host__impl.cc @@ -0,0 +1,94 @@ +--- src/3rdparty/chromium/content/browser/utility_process_host_impl.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/browser/utility_process_host_impl.cc +@@ -43,9 +43,9 @@ + #include "services/service_manager/public/cpp/interface_provider.h" + #include "ui/base/ui_base_switches.h" + +-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + #include "content/public/browser/zygote_handle_linux.h" +-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + + #if defined(OS_WIN) + #include "sandbox/win/src/sandbox_policy.h" +@@ -54,11 +54,11 @@ + + namespace content { + +-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + namespace { + ZygoteHandle g_utility_zygote; + } // namespace +-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + + // NOTE: changes to this class need to be reviewed by the security team. + class UtilitySandboxedProcessLauncherDelegate +@@ -73,10 +73,10 @@ class UtilitySandboxedProcessLauncherDel + launch_elevated_(launch_elevated) + #elif defined(OS_POSIX) + env_(env) +-#if !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + , + no_sandbox_(no_sandbox) +-#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + #endif // OS_WIN + {} + +@@ -105,13 +105,13 @@ class UtilitySandboxedProcessLauncherDel + + #elif defined(OS_POSIX) + +-#if !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + ZygoteHandle* GetZygote() override { + if (no_sandbox_ || !exposed_dir_.empty()) + return nullptr; + return GetGenericZygote(); + } +-#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + base::EnvironmentMap GetEnvironment() override { return env_; } + #endif // OS_WIN + +@@ -126,9 +126,9 @@ class UtilitySandboxedProcessLauncherDel + bool launch_elevated_; + #elif defined(OS_POSIX) + base::EnvironmentMap env_; +-#if !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + bool no_sandbox_; +-#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#endif // !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + #endif // OS_WIN + }; + +@@ -153,7 +153,7 @@ UtilityProcessHostImpl::UtilityProcessHo + is_batch_mode_(false), + no_sandbox_(false), + run_elevated_(false), +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + child_flags_(ChildProcessHost::CHILD_ALLOW_SELF), + #else + child_flags_(ChildProcessHost::CHILD_NORMAL), +@@ -235,13 +235,13 @@ void UtilityProcessHostImpl::SetName(con + name_ = name; + } + +-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + // static + void UtilityProcessHostImpl::EarlyZygoteLaunch() { + DCHECK(!g_utility_zygote); + g_utility_zygote = CreateZygote(); + } +-#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) + + bool UtilityProcessHostImpl::StartProcess() { + if (started_) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn new file mode 100644 index 000000000000..600a36b814c5 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_common_BUILD.gn @@ -0,0 +1,27 @@ +--- src/3rdparty/chromium/content/common/BUILD.gn.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/common/BUILD.gn +@@ -500,7 +500,7 @@ source_set("common") { + if (use_seccomp_bpf) { + defines += [ "USE_SECCOMP_BPF" ] + } else { +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources -= [ + "sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc", + "sandbox_linux/bpf_cros_arm_gpu_policy_linux.h", +@@ -514,6 +514,15 @@ source_set("common") { + "sandbox_linux/bpf_utility_policy_linux.h", + "sandbox_linux/sandbox_bpf_base_policy_linux.cc", + "sandbox_linux/sandbox_bpf_base_policy_linux.h", ++ "sandbox_linux/sandbox_seccomp_bpf_linux.cc", ++ "sandbox_linux/sandbox_seccomp_bpf_linux.h", ++ ] ++ } ++ if (is_bsd) { ++ sources -= [ ++ "sandbox_linux/sandbox_linux.cc", ++ "sandbox_linux/sandbox_linux.h", ++ "sandbox_linux/sandbox_init_linux.cc", + ] + } + if (is_android) { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_common_sandbox__linux_sandbox__debug__handling__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_common_sandbox__linux_sandbox__debug__handling__linux.cc new file mode 100644 index 000000000000..1051ea01e7cb --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_common_sandbox__linux_sandbox__debug__handling__linux.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/common/sandbox_linux/sandbox_debug_handling_linux.cc +@@ -7,7 +7,9 @@ + #include + #include + #include ++#if 0 // no OS_FREEBSD here? + #include ++#endif + #include + + #include "base/command_line.h" +@@ -69,12 +71,16 @@ bool SandboxDebugHandling::SetDumpableSt + return true; + } + ++#if 0 // no OS_FREEBSD here? + if (prctl(PR_SET_DUMPABLE, 0) != 0) { + PLOG(ERROR) << "Failed to set non-dumpable flag"; + return false; + } + + return prctl(PR_GET_DUMPABLE) == 0; ++#else ++ return false; ++#endif + } + + } // namespace content diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_common_set__process__title__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_common_set__process__title__linux.cc new file mode 100644 index 000000000000..ba9ba9926f38 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_common_set__process__title__linux.cc @@ -0,0 +1,19 @@ +--- src/3rdparty/chromium/content/common/set_process_title_linux.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/common/set_process_title_linux.cc +@@ -49,6 +49,8 @@ + extern char** environ; + + static char** g_main_argv = NULL; ++ ++#if !defined(OS_FREEBSD) + static char* g_orig_argv0 = NULL; + + void setproctitle(const char* fmt, ...) { +@@ -101,6 +103,7 @@ void setproctitle(const char* fmt, ...) + va_end(ap); + g_main_argv[1] = NULL; + } ++#endif + + // A version of this built into glibc would not need this function, since + // it could stash the argv pointer in __libc_start_main(). But we need it. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_common_set__process__title__linux.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_common_set__process__title__linux.h new file mode 100644 index 000000000000..cb8d2d59203f --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_common_set__process__title__linux.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/content/common/set_process_title_linux.h.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/common/set_process_title_linux.h +@@ -5,6 +5,9 @@ + #ifndef CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_ + #define CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_ + ++#include "build/build_config.h" ++ ++#if !defined(OS_FREEBSD) + // Set the process title that will show in "ps" and similar tools. Takes + // printf-style format string and arguments. After calling setproctitle() + // the original main() argv[] array should not be used. By default, the +@@ -14,6 +17,7 @@ + // This signature and naming is to be compatible with most other Unix + // implementations of setproctitle(). + void setproctitle(const char* fmt, ...); ++#endif + + // Initialize state needed for setproctitle() on Linux. Pass the argv pointer + // from main() to setproctitle_init() before calling setproctitle(). diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_content__browser.gypi b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_content__browser.gypi deleted file mode 100644 index ddf51f77a4a9..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_content__browser.gypi +++ /dev/null @@ -1,33 +0,0 @@ ---- src/3rdparty/chromium/content/content_browser.gypi.orig 2016-11-07 14:46:18 UTC -+++ src/3rdparty/chromium/content/content_browser.gypi -@@ -2140,6 +2140,9 @@ - ['os_bsd==1', { - 'sources/': [ - ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'], -+ ['exclude', '^browser/zygote_host/zygote_host_impl_linux\\.cc$'], -+ ['exclude', '^zygote/zygote_linux\\.cc$'], -+ ['exclude', '^zygote/zygote_main_linux\\.cc$'], - ], - }], - ['use_aura==1', { -@@ -2191,14 +2194,16 @@ - 'browser/geolocation/empty_wifi_data_provider.cc', - ], - }], -- ['OS == "linux" and use_dbus==1', { -- 'sources!': [ -- 'browser/geolocation/empty_wifi_data_provider.cc', -- ], -+ ['use_dbus==1', { - 'dependencies': [ - '../build/linux/system.gyp:dbus', - '../dbus/dbus.gyp:dbus', - ], -+ }], -+ ['OS == "linux" and use_dbus==1', { -+ 'sources!': [ -+ 'browser/geolocation/empty_wifi_data_provider.cc', -+ ], - }, { # OS != "linux" or use_dbus==0 - 'sources!': [ - 'browser/geolocation/wifi_data_provider_linux.cc', diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_content__common.gypi b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_content__common.gypi deleted file mode 100644 index 0e73627773b9..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_content__common.gypi +++ /dev/null @@ -1,32 +0,0 @@ ---- src/3rdparty/chromium/content/content_common.gypi.orig 2016-11-07 14:46:18 UTC -+++ src/3rdparty/chromium/content/content_common.gypi -@@ -12,6 +12,7 @@ - '../skia/skia.gyp:skia', - '../third_party/WebKit/public/blink_headers.gyp:blink_headers', - '../third_party/icu/icu.gyp:icuuc', -+ '../third_party/mesa/mesa.gyp:mesa_headers', - '../ui/accessibility/accessibility.gyp:accessibility', - '../ui/accessibility/accessibility.gyp:ax_gen', - '../ui/base/ime/ui_base_ime.gyp:ui_base_ime', -@@ -756,6 +757,21 @@ - 'content.gyp:common_aidl', - ], - }], -+ ['os_bsd==1', { -+ 'sources!': [ -+ 'common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc', -+ 'common/sandbox_linux/bpf_gpu_policy_linux.cc', -+ 'common/sandbox_linux/bpf_ppapi_policy_linux.cc', -+ 'common/sandbox_linux/bpf_renderer_policy_linux.cc', -+ 'common/sandbox_linux/bpf_utility_policy_linux.cc', -+ 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', -+ 'common/sandbox_linux/sandbox_debug_handling_linux.cc', -+ 'common/sandbox_linux/sandbox_init_linux.cc', -+ 'common/sandbox_linux/sandbox_linux.cc', -+ 'common/sandbox_linux/sandbox_seccomp_bpf_linux.cc', -+ 'common/set_process_title_linux.cc', -+ ], -+ }], - ['use_pango == 1', { - 'dependencies': [ - '../build/linux/system.gyp:pangocairo', diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_BUILD.gn new file mode 100644 index 000000000000..6372a7bd4b30 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_BUILD.gn @@ -0,0 +1,10 @@ +--- src/3rdparty/chromium/content/gpu/BUILD.gn.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/gpu/BUILD.gn +@@ -96,6 +96,7 @@ target(link_target_type, "gpu_sources") + + if (use_x11) { + deps += [ "//ui/events/platform/x11" ] ++ configs += [ "//build/config/linux:x11" ] + } + + if (use_ozone) { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__child__thread.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__child__thread.cc index d3c8d06a54a2..ff7fa5b5eaf5 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__child__thread.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__child__thread.cc @@ -1,18 +1,18 @@ ---- src/3rdparty/chromium/content/gpu/gpu_child_thread.cc.orig 2017-04-11 14:08:45 UTC +--- src/3rdparty/chromium/content/gpu/gpu_child_thread.cc.orig 2017-01-26 00:49:13 UTC +++ src/3rdparty/chromium/content/gpu/gpu_child_thread.cc -@@ -306,6 +306,7 @@ void GpuChildThread::StopWatchdog() { - } +@@ -383,6 +383,7 @@ void GpuChildThread::OnCollectGraphicsIn + if (dead_on_arrival_) + return; - void GpuChildThread::OnCollectGraphicsInfo() { -+#if !defined(OS_FREEBSD) ++#if !defined(OS_BSD) #if defined(OS_WIN) // GPU full info collection should only happen on un-sandboxed GPU process // or single process/in-process gpu mode on Windows. -@@ -348,6 +349,7 @@ void GpuChildThread::OnCollectGraphicsInfo() { +@@ -434,6 +435,7 @@ void GpuChildThread::OnCollectGraphicsIn base::MessageLoop::current()->QuitWhenIdle(); } #endif // OS_WIN -+#endif ++#endif // XXX(rene) !FreeBSD } void GpuChildThread::OnGetVideoMemoryUsageStats() { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc index aa0a762b1ab7..5dd464f3b524 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc @@ -1,45 +1,29 @@ ---- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig 2017-04-11 14:08:45 UTC +--- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig 2017-01-26 00:49:13 UTC +++ src/3rdparty/chromium/content/gpu/gpu_main.cc -@@ -99,7 +99,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUInfo& gpu_info, - const base::CommandLine& command_line); - bool WarmUpSandbox(const base::CommandLine& command_line); +@@ -92,7 +92,7 @@ namespace content { --#if !defined(OS_MACOSX) -+#if !defined(OS_MACOSX) && !defined(OS_FREEBSD) - bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info); - #endif + namespace { -@@ -191,13 +191,13 @@ int GpuMain(const MainFunctionParams& parameters) { - #else - base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI); - #endif --#elif defined(OS_LINUX) && defined(USE_X11) -+#elif (defined(OS_LINUX)||defined(OS_BSD)) && defined(USE_X11) - // We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX - // and https://crbug.com/326995. - base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI); - scoped_ptr event_source = - ui::PlatformEventSource::CreateDefault(); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX)||defined(OS_BSD) - base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT); - #elif defined(OS_MACOSX) - // This is necessary for CoreAnimation layers hosted in the GPU process to be -@@ -303,7 +303,7 @@ int GpuMain(const MainFunctionParams& parameters) { - // and we already registered them through SetGpuInfo() above. - base::TimeTicks before_collect_context_graphics_info = - base::TimeTicks::Now(); --#if !defined(OS_MACOSX) -+#if !defined(OS_MACOSX) && !defined(OS_FREEBSD) - if (!CollectGraphicsInfo(gpu_info)) - dead_on_arrival = true; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) && !defined(OS_BSD) + bool StartSandboxLinux(gpu::GpuWatchdogThread*); + #elif defined(OS_WIN) + bool StartSandboxWindows(const sandbox::SandboxInterfaceInfo*); +@@ -145,7 +145,7 @@ class ContentSandboxHelper : public gpu: -@@ -457,7 +457,7 @@ bool WarmUpSandbox(const base::CommandLine& command_li - return true; - } + bool EnsureSandboxInitialized( + gpu::GpuWatchdogThread* watchdog_thread) override { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) && !defined(OS_BSD) + return StartSandboxLinux(watchdog_thread); + #elif defined(OS_WIN) + return StartSandboxWindows(sandbox_info_); +@@ -292,7 +292,7 @@ int GpuMain(const MainFunctionParams& pa --#if !defined(OS_MACOSX) -+#if !defined(OS_MACOSX) && !defined(OS_FREEBSD) - bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) { - TRACE_EVENT0("gpu,startup", "Collect Graphics Info"); + namespace { + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) && !defined(OS_BSD) + bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread) { + TRACE_EVENT0("gpu,startup", "Initialize sandbox"); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_in__process__gpu__thread.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_in__process__gpu__thread.cc new file mode 100644 index 000000000000..dce4ba896fce --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_in__process__gpu__thread.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/gpu/in_process_gpu_thread.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/gpu/in_process_gpu_thread.cc +@@ -53,8 +53,6 @@ void InProcessGpuThread::Init() { + gpu::GPUInfo gpu_info; + if (!gl::init::InitializeGLOneOff()) + VLOG(1) << "gl::init::InitializeGLOneOff failed"; +- else +- gpu::CollectContextGraphicsInfo(&gpu_info); + + // The process object takes ownership of the thread object, so do not + // save and delete the pointer. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_child__process__host.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_child__process__host.h new file mode 100644 index 000000000000..1959d0ca15b2 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_child__process__host.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/content/public/common/child_process_host.h.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/public/common/child_process_host.h +@@ -53,7 +53,7 @@ class CONTENT_EXPORT ChildProcessHost : + // No special behavior requested. + CHILD_NORMAL = 0, + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Indicates that the child execed after forking may be execced from + // /proc/self/exe rather than using the "real" app path. This prevents + // autoupdate from confusing us if it changes the file out from under us. +@@ -62,7 +62,7 @@ class CONTENT_EXPORT ChildProcessHost : + // gdb). In this case, you'd use GetChildPath to get the real executable + // file name, and then prepend the GDB command to the command line. + CHILD_ALLOW_SELF = 1 << 0, +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + }; + + // Returns the pathname to be used for a child process. If a subprocess diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc new file mode 100644 index 000000000000..c539966a7e5e --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/public/common/content_switches.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/public/common/content_switches.cc +@@ -992,7 +992,7 @@ const char kDisableVaapiAcceleratedVideo + "disable-vaapi-accelerated-video-encode"; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) + // Allows sending text-to-speech requests to speech-dispatcher, a common + // Linux speech service. Because it's buggy, the user must explicitly + // enable it so that visiting a random webpage can't cause instability. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h new file mode 100644 index 000000000000..bf7aec6a9e14 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__switches.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/public/common/content_switches.h.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/public/common/content_switches.h +@@ -293,7 +293,7 @@ CONTENT_EXPORT extern const char kDisabl + CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[]; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) + CONTENT_EXPORT extern const char kEnableSpeechDispatcher[]; + #endif + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_renderer__preferences.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_renderer__preferences.h new file mode 100644 index 000000000000..9d1b5462ec35 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_renderer__preferences.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/public/common/renderer_preferences.h.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/public/common/renderer_preferences.h +@@ -139,7 +139,7 @@ struct CONTENT_EXPORT RendererPreference + // Country iso of the mobile network for content detection purpose. + std::string network_contry_iso; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + std::string system_font_family_name; + #endif + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_devtools_v8__sampling__profiler.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_devtools_v8__sampling__profiler.cc deleted file mode 100644 index 02baa7992bb5..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_devtools_v8__sampling__profiler.cc +++ /dev/null @@ -1,21 +0,0 @@ ---- src/3rdparty/chromium/content/renderer/devtools/v8_sampling_profiler.cc.orig 2017-04-11 14:08:45 UTC -+++ src/3rdparty/chromium/content/renderer/devtools/v8_sampling_profiler.cc -@@ -6,6 +6,7 @@ - - #include - #include -+#include - - #include "base/format_macros.h" - #include "base/location.h" -@@ -544,6 +546,10 @@ void V8SamplingThread::HandleProfilerSignal(int signal - state.pc = reinterpret_cast(mcontext->__ss.REG_64_32(__rip, __eip)); - state.sp = reinterpret_cast(mcontext->__ss.REG_64_32(__rsp, __esp)); - state.fp = reinterpret_cast(mcontext->__ss.REG_64_32(__rbp, __ebp)); -+#elif defined(OS_FREEBSD) -+ state.pc = reinterpret_cast(mcontext.REG_64_32(mc_rip, mc_eip)); -+ state.sp = reinterpret_cast(mcontext.REG_64_32(mc_rsp, mc_esp)); -+ state.fp = reinterpret_cast(mcontext.REG_64_32(mc_rbp, mc_ebp)); - #else - state.pc = - reinterpret_cast(mcontext.gregs[REG_64_32(REG_RIP, REG_EIP)]); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_media_webrtc_processed__local__audio__source.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_media_webrtc_processed__local__audio__source.cc new file mode 100644 index 000000000000..8d468401867d --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_media_webrtc_processed__local__audio__source.cc @@ -0,0 +1,13 @@ +--- src/3rdparty/chromium/content/renderer/media/webrtc/processed_local_audio_source.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/renderer/media/webrtc/processed_local_audio_source.cc +@@ -269,8 +269,8 @@ void ProcessedLocalAudioSource::Capture( + bool key_pressed) { + #if defined(OS_WIN) || defined(OS_MACOSX) + DCHECK_LE(volume, 1.0); +-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD) +- // We have a special situation on Linux where the microphone volume can be ++#elif defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID) ++ // We have a special situation on POSIX where the microphone volume can be + // "higher than maximum". The input volume slider in the sound preference + // allows the user to set a scaling that is higher than 100%. It means that + // even if the reported maximum levels is N, the actual microphone level can diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc new file mode 100644 index 000000000000..e4db0ee839be --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc @@ -0,0 +1,34 @@ +--- src/3rdparty/chromium/content/renderer/render_thread_impl.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/renderer/render_thread_impl.cc +@@ -206,11 +206,13 @@ + #include "content/common/external_ipc_dumper.h" + #endif + ++#if !defined(OS_BSD) + #if defined(OS_MACOSX) + #include + #else + #include + #endif ++#endif + + using base::ThreadRestrictions; + using blink::WebDocument; +@@ -1488,7 +1490,7 @@ media::GpuVideoAcceleratorFactories* Ren + const bool enable_video_accelerator = + !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode); + const bool enable_gpu_memory_buffer_video_frames = +-#if defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) && + !cmd_line->HasSwitch(switches::kDisableGpuCompositing) && + !gpu_channel_host->gpu_info().software_rendering; +@@ -1846,6 +1848,8 @@ void RenderThreadImpl::RecordPurgeAndSus + #else + size_t malloc_usage = minfo.hblkhd + minfo.arena; + #endif ++#elif defined(OS_BSD) ++ size_t malloc_usage = 0; + #else + size_t malloc_usage = GetMallocUsage(); + #endif diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc new file mode 100644 index 000000000000..50547751f19a --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc @@ -0,0 +1,56 @@ +--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc +@@ -111,7 +111,7 @@ + + #if defined(OS_POSIX) + #include "base/file_descriptor_posix.h" +-#if !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + #include + #include + +@@ -201,7 +201,7 @@ class RendererBlinkPlatformImpl::FileUti + scoped_refptr thread_safe_sender_; + }; + +-#if !defined(OS_ANDROID) && !defined(OS_WIN) ++#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD) + class RendererBlinkPlatformImpl::SandboxSupport + : public blink::WebSandboxSupport { + public: +@@ -247,7 +247,7 @@ RendererBlinkPlatformImpl::RendererBlink + renderer_scheduler_(renderer_scheduler), + blink_interface_provider_( + new BlinkInterfaceProviderImpl(remote_interfaces)) { +-#if !defined(OS_ANDROID) && !defined(OS_WIN) ++#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD) + if (g_sandbox_enabled && sandboxEnabled()) { + sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport); + } else { +@@ -283,7 +283,7 @@ RendererBlinkPlatformImpl::~RendererBlin + } + + void RendererBlinkPlatformImpl::Shutdown() { +-#if !defined(OS_ANDROID) && !defined(OS_WIN) ++#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD) + // SandboxSupport contains a map of WebFontFamily objects, which hold + // WebCStrings, which become invalidated when blink is shut down. Hence, we + // need to clear that map now, just before blink::shutdown() is called. +@@ -331,7 +331,7 @@ blink::WebFileUtilities* RendererBlinkPl + } + + blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() { +-#if defined(OS_ANDROID) || defined(OS_WIN) ++#if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD) + // These platforms do not require sandbox support. + return NULL; + #else +@@ -539,7 +539,7 @@ bool RendererBlinkPlatformImpl::SandboxS + return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out); + } + +-#elif defined(OS_POSIX) && !defined(OS_ANDROID) ++#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) + + void RendererBlinkPlatformImpl::SandboxSupport::getFallbackFontForCharacter( + blink::WebUChar32 character, diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h new file mode 100644 index 000000000000..9032d903698c --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h +@@ -256,7 +256,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo + class FileUtilities; + std::unique_ptr file_utilities_; + +-#if !defined(OS_ANDROID) && !defined(OS_WIN) ++#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD) + class SandboxSupport; + std::unique_ptr sandbox_support_; + #endif diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc index eff3487d3985..7ba65a4769e9 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__main__platform__delegate__linux.cc @@ -1,18 +1,19 @@ ---- src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc.orig 2017-04-20 13:24:44 UTC +--- src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc.orig 2017-01-26 00:49:13 UTC +++ src/3rdparty/chromium/content/renderer/renderer_main_platform_delegate_linux.cc @@ -29,6 +29,7 @@ void RendererMainPlatformDelegate::Platf } bool RendererMainPlatformDelegate::EnableSandbox() { -+#if defined(OS_LINUX) ++#if !defined(OS_BSD) // The setuid sandbox is started in the zygote process: zygote_main_linux.cc - // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox + // https://chromium.googlesource.com/chromium/src/+/master/docs/linux_suid_sandbox.md // -@@ -60,6 +61,7 @@ bool RendererMainPlatformDelegate::Enabl +@@ -59,7 +60,7 @@ bool RendererMainPlatformDelegate::Enabl + CHECK_EQ(errno, EPERM); } #endif // __x86_64__ - -+#endif // defined(OS_LINUX) +- ++#endif // ! OS_BSD return true; } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_webscrollbarbehavior__impl__aura.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_webscrollbarbehavior__impl__aura.cc new file mode 100644 index 000000000000..6f862ddd8ec4 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_webscrollbarbehavior__impl__aura.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/content/renderer/webscrollbarbehavior_impl_aura.cc.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/renderer/webscrollbarbehavior_impl_aura.cc +@@ -14,7 +14,7 @@ bool WebScrollbarBehaviorImpl::shouldCen + blink::WebPointerProperties::Button mouseButton, + bool shiftKeyPressed, + bool altKeyPressed) { +-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + if (mouseButton == blink::WebPointerProperties::Button::Middle) + return true; + #endif +@@ -29,7 +29,7 @@ bool WebScrollbarBehaviorImpl::shouldSna + // Disable snapback on desktop Linux to better integrate with the desktop + // behavior. Typically, Linux apps do not implement scrollbar snapback (this is + // true for at least GTK and QT apps). +-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + return false; + #endif + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn new file mode 100644 index 000000000000..f98b8c57f45a --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_shell_BUILD.gn @@ -0,0 +1,38 @@ +--- src/3rdparty/chromium/content/shell/BUILD.gn.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/shell/BUILD.gn +@@ -296,7 +296,7 @@ static_library("content_shell_lib") { + ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + deps += [ + "//build/linux:fontconfig", + "//ui/gfx:test_support", +@@ -317,7 +317,7 @@ static_library("content_shell_lib") { + deps += [ "//content/shell/android:content_shell_jni_headers" ] + } + +- if (is_posix && !is_mac) { ++ if (is_posix && !is_mac && !is_bsd) { + deps += [ + "//components/crash/content/app", + "//components/crash/content/browser", +@@ -366,7 +366,7 @@ static_library("content_shell_lib") { + ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + deps += [ "//third_party/freetype2" ] + } + +@@ -532,7 +532,7 @@ if (is_android) { + } + } + +- if (is_linux && !is_component_build) { ++ if ((is_linux || is_bsd) && !is_component_build) { + # Set rpath to find our own libfreetype even in a non-component build. + configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn new file mode 100644 index 000000000000..7d36822e6a99 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_test_BUILD.gn @@ -0,0 +1,38 @@ +--- src/3rdparty/chromium/content/test/BUILD.gn.orig 2017-01-26 00:49:13 UTC ++++ src/3rdparty/chromium/content/test/BUILD.gn +@@ -748,7 +748,7 @@ test("content_browsertests") { + } + } + +- if (is_android || is_linux || is_mac || is_win) { ++ if (is_android || is_linux || is_bsd || is_mac || is_win) { + data += [ + "$root_out_dir/content_shell.pak", + "data/", +@@ -1350,7 +1350,7 @@ test("content_unittests") { + sources += [ "../browser/memory/memory_monitor_linux_unittest.cc" ] + } + +- if (is_android || is_linux || is_mac || is_win) { ++ if (is_android || is_linux || is_bsd || is_mac || is_win) { + data = [ + "$root_out_dir/content_shell.pak", + "data/", +@@ -1540,7 +1540,7 @@ test("content_unittests") { + "//ui/shell_dialogs:shell_dialogs", + ] + +- if (is_linux || is_mac || is_win) { ++ if (is_linux || is_bsd || is_mac || is_win) { + sources += + [ "../browser/media/capture/desktop_capture_device_unittest.cc" ] + deps += [ "//third_party/webrtc/modules/desktop_capture" ] +@@ -1576,7 +1576,7 @@ test("content_unittests") { + ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (use_dbus) { + deps += [ "//dbus:test_support" ] + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_crypto_nss__util.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_crypto_nss__util.cc index 5474230b08aa..6e0fc69cafa3 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_crypto_nss__util.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_crypto_nss__util.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/crypto/nss_util.cc.orig 2017-04-23 10:32:17 UTC +--- src/3rdparty/chromium/crypto/nss_util.cc.orig 2017-01-26 00:49:14 UTC +++ src/3rdparty/chromium/crypto/nss_util.cc -@@ -15,7 +15,7 @@ - +@@ -20,7 +20,7 @@ + #include "base/threading/thread_task_runner_handle.h" #include "crypto/nss_util_internal.h" -#if defined(OS_OPENBSD) @@ -9,7 +9,7 @@ #include #include #endif -@@ -158,10 +158,10 @@ void UseLocalCacheOfNSSDatabaseIfNFS(con +@@ -150,10 +150,10 @@ void UseLocalCacheOfNSSDatabaseIfNFS(con base::FileSystemType fs_type = base::FILE_SYSTEM_UNKNOWN; if (base::GetFileSystemType(database_dir, &fs_type)) db_on_nfs = (fs_type == base::FILE_SYSTEM_NFS); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_BUILD.gn new file mode 100644 index 000000000000..6402e7c02f6d --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/device/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/device/BUILD.gn +@@ -184,7 +184,7 @@ test("device_unittests") { + ] + } + +- if ((is_chromeos || is_linux) && use_dbus) { ++ if ((is_chromeos || is_linux || is_bsd) && use_dbus) { + configs += [ "//build/config/linux/dbus" ] + + sources += [ diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_battery_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_battery_BUILD.gn new file mode 100644 index 000000000000..f10e74af8377 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_battery_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/device/battery/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/device/battery/BUILD.gn +@@ -47,7 +47,7 @@ if (!is_android) { + ] + } + +- if (is_linux && !is_chromeos) { ++ if ((is_linux || is_bsd) && !is_chromeos) { + if (use_dbus) { + configs += [ "//build/config/linux/dbus" ] + deps += [ "//dbus" ] diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_BUILD.gn new file mode 100644 index 000000000000..1d793039bf45 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_bluetooth_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/device/bluetooth/BUILD.gn.orig 2017-12-15 17:05:52.395544000 -0500 ++++ src/3rdparty/chromium/device/bluetooth/BUILD.gn 2017-12-15 17:06:09.864315000 -0500 +@@ -193,7 +193,7 @@ + ] + } + +- if (is_chromeos || is_linux) { ++ if (is_chromeos || (is_linux && !is_bsd)) { + if (use_dbus) { + sources += [ + "bluez/bluetooth_adapter_bluez.cc", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_gamepad_gamepad__provider.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_gamepad_gamepad__provider.cc new file mode 100644 index 000000000000..de94c9848207 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_gamepad_gamepad__provider.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/device/gamepad/gamepad_provider.cc.orig 2017-02-02 02:02:54 UTC ++++ src/3rdparty/chromium/device/gamepad/gamepad_provider.cc +@@ -145,7 +145,7 @@ void GamepadProvider::Initialize(std::un + monitor->AddDevicesChangedObserver(this); + + polling_thread_.reset(new base::Thread("Gamepad polling thread")); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On Linux, the data fetcher needs to watch file descriptors, so the message + // loop needs to be a libevent loop. + const base::MessageLoop::Type kMessageLoopType = base::MessageLoop::TYPE_IO; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_geolocation_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_geolocation_BUILD.gn new file mode 100644 index 000000000000..0d6308af4be5 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_geolocation_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/device/geolocation/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/device/geolocation/BUILD.gn +@@ -89,7 +89,7 @@ component("geolocation") { + if (is_android) { + sources -= [ "wifi_data_provider_common.cc" ] + } +- if (is_chromeos || (is_linux && !use_dbus)) { ++ if (is_chromeos || (is_linux && !use_dbus) || is_bsd) { + sources -= [ "wifi_data_provider_linux.cc" ] + } + if (is_linux && use_dbus) { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_geolocation_location__arbitrator.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_geolocation_location__arbitrator.cc new file mode 100644 index 000000000000..a4994cb39fce --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_geolocation_location__arbitrator.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/device/geolocation/location_arbitrator.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/device/geolocation/location_arbitrator.cc +@@ -182,7 +182,7 @@ LocationArbitrator::NewNetworkLocationPr + + std::unique_ptr + LocationArbitrator::NewSystemLocationProvider() { +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + return nullptr; + #else + return device::NewSystemLocationProvider(); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_hid_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_hid_BUILD.gn new file mode 100644 index 000000000000..3301991cb68d --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_hid_BUILD.gn @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/device/hid/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/device/hid/BUILD.gn +@@ -56,6 +56,13 @@ source_set("hid") { + deps += [ "//device/udev_linux" ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "hid_connection_linux.cc", ++ "hid_connection_linux.h", ++ ] ++ } ++ + if (is_chromeos) { + deps += [ "//chromeos" ] + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_media__transfer__protocol_media__transfer__protocol__daemon__client.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_media__transfer__protocol_media__transfer__protocol__daemon__client.h new file mode 100644 index 000000000000..6f2bb2ea52b5 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_media__transfer__protocol_media__transfer__protocol__daemon__client.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/device/media_transfer_protocol/media_transfer_protocol_daemon_client.h.orig 2017-02-02 02:02:54 UTC ++++ src/3rdparty/chromium/device/media_transfer_protocol/media_transfer_protocol_daemon_client.h +@@ -19,7 +19,7 @@ + #include "base/macros.h" + #include "build/build_config.h" + +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + #error "Only used on Linux and ChromeOS" + #endif + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_media__transfer__protocol_media__transfer__protocol__manager.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_media__transfer__protocol_media__transfer__protocol__manager.h new file mode 100644 index 000000000000..ec9b70cdc427 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_media__transfer__protocol_media__transfer__protocol__manager.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/device/media_transfer_protocol/media_transfer_protocol_manager.h.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/device/media_transfer_protocol/media_transfer_protocol_manager.h +@@ -15,7 +15,7 @@ + #include "base/memory/ref_counted.h" + #include "build/build_config.h" + +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_FREEBSD) + #error "Only used on Linux and ChromeOS" + #endif + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_serial_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_serial_BUILD.gn new file mode 100644 index 000000000000..5b7645f9fec6 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_serial_BUILD.gn @@ -0,0 +1,24 @@ +--- src/3rdparty/chromium/device/serial/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/device/serial/BUILD.gn +@@ -6,7 +6,7 @@ import("//build/config/features.gni") + import("//mojo/public/tools/bindings/mojom.gni") + + # Library works only on desktop platforms. +-assert(is_win || is_linux || is_mac) ++assert(is_win || is_linux || is_bsd || is_mac) + + config("platform_support") { + visibility = [ ":serial" ] +@@ -55,6 +55,12 @@ static_library("serial") { + if (use_udev) { + deps += [ "//device/udev_linux" ] + } ++ if (is_bsd) { ++ sources -= [ ++ "serial_device_enumerator_linux.cc", ++ "serial_device_enumerator_linux.h" ++ ] ++ } + if (is_chromeos) { + deps += [ + "//chromeos", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_serial_serial__io__handler__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_serial_serial__io__handler__posix.cc new file mode 100644 index 000000000000..4ce81aabaff2 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_serial_serial__io__handler__posix.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/device/serial/serial_io_handler_posix.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/device/serial/serial_io_handler_posix.cc +@@ -61,7 +61,7 @@ bool BitrateToSpeedConstant(int bitrate, + BITRATE_TO_SPEED_CASE(9600) + BITRATE_TO_SPEED_CASE(19200) + BITRATE_TO_SPEED_CASE(38400) +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) + BITRATE_TO_SPEED_CASE(57600) + BITRATE_TO_SPEED_CASE(115200) + BITRATE_TO_SPEED_CASE(230400) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_time__zone__monitor_time__zone__monitor.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_time__zone__monitor_time__zone__monitor.cc new file mode 100644 index 000000000000..6d4de49191af --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_time__zone__monitor_time__zone__monitor.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/device/time_zone_monitor/time_zone_monitor.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/device/time_zone_monitor/time_zone_monitor.cc +@@ -31,7 +31,7 @@ void TimeZoneMonitor::NotifyClients() { + std::unique_ptr new_zone(icu::TimeZone::createDefault()); + #else + icu::TimeZone* new_zone = icu::TimeZone::detectHostTimeZone(); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // We get here multiple times on Linux per a single tz change, but + // want to update the ICU default zone and notify renderer only once. + std::unique_ptr current_zone(icu::TimeZone::createDefault()); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_time__zone__monitor_time__zone__monitor__linux.cc new file mode 100644 index 000000000000..58ea06118315 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_time__zone__monitor_time__zone__monitor__linux.cc @@ -0,0 +1,22 @@ +--- src/3rdparty/chromium/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/device/time_zone_monitor/time_zone_monitor_linux.cc +@@ -59,6 +59,9 @@ class TimeZoneMonitorLinuxImpl + main_task_runner_(base::ThreadTaskRunnerHandle::Get()), + file_task_runner_(file_task_runner), + owner_(owner) { ++ } ++ ++ void StartWatching() { + DCHECK(main_task_runner_->RunsTasksOnCurrentThread()); + file_task_runner_->PostTask( + FROM_HERE, +@@ -152,6 +155,9 @@ TimeZoneMonitorLinux::TimeZoneMonitorLin + // changed. + if (!getenv("TZ")) { + impl_ = new TimeZoneMonitorLinuxImpl(this, file_task_runner); ++ if (impl_.get()) { ++ impl_->StartWatching(); ++ } + } + } + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__context.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__context.cc index 911709722edb..7eda97341258 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__context.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__context.cc @@ -1,20 +1,24 @@ ---- src/3rdparty/chromium/device/usb/usb_context.cc.orig 2017-04-11 14:15:58 UTC +--- src/3rdparty/chromium/device/usb/usb_context.cc.orig 2017-01-26 00:49:14 UTC +++ src/3rdparty/chromium/device/usb/usb_context.cc -@@ -9,8 +9,7 @@ +@@ -9,8 +9,13 @@ #include "base/macros.h" #include "base/threading/simple_thread.h" #include "device/usb/usb_error.h" --#include "third_party/libusb/src/libusb/interrupt.h" --#include "third_party/libusb/src/libusb/libusb.h" ++#if defined(OS_FREEBSD) +#include "libusb.h" ++#define LIBUSB_CALL ++#else + #include "third_party/libusb/src/libusb/interrupt.h" + #include "third_party/libusb/src/libusb/libusb.h" ++#endif namespace device { -@@ -58,7 +57,9 @@ void UsbContext::UsbEventHandler::Run() { +@@ -58,7 +63,9 @@ void UsbContext::UsbEventHandler::Run() void UsbContext::UsbEventHandler::Stop() { base::subtle::Release_Store(&running_, 0); -+#if !defined(__FreeBSD__) ++#if !defined(OS_FREEBSD) // XXX(rene) not available in base version libusb_interrupt_handle_event(context_); +#endif } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__context__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__context__unittest.cc new file mode 100644 index 000000000000..0df595675430 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__context__unittest.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/device/usb/usb_context_unittest.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/device/usb/usb_context_unittest.cc +@@ -7,7 +7,11 @@ + #include "build/build_config.h" + #include "device/usb/usb_context.h" + #include "testing/gtest/include/gtest/gtest.h" ++#if defined(OS_FREEBSD) ++#include "libusb.h" ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + namespace device { + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__device__handle__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__device__handle__impl.cc new file mode 100644 index 000000000000..b30c634801fa --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__device__handle__impl.cc @@ -0,0 +1,15 @@ +--- src/3rdparty/chromium/device/usb/usb_device_handle_impl.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/device/usb/usb_device_handle_impl.cc +@@ -25,7 +25,11 @@ + #include "device/usb/usb_error.h" + #include "device/usb/usb_service.h" + #include "net/base/io_buffer.h" +-#include "third_party/libusb/src/libusb/libusb.h" ++#if defined(OS_FREEBSD) ++# include "libusb.h" ++#else ++# include "third_party/libusb/src/libusb/libusb.h" ++#endif + + namespace device { + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__device__handle__impl.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__device__handle__impl.h new file mode 100644 index 000000000000..351abe31fb61 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__device__handle__impl.h @@ -0,0 +1,15 @@ +--- src/3rdparty/chromium/device/usb/usb_device_handle_impl.h.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/device/usb/usb_device_handle_impl.h +@@ -18,7 +18,12 @@ + #include "base/memory/ref_counted.h" + #include "base/threading/thread_checker.h" + #include "device/usb/usb_device_handle.h" ++#if defined(OS_FREEBSD) ++#include "libusb.h" ++#define LIBUSB_CALL ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + namespace base { + class SequencedTaskRunner; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__device__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__device__impl.cc new file mode 100644 index 000000000000..99cab5007c6a --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__device__impl.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/device/usb/usb_device_impl.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/device/usb/usb_device_impl.cc +@@ -22,7 +22,11 @@ + #include "device/usb/usb_descriptors.h" + #include "device/usb/usb_device_handle_impl.h" + #include "device/usb/usb_error.h" ++#if defined(OS_FREEBSD) ++#include "libusb.h" ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + namespace device { + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__error.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__error.cc new file mode 100644 index 000000000000..9883c63d93d5 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__error.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/device/usb/usb_error.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/device/usb/usb_error.cc +@@ -4,7 +4,11 @@ + + #include "device/usb/usb_error.h" + ++#if defined(__FreeBSD__) ++#include "libusb.h" ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif + + namespace device { + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__service__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__service__impl.cc index daabc883fbf9..a24e77272f44 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__service__impl.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__service__impl.cc @@ -1,48 +1,59 @@ -The hotplug API is not available on FreeBSD <= 10.3. - -The API was added in base r302080, so it is part of FreeBSD 11.0+. It was -MFC'ed to stable/10 in r302275, which is between __FreeBSD_version's 1003505 -(r302228) and 1003506 (r304611). ---- src/3rdparty/chromium/device/usb/usb_service_impl.cc.orig 2017-04-20 16:14:07 UTC +--- src/3rdparty/chromium/device/usb/usb_service_impl.cc.orig 2017-01-26 00:49:14 UTC +++ src/3rdparty/chromium/device/usb/usb_service_impl.cc -@@ -482,6 +482,7 @@ UsbServiceImpl::UsbServiceImpl( +@@ -26,7 +26,11 @@ + #include "device/usb/usb_error.h" + #include "device/usb/webusb_descriptors.h" + #include "net/base/io_buffer.h" +-#include "third_party/libusb/src/libusb/libusb.h" ++#if defined(OS_FREEBSD) ++# include ++#else ++# include "third_party/libusb/src/libusb/libusb.h" ++#endif + + #if defined(OS_WIN) + #include +@@ -213,6 +217,7 @@ UsbServiceImpl::UsbServiceImpl( } context_ = new UsbContext(platform_context); -+#if defined(__FreeBSD_version) && __FreeBSD_version >= 1003506 ++#if !defined(OS_FREEBSD) rv = libusb_hotplug_register_callback( context_->context(), static_cast(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -492,6 +493,7 @@ UsbServiceImpl::UsbServiceImpl( - if (rv == LIBUSB_SUCCESS) { - hotplug_enabled_ = true; +@@ -225,6 +230,8 @@ UsbServiceImpl::UsbServiceImpl( } -+#endif RefreshDevices(); ++#endif // !defined(OS_FREEBSD) ++ #if defined(OS_WIN) -@@ -504,7 +506,9 @@ UsbServiceImpl::UsbServiceImpl( + DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces(); + if (device_monitor) { +@@ -234,8 +241,10 @@ UsbServiceImpl::UsbServiceImpl( + } UsbServiceImpl::~UsbServiceImpl() { - if (hotplug_enabled_) { -+#if defined(__FreeBSD_version) && __FreeBSD_version >= 1003506 ++#if !defined(OS_FREEBSD) + if (hotplug_enabled_) libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_); -+#endif - } - for (const auto& map_entry : devices_) { - map_entry.second->OnDisconnect(); -@@ -744,6 +748,7 @@ void UsbServiceImpl::RemoveDevice(scoped ++#endif // !defined(OS_FREEBSD) + for (auto* platform_device : ignored_devices_) + libusb_unref_device(platform_device); + } +@@ -477,6 +486,7 @@ void UsbServiceImpl::RemoveDevice(scoped + device->OnDisconnect(); } ++#if !defined(OS_FREEBSD) // static -+#if defined(__FreeBSD_version) && __FreeBSD_version >= 1003506 int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, PlatformUsbDevice device, - libusb_hotplug_event event, -@@ -799,5 +804,6 @@ void UsbServiceImpl::OnPlatformDeviceRem - } - libusb_unref_device(platform_device); +@@ -514,6 +524,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugC + + return 0; } -+#endif // defined(__FreeBSD_version) && __FreeBSD_version >= 1003506 ++#endif // !defined(OS_FREEBSD) - } // namespace device + void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) { + DCHECK(CalledOnValidThread()); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__service__impl.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__service__impl.h index 68ac29e32740..6f51eab7e1b4 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__service__impl.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_usb_usb__service__impl.h @@ -1,31 +1,38 @@ -The hotplug API is not available on FreeBSD <= 10.3. - -The API was added in base r302080, so it is part of FreeBSD 11.0+. It was -MFC'ed to stable/10 in r302275, which is between __FreeBSD_version's 1003505 -(r302228) and 1003506 (r304611). ---- src/3rdparty/chromium/device/usb/usb_service_impl.h.orig 2017-04-20 16:14:03 UTC +--- src/3rdparty/chromium/device/usb/usb_service_impl.h.orig 2017-01-26 00:49:14 UTC +++ src/3rdparty/chromium/device/usb/usb_service_impl.h -@@ -72,6 +72,7 @@ class UsbServiceImpl : +@@ -15,7 +15,13 @@ + #include "build/build_config.h" + #include "device/usb/usb_context.h" + #include "device/usb/usb_device_impl.h" ++#if defined(OS_FREEBSD) ++#include "libusb.h" ++#define LIBUSB_CALL ++#else + #include "third_party/libusb/src/libusb/libusb.h" ++#endif ++ + + #if defined(OS_WIN) + #include "base/scoped_observer.h" +@@ -70,11 +76,13 @@ class UsbServiceImpl : + scoped_refptr device); void RemoveDevice(scoped_refptr device); ++#if !defined(OS_FREEBSD) // Handle hotplug events from libusb. -+#if defined(__FreeBSD_version) && __FreeBSD_version >= 1003506 static int LIBUSB_CALL HotplugCallback(libusb_context* context, PlatformUsbDevice device, libusb_hotplug_event event, -@@ -79,6 +80,7 @@ class UsbServiceImpl : + void* user_data); ++#endif // These functions release a reference to the provided platform device. void OnPlatformDeviceAdded(PlatformUsbDevice platform_device); void OnPlatformDeviceRemoved(PlatformUsbDevice platform_device); -+#endif - - scoped_refptr context_; - scoped_refptr task_runner_; -@@ -88,7 +90,9 @@ class UsbServiceImpl : +@@ -90,7 +98,9 @@ class UsbServiceImpl : // connected instead of only when a full enumeration is requested. // TODO(reillyg): Support this on all platforms. crbug.com/411715 bool hotplug_enabled_ = false; -+#if defined(__FreeBSD_version) && __FreeBSD_version >= 1003506 ++#if !defined(OS_FREEBSD) libusb_hotplug_callback_handle hotplug_handle_; +#endif diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_declarative__webrequest_webrequest__action.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_declarative__webrequest_webrequest__action.cc new file mode 100644 index 000000000000..bc309c931c48 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_declarative__webrequest_webrequest__action.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/extensions/browser/api/declarative_webrequest/webrequest_action.cc +@@ -29,7 +29,11 @@ + #include "net/base/registry_controlled_domains/registry_controlled_domain.h" + #include "net/http/http_util.h" + #include "net/url_request/url_request.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + using content::ResourceRequestInfo; + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__event__router__factory.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__event__router__factory.cc new file mode 100644 index 000000000000..cbd42fdb4af1 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_networking__private_networking__private__event__router__factory.cc @@ -0,0 +1,17 @@ +--- src/3rdparty/chromium/extensions/browser/api/networking_private/networking_private_event_router_factory.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/extensions/browser/api/networking_private/networking_private_event_router_factory.cc +@@ -13,6 +13,7 @@ + + namespace extensions { + ++#if !defined(OS_BSD) + // static + NetworkingPrivateEventRouter* + NetworkingPrivateEventRouterFactory::GetForProfile( +@@ -57,5 +58,6 @@ bool NetworkingPrivateEventRouterFactory + bool NetworkingPrivateEventRouterFactory::ServiceIsNULLWhileTesting() const { + return true; + } ++#endif + + } // namespace extensions diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_serial_serial__api.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_serial_serial__api.cc new file mode 100644 index 000000000000..a26eb71d466f --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_serial_serial__api.cc @@ -0,0 +1,17 @@ +--- src/3rdparty/chromium/extensions/browser/api/serial/serial_api.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/extensions/browser/api/serial/serial_api.cc +@@ -85,12 +85,13 @@ bool SerialGetDevicesFunction::Prepare() + + void SerialGetDevicesFunction::Work() { + DCHECK_CURRENTLY_ON(BrowserThread::FILE); +- ++#if !defined(OS_BSD) + std::unique_ptr enumerator = + device::SerialDeviceEnumerator::Create(); + mojo::Array devices = enumerator->GetDevices(); + results_ = serial::GetDevices::Results::Create( + devices.To>()); ++#endif + } + + SerialConnectFunction::SerialConnectFunction() { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_web__request_form__data__parser.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_web__request_form__data__parser.cc new file mode 100644 index 000000000000..00348402febc --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_api_web__request_form__data__parser.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/extensions/browser/api/web_request/form_data_parser.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/extensions/browser/api/web_request/form_data_parser.cc +@@ -15,7 +15,11 @@ + #include "base/values.h" + #include "net/base/escape.h" + #include "net/url_request/url_request.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + using base::DictionaryValue; + using base::ListValue; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_image__util.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_image__util.cc new file mode 100644 index 000000000000..d5a59a331a58 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_image__util.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/extensions/common/image_util.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/extensions/common/image_util.cc +@@ -11,7 +11,11 @@ + #include "base/strings/string_number_conversions.h" + #include "base/strings/string_util.h" + #include "base/strings/stringprintf.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + #include "third_party/skia/include/core/SkColor.h" + #include "third_party/skia/include/utils/SkParse.h" + #include "ui/gfx/color_utils.h" diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_stack__frame.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_stack__frame.cc new file mode 100644 index 000000000000..5d3230a2213c --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_common_stack__frame.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/extensions/common/stack_frame.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/extensions/common/stack_frame.cc +@@ -7,7 +7,11 @@ + #include + + #include "base/strings/utf_string_conversions.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace extensions { + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_BUILD.gn new file mode 100644 index 000000000000..5763621f5654 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/gpu/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/gpu/BUILD.gn +@@ -93,7 +93,7 @@ test("command_buffer_gles2_tests") { + libs += [ "android" ] + deps += [ "//ui/android:ui_java" ] + } +- if (is_linux && !is_component_build) { ++ if ((is_linux || is_bsd) && !is_component_build) { + configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] + } + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_program__manager.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_program__manager.cc new file mode 100644 index 000000000000..da584a29481e --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_program__manager.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/gpu/command_buffer/service/program_manager.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/gpu/command_buffer/service/program_manager.cc +@@ -31,7 +31,11 @@ + #include "gpu/command_buffer/service/program_cache.h" + #include "gpu/command_buffer/service/progress_reporter.h" + #include "gpu/command_buffer/service/shader_manager.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + #include "ui/gl/gl_version_info.h" + + using base::TimeDelta; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_BUILD.gn new file mode 100644 index 000000000000..b05c53678fb4 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_BUILD.gn @@ -0,0 +1,27 @@ +--- src/3rdparty/chromium/gpu/config/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/gpu/config/BUILD.gn +@@ -8,7 +8,8 @@ import("//build/config/ui.gni") + + declare_args() { + # Use the PCI lib to collect GPU information on Linux. +- use_libpci = is_linux && (!is_chromecast || is_cast_desktop_build) && ++ use_libpci = (is_linux || is_bsd) && ++ (!is_chromecast || is_cast_desktop_build) && + (use_x11 || use_ozone) + } + +@@ -97,6 +98,14 @@ source_set("config_sources") { + ] + } + } ++ ++ if (is_bsd) { ++ sources -= [ ++ "gpu_info_collector_linux.cc", ++ "gpu_info_collector_linux.h" ++ ] ++ } ++ + if (is_mac) { + libs = [ + "IOKit.framework", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc new file mode 100644 index 000000000000..607cbeb0f822 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list.cc @@ -0,0 +1,32 @@ +--- src/3rdparty/chromium/gpu/config/gpu_control_list.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/gpu/config/gpu_control_list.cc +@@ -19,7 +19,11 @@ + #include "base/sys_info.h" + #include "gpu/config/gpu_info.h" + #include "gpu/config/gpu_util.h" ++#if defined(OS_BSD) ++#include ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace gpu { + namespace { +@@ -1154,7 +1158,7 @@ GpuControlList::GpuControlListEntry::GLT + GpuControlList::GpuControlListEntry::GetDefaultGLType() { + #if defined(OS_CHROMEOS) + return kGLTypeGL; +-#elif defined(OS_LINUX) || defined(OS_OPENBSD) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return kGLTypeGL; + #elif defined(OS_MACOSX) + return kGLTypeGL; +@@ -1606,7 +1610,7 @@ GpuControlList::OsType GpuControlList::G + return kOsWin; + #elif defined(OS_ANDROID) + return kOsAndroid; +-#elif defined(OS_LINUX) || defined(OS_OPENBSD) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return kOsLinux; + #elif defined(OS_MACOSX) + return kOsMacosx; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list__unittest.cc new file mode 100644 index 000000000000..c579c94113e1 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__control__list__unittest.cc @@ -0,0 +1,12 @@ +--- src/3rdparty/chromium/gpu/config/gpu_control_list_unittest.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/gpu/config/gpu_control_list_unittest.cc +@@ -175,8 +175,7 @@ TEST_F(GpuControlListTest, VendorOnAllOs + features = control_list->MakeDecision( + GpuControlList::kOsLinux, kOsVersion, gpu_info()); + EXPECT_SINGLE_FEATURE(features, TEST_FEATURE_0); +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || \ +- defined(OS_OPENBSD) ++#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_ANDROID)) + // ControlList entries will be filtered to the current OS only upon loading. + EXPECT_TRUE(control_list->LoadList( + vendor_json, GpuControlList::kCurrentOsOnly)); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__info__collector.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__info__collector.cc new file mode 100644 index 000000000000..52ec3663e863 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__info__collector.cc @@ -0,0 +1,13 @@ +--- src/3rdparty/chromium/gpu/config/gpu_info_collector.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/gpu/config/gpu_info_collector.cc +@@ -193,8 +193,10 @@ CollectInfoResult CollectGraphicsInfoGL( + gpu_info->pixel_shader_version = glsl_version; + gpu_info->vertex_shader_version = glsl_version; + ++#ifndef __FreeBSD__ + IdentifyActiveGPU(gpu_info); + return CollectDriverInfoGL(gpu_info); ++#endif + } + + void MergeGPUInfoGL(GPUInfo* basic_gpu_info, diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__test__config.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__test__config.cc new file mode 100644 index 000000000000..ea5d3fce4246 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_config_gpu__test__config.cc @@ -0,0 +1,30 @@ +--- src/3rdparty/chromium/gpu/config/gpu_test_config.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/gpu/config/gpu_test_config.cc +@@ -24,7 +24,7 @@ namespace { + GPUTestConfig::OS GetCurrentOS() { + #if defined(OS_CHROMEOS) + return GPUTestConfig::kOsChromeOS; +-#elif defined(OS_LINUX) || defined(OS_OPENBSD) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return GPUTestConfig::kOsLinux; + #elif defined(OS_WIN) + int32_t major_version = 0; +@@ -255,6 +255,10 @@ bool GPUTestBotConfig::LoadCurrentConfig + bool rt; + if (gpu_info == NULL) { + GPUInfo my_gpu_info; ++#if defined(OS_FREEBSD) ++ rt = false; ++ LOG(WARNING) << "CollectGpuID not present on FreeBSD"; ++#else + CollectInfoResult result = CollectGpuID( + &my_gpu_info.gpu.vendor_id, &my_gpu_info.gpu.device_id); + if (result != kCollectInfoSuccess) { +@@ -264,6 +268,7 @@ bool GPUTestBotConfig::LoadCurrentConfig + } else { + rt = SetGPUInfo(my_gpu_info); + } ++#endif + } else { + rt = SetGPUInfo(*gpu_info); + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_gles2__conform__support_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_gles2__conform__support_BUILD.gn new file mode 100644 index 000000000000..d42cee939c12 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_gles2__conform__support_BUILD.gn @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/gpu/gles2_conform_support/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/gpu/gles2_conform_support/BUILD.gn +@@ -60,7 +60,7 @@ executable("gles2_conform_support") { + "//gpu/gles2_conform_support/egl", + "//ui/gl", + ] +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ + "native/egl_native_aura.cc", + "native/egl_native_x11.cc", +@@ -413,7 +413,7 @@ if (internal_gles2_conform_tests) { + # Must be done this way for warning flags to be ordered correctly. + ":gles2_conform_test_warnings", + ] +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (!is_chromeos) { + deps += [ "//build/config/linux/gtk2" ] + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_gles2__conform__support_native_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_gles2__conform__support_native_BUILD.gn new file mode 100644 index 000000000000..1e5c934e0a6c --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_gles2__conform__support_native_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/gpu/gles2_conform_support/native/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/gpu/gles2_conform_support/native/BUILD.gn +@@ -20,7 +20,7 @@ source_set("native") { + "//gpu/gles2_conform_support/egl", + "//ui/gl", + ] +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ + "egl_native_aura.cc", + "egl_native_x11.cc", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_gpu__config.gypi b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_gpu__config.gypi deleted file mode 100644 index 2a68e1bed6a9..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_gpu__config.gypi +++ /dev/null @@ -1,17 +0,0 @@ ---- src/3rdparty/chromium/gpu/gpu_config.gypi.orig 2016-11-07 14:46:18 UTC -+++ src/3rdparty/chromium/gpu/gpu_config.gypi -@@ -66,12 +66,12 @@ - '../third_party/amd/amd_videocard_info_win.cc', - ], - }], -- ['OS=="linux" and use_libpci==1 and (use_x11==1 or use_ozone==1)', { -+ ['(OS=="linux" or os_bsd==1) and use_libpci==1 and (use_x11==1 or use_ozone==1)', { - 'dependencies': [ - '../build/linux/system.gyp:libpci', - ], - }], -- ['OS=="linux" and use_x11==1', { -+ ['(OS=="linux" or os_bsd==1) and use_x11==1', { - 'dependencies': [ - '../build/linux/system.gyp:x11', - '../build/linux/system.gyp:xext', diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_client_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_client_BUILD.gn new file mode 100644 index 000000000000..9c185b55556f --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_client_BUILD.gn @@ -0,0 +1,10 @@ +--- src/3rdparty/chromium/gpu/ipc/client/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/gpu/ipc/client/BUILD.gn +@@ -51,6 +51,7 @@ source_set("ipc_client_sources") { + configs += [ + "//build/config/compiler:no_size_t_to_int_warning", + "//gpu:gpu_implementation", ++ "//build/config/linux:x11", + ] + deps = [ + "//base", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_BUILD.gn new file mode 100644 index 000000000000..71986f058d38 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_BUILD.gn @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/gpu/ipc/service/BUILD.gn.orig 2017-12-15 17:07:13.968625000 -0500 ++++ src/3rdparty/chromium/gpu/ipc/service/BUILD.gn 2017-12-15 17:08:34.840034000 -0500 +@@ -104,11 +104,12 @@ + ] + libs += [ "android" ] + } +- if (is_linux && ui_compositor_image_transport) { ++ if ((is_linux || is_bsd) && ui_compositor_image_transport) { + sources += [ "image_transport_surface_linux.cc" ] + } + if (use_x11) { + sources += [ "x_util.h" ] ++ configs += [ "//build/config/linux:x11" ] + } + if (use_ozone) { + sources += [ diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc new file mode 100644 index 000000000000..b2c626d4bea3 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc @@ -0,0 +1,38 @@ +--- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc +@@ -75,7 +75,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUI + } + } + +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) + void CollectGraphicsInfo(gpu::GPUInfo& gpu_info) { + TRACE_EVENT0("gpu,startup", "Collect Graphics Info"); + +@@ -94,7 +94,7 @@ void CollectGraphicsInfo(gpu::GPUInfo& g + break; + } + } +-#endif // defined(OS_MACOSX) ++#endif // defined(OS_MACOSX) && defined(OS_BSD) + + #if defined(OS_LINUX) && !defined(OS_CHROMEOS) + bool CanAccessNvidiaDeviceFile() { +@@ -189,7 +189,7 @@ bool GpuInit::InitializeAndStartSandbox( + // By skipping the following code on Mac, we don't really lose anything, + // because the basic GPU information is passed down from the host process. + base::TimeTicks before_collect_context_graphics_info = base::TimeTicks::Now(); +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) + CollectGraphicsInfo(gpu_info_); + if (gpu_info_.context_info_state == gpu::kCollectInfoFatalFailure) + return false; +@@ -206,7 +206,7 @@ bool GpuInit::InitializeAndStartSandbox( + gpu::ApplyGpuDriverBugWorkarounds( + gpu_info_, const_cast(&command_line)); + } +-#endif // !defined(OS_MACOSX) ++#endif // !defined(OS_MACOSX) && !defined(OS_BSD) + + base::TimeDelta collect_context_time = + base::TimeTicks::Now() - before_collect_context_graphics_info; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_tools_compositor__model__bench_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_tools_compositor__model__bench_BUILD.gn new file mode 100644 index 000000000000..06ec25711cf4 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_tools_compositor__model__bench_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/gpu/tools/compositor_model_bench/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/gpu/tools/compositor_model_bench/BUILD.gn +@@ -4,7 +4,7 @@ + + import("//build/config/ui.gni") + +-if (is_linux && !is_chromeos && current_cpu != "arm" && use_x11) { ++if ((is_linux || is_bsd) && !is_chromeos && current_cpu != "arm" && use_x11) { + executable("compositor_model_bench") { + sources = [ + "compositor_model_bench.cc", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_BUILD.gn new file mode 100644 index 000000000000..2068f6aa15ef --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/gpu/vulkan/BUILD.gn.orig 2017-01-26 00:49:14 UTC ++++ src/3rdparty/chromium/gpu/vulkan/BUILD.gn +@@ -14,7 +14,7 @@ if (enable_vulkan) { + component("vulkan") { + output_name = "vulkan_wrapper" + +- if (is_linux) { ++ if (is_linux || is_bsd) { + assert(use_x11, "Vulkan only support x11 at this point.") + sources = [ + "vulkan_command_buffer.cc", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h new file mode 100644 index 000000000000..6687841c533b --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__channel.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ipc/ipc_channel.h.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/ipc/ipc_channel.h +@@ -245,7 +245,7 @@ class IPC_EXPORT Channel : public Sender + static std::string GenerateUniqueRandomChannelID(); + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Sandboxed processes live in a PID namespace, so when sending the IPC hello + // message from client to server we need to send the PID from the global + // PID namespace. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.cc new file mode 100644 index 000000000000..039b2497e794 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ipc/ipc_message_utils.cc.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/ipc/ipc_message_utils.cc +@@ -425,7 +425,7 @@ void ParamTraits::Log(cons + l->append(base::UintToString(p)); + } + +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) + void ParamTraits::Log(const param_type& p, std::string* l) { + l->append(base::Int64ToString(static_cast(p))); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.h new file mode 100644 index 000000000000..2b90c65faeac --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ipc_ipc__message__utils.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ipc/ipc_message_utils.h.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/ipc/ipc_message_utils.h +@@ -210,7 +210,7 @@ struct ParamTraits { + // 3) Android 64 bit also has int64_t typedef'd to long. + // Since we want to support Android 32<>64 bit IPC, as long as we don't have + // these traits for 32 bit ARM then that'll catch any errors. +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) + template <> + struct ParamTraits { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media__audio__alsa__audio_manager_alsa.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media__audio__alsa__audio_manager_alsa.cc new file mode 100644 index 000000000000..d78855bdcd0c --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media__audio__alsa__audio_manager_alsa.cc @@ -0,0 +1,54 @@ +--- src/3rdparty/chromium/media/audio/alsa/audio_manager_alsa.cc.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/media/audio/alsa/audio_manager_alsa.cc +@@ -135,7 +135,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic + int card = -1; + + // Loop through the sound cards to get ALSA device hints. ++#ifdef OS_LINUX + while (!wrapper_->CardNext(&card) && card >= 0) { ++#endif + void** hints = NULL; + int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); + if (!error) { +@@ -147,7 +149,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic + DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: " + << wrapper_->StrError(error); + } ++#ifdef OS_LINUX + } ++#endif + } + + void AudioManagerAlsa::GetAlsaDevicesInfo( +@@ -230,7 +234,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail + // goes through software conversion if needed (e.g. incompatible + // sample rate). + // TODO(joi): Should we prefer "hw" instead? ++#ifdef OS_LINUX + static const char kDeviceTypeDesired[] = "plughw"; ++#else ++ static const char kDeviceTypeDesired[] = "plug"; ++#endif + return strncmp(kDeviceTypeDesired, + device_name, + arraysize(kDeviceTypeDesired) - 1) == 0; +@@ -254,7 +262,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe + // Loop through the sound cards. + // Don't use snd_device_name_hint(-1,..) since there is a access violation + // inside this ALSA API with libasound.so.2.0.0. ++#ifdef OS_LINUX + while (!wrapper_->CardNext(&card) && (card >= 0) && !has_device) { ++#endif + int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); + if (!error) { + for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) { +@@ -278,7 +288,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe + DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: " + << wrapper_->StrError(error); + } ++#ifdef OS_LINUX + } ++#endif + + return has_device; + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn new file mode 100644 index 000000000000..3a41bac3e87d --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_BUILD.gn @@ -0,0 +1,25 @@ +--- src/3rdparty/chromium/media/audio/BUILD.gn.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/media/audio/BUILD.gn +@@ -206,7 +206,7 @@ source_set("audio") { + deps += [ "//media/base/android:media_jni_headers" ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ "linux/audio_manager_linux.cc" ] + } + +@@ -255,10 +255,12 @@ source_set("audio") { + configs += [ ":libpulse" ] + } else { + # TODO(ajwong): Technically, this dl should go in the action. +- libs += [ "dl" ] + deps += [ ":pulse_generate_stubs" ] + sources += get_target_outputs(":pulse_generate_stubs") + } ++ if (is_linux) { ++ libs += [ "dl" ] ++ } + } + + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__manager.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__manager.cc new file mode 100644 index 000000000000..c8d81f803461 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__manager.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/media/audio/audio_manager.cc.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/media/audio/audio_manager.cc +@@ -95,7 +95,7 @@ class AudioManagerHelper : public base:: + } + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + void set_app_name(const std::string& app_name) { app_name_ = app_name; } + const std::string& app_name() const { return app_name_; } + #endif +@@ -253,7 +253,7 @@ class AudioManagerHelper : public base:: + std::unique_ptr com_initializer_for_testing_; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + std::string app_name_; + #endif + +@@ -365,7 +365,7 @@ void AudioManager::EnableCrashKeyLogging + g_helper.Pointer()->enable_crash_key_logging(); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + // static + void AudioManager::SetGlobalAppName(const std::string& app_name) { + g_helper.Pointer()->set_app_name(app_name); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__manager.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__manager.h new file mode 100644 index 000000000000..c9837bce1a45 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_audio__manager.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/media/audio/audio_manager.h.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/media/audio/audio_manager.h +@@ -84,7 +84,7 @@ class MEDIA_EXPORT AudioManager { + // See http://crbug.com/422522 + static void EnableCrashKeyLoggingForAudioThreadHangs(); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_FREEBSD) + // Sets the name of the audio source as seen by external apps. Only actually + // used with PulseAudio as of this writing. + static void SetGlobalAppName(const std::string& app_name); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_BUILD.gn new file mode 100644 index 000000000000..0f8cf4ea92dc --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_BUILD.gn @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/media/base/BUILD.gn.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/media/base/BUILD.gn +@@ -309,7 +309,7 @@ target(link_target_type, "base") { + allow_circular_includes_from += [ "//media/base/android" ] + } + +- if (is_linux && use_x11) { ++ if ((is_linux || is_bsd) && use_x11) { + configs += [ + "//build/config/linux:x11", + "//build/config/linux:xext", +@@ -345,7 +345,7 @@ target(link_target_type, "base") { + deps += [ ":media_yasm" ] + } + +- if (is_linux || is_win) { ++ if (is_linux || is_bsd || is_win) { + sources += [ + "keyboard_event_counter.cc", + "keyboard_event_counter.h", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_BUILD.gn new file mode 100644 index 000000000000..efecefef43e3 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_BUILD.gn @@ -0,0 +1,19 @@ +--- src/3rdparty/chromium/media/capture/BUILD.gn.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/media/capture/BUILD.gn +@@ -127,6 +127,16 @@ component("capture") { + ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "video/linux/video_capture_device_linux.cc", ++ "video/linux/video_capture_device_linux.h", ++ "video/linux/video_capture_device_factory_linux.cc", ++ "video/linux/video_capture_device_factory_linux.h", ++ "video/linux/v4l2_capture_delegate.cc", ++ ] ++ } ++ + if (is_win) { + deps += [ + "//media/base", # For media_switches. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_fake__video__capture__device__factory.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_fake__video__capture__device__factory.cc new file mode 100644 index 000000000000..74e8deb237a2 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_fake__video__capture__device__factory.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/media/capture/video/fake_video_capture_device_factory.cc.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/media/capture/video/fake_video_capture_device_factory.cc +@@ -71,7 +71,7 @@ void FakeVideoCaptureDeviceFactory::GetD + for (int n = 0; n < number_of_devices_; ++n) { + device_descriptors->emplace_back(base::StringPrintf("fake_device_%d", n), + base::StringPrintf("/dev/video%d", n), +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE + #elif defined(OS_MACOSX) + VideoCaptureApi::MACOSX_AVFOUNDATION diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_file__video__capture__device__factory.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_file__video__capture__device__factory.cc index 5e274b1774c6..efeac4656ee1 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_file__video__capture__device__factory.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_file__video__capture__device__factory.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/media/capture/video/file_video_capture_device_factory.cc.orig 2017-04-23 10:37:42 UTC +--- src/3rdparty/chromium/media/capture/video/file_video_capture_device_factory.cc.orig 2017-01-26 00:49:15 UTC +++ src/3rdparty/chromium/media/capture/video/file_video_capture_device_factory.cc -@@ -50,7 +50,7 @@ void FileVideoCaptureDeviceFactory::GetD - device_names->push_back(VideoCaptureDevice::Name( +@@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetD + #elif defined(OS_MACOSX) command_line_file_path.value(), kFileVideoCaptureDeviceName, - VideoCaptureDevice::Name::AVFOUNDATION)); + VideoCaptureApi::MACOSX_AVFOUNDATION -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - device_names->push_back(VideoCaptureDevice::Name( command_line_file_path.value(), kFileVideoCaptureDeviceName, - VideoCaptureDevice::Name::V4L2_SINGLE_PLANE)); + VideoCaptureApi::LINUX_V4L2_SINGLE_PLANE + #else diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc index e3a0981988dd..0094b65faff9 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_v4l2__capture__delegate.cc @@ -1,21 +1,25 @@ ---- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.cc.orig 2017-04-19 19:13:43 UTC +--- src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.cc.orig 2017-01-26 00:49:15 UTC +++ src/3rdparty/chromium/media/capture/video/linux/v4l2_capture_delegate.cc -@@ -20,7 +20,7 @@ - #include "media/capture/video/linux/v4l2_capture_delegate_single_plane.h" - #include "media/capture/video/linux/video_capture_device_linux.h" +@@ -4,7 +4,9 @@ + + #include "media/capture/video/linux/v4l2_capture_delegate.h" --#if !defined(OS_OPENBSD) +#if !defined(OS_BSD) #include - #endif ++#endif + #include + #include + #include +@@ -20,10 +22,10 @@ + #include "media/capture/video/blob_utils.h" + #include "media/capture/video/linux/video_capture_device_linux.h" -@@ -277,9 +277,7 @@ void V4L2CaptureDelegate::AllocateAndSta - // operation (|errno| == EINVAL in this case) or plain failure. - if ((power_line_frequency_ == V4L2_CID_POWER_LINE_FREQUENCY_50HZ) - || (power_line_frequency_ == V4L2_CID_POWER_LINE_FREQUENCY_60HZ) --#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) - || (power_line_frequency_ == V4L2_CID_POWER_LINE_FREQUENCY_AUTO) +-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++// #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) + // 16 bit depth, Realsense F200. + #define V4L2_PIX_FMT_Z16 v4l2_fourcc('Z', '1', '6', ' ') -#endif - ) { - struct v4l2_control control = {}; - control.id = V4L2_CID_POWER_LINE_FREQUENCY; ++// #endif + + // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the + // format is introduced to kernel. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__linux.cc index 6e095e988b29..d0b05aaf1e2b 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__linux.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__linux.cc @@ -1,25 +1,62 @@ ---- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc.orig 2016-11-07 14:46:18 UTC +--- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc.orig 2017-01-26 00:49:15 UTC +++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc -@@ -17,7 +17,9 @@ - #include - #else - #include -+#if !defined(OS_BSD) - #include -+#endif // defined(OS_BSD) - #endif +@@ -21,6 +21,7 @@ namespace media { -@@ -144,12 +146,8 @@ int VideoCaptureDeviceLinux::TranslatePo - case media::PowerLineFrequency::FREQUENCY_60HZ: - return V4L2_CID_POWER_LINE_FREQUENCY_60HZ; - default: --#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) - // If we have no idea of the frequency, at least try and set it to AUTO. - return V4L2_CID_POWER_LINE_FREQUENCY_AUTO; --#else -- return V4L2_CID_POWER_LINE_FREQUENCY_60HZ; --#endif + ++#if !defined(OS_FREEBSD) + // Translates Video4Linux pixel formats to Chromium pixel formats. + // static + VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat( +@@ -34,6 +35,7 @@ std::list VideoCaptureDeviceLi + bool favour_mjpeg) { + return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg); + } ++#endif // !defined(OS_FREEBSD) + + VideoCaptureDeviceLinux::VideoCaptureDeviceLinux( + const VideoCaptureDeviceDescriptor& device_descriptor) +@@ -47,6 +49,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDe + v4l2_thread_.Stop(); + } + ++#if !defined(OS_FREEBSD) + void VideoCaptureDeviceLinux::AllocateAndStart( + const VideoCaptureParams& params, + std::unique_ptr client) { +@@ -70,7 +73,13 @@ void VideoCaptureDeviceLinux::AllocateAn + params.requested_format.frame_size.height(), + params.requested_format.frame_rate, base::Passed(&client))); + } ++#else // !defined(OS_FREEBSD) ++void VideoCaptureDeviceLinux::AllocateAndStart( ++ const VideoCaptureParams& params, ++ std::unique_ptr client) {} ++#endif // !defined(OS_FREEBSD) + ++#if !defined(OS_FREEBSD) + void VideoCaptureDeviceLinux::StopAndDeAllocate() { + if (!v4l2_thread_.IsRunning()) + return; // Wrong state. +@@ -110,7 +119,11 @@ void VideoCaptureDeviceLinux::SetPhotoOp + base::Bind(&V4L2CaptureDelegate::SetPhotoOptions, capture_impl_, + base::Passed(&settings), base::Passed(&callback))); + } ++#else // !defined(OS_FREEBSD) ++void VideoCaptureDeviceLinux::StopAndDeAllocate() {} ++#endif // !defined(OS_FREEBSD) + ++#if !defined(OS_FREEBSD) + void VideoCaptureDeviceLinux::SetRotation(int rotation) { + if (v4l2_thread_.IsRunning()) { + v4l2_thread_.task_runner()->PostTask( +@@ -118,6 +131,9 @@ void VideoCaptureDeviceLinux::SetRotatio + base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation)); } } ++#else // !defined(OS_FREEBSD) ++void VideoCaptureDeviceLinux::SetRotation(int rotation) {} ++#endif // !defined(OS_FREEBSD) + // static + int VideoCaptureDeviceLinux::TranslatePowerLineFrequencyToV4L2( diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device.cc deleted file mode 100644 index 04cba783ab49..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/media/capture/video/video_capture_device.cc.orig 2016-11-07 14:46:18 UTC -+++ src/3rdparty/chromium/media/capture/video/video_capture_device.cc -@@ -35,7 +35,7 @@ VideoCaptureDevice::Name::Name(const std - : device_name_(name), unique_id_(id) { - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - VideoCaptureDevice::Name::Name(const std::string& name, - const std::string& id, - const CaptureApiType api_type) -@@ -82,7 +82,7 @@ VideoCaptureDevice::Name::Name(const std - VideoCaptureDevice::Name::~Name() { - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - const char* VideoCaptureDevice::Name::GetCaptureApiTypeString() const { - switch (capture_api_type()) { - case V4L2_SINGLE_PLANE: diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device.h deleted file mode 100644 index b79b9ca850c4..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device.h +++ /dev/null @@ -1,38 +0,0 @@ ---- src/3rdparty/chromium/media/capture/video/video_capture_device.h.orig 2016-11-07 14:46:18 UTC -+++ src/3rdparty/chromium/media/capture/video/video_capture_device.h -@@ -51,7 +51,7 @@ class MEDIA_EXPORT VideoCaptureDevice { - Name(); - Name(const std::string& name, const std::string& id); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // Linux/CrOS targets Capture Api type: it can only be set on construction. - enum CaptureApiType { - V4L2_SINGLE_PLANE, -@@ -83,7 +83,7 @@ class MEDIA_EXPORT VideoCaptureDevice { - #endif - - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) - Name(const std::string& name, - const std::string& id, - const CaptureApiType api_type); -@@ -120,7 +120,7 @@ class MEDIA_EXPORT VideoCaptureDevice { - bool operator<(const Name& other) const { return unique_id_ < other.id(); } - - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) - CaptureApiType capture_api_type() const { - return capture_api_class_.capture_api_type(); - } -@@ -144,7 +144,7 @@ class MEDIA_EXPORT VideoCaptureDevice { - std::string device_name_; - std::string unique_id_; - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) - // This class wraps the CaptureApiType to give it a by default value if not - // initialized. - class CaptureApiClass { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc new file mode 100644 index 000000000000..6422b6f5a0d9 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__client.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/media/capture/video/video_capture_device_client.cc +@@ -193,7 +193,7 @@ void VideoCaptureDeviceClient::OnIncomin + // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. + // Windows RGB24 defines blue at lowest byte, + // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + origin_colorspace = libyuv::FOURCC_RAW; + #elif defined(OS_WIN) + origin_colorspace = libyuv::FOURCC_24BG; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__factory.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__factory.cc index 69895bcf3b7b..b8c5134f3520 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__factory.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_video__capture__device__factory.cc @@ -1,11 +1,30 @@ ---- src/3rdparty/chromium/media/capture/video/video_capture_device_factory.cc.orig 2017-04-23 20:12:45 UTC +--- src/3rdparty/chromium/media/capture/video/video_capture_device_factory.cc.orig 2017-01-26 00:49:15 UTC +++ src/3rdparty/chromium/media/capture/video/video_capture_device_factory.cc -@@ -55,7 +55,7 @@ void VideoCaptureDeviceFactory::Enumerat +@@ -18,6 +18,10 @@ namespace media { + std::unique_ptr + VideoCaptureDeviceFactory::CreateFactory( + scoped_refptr ui_task_runner) { ++#if defined(OS_BSD) ++ return std::unique_ptr( ++ new media::FakeVideoCaptureDeviceFactory()); ++#else + const base::CommandLine* command_line = + base::CommandLine::ForCurrentProcess(); + // Use a Fake or File Video Device Factory if the command line flags are +@@ -36,6 +40,7 @@ VideoCaptureDeviceFactory::CreateFactory + return std::unique_ptr( + CreateVideoCaptureDeviceFactory(ui_task_runner)); + } ++#endif } - #if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_ANDROID) && \ -- !defined(OS_WIN) -+ !defined(OS_WIN) && !defined(OS_BSD) + VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() { +@@ -55,7 +60,7 @@ void VideoCaptureDeviceFactory::Enumerat + callback.Run(std::move(device_descriptors)); + } + +-#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_ANDROID) && \ ++#if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_BSD) && !defined(OS_ANDROID) && \ + !defined(OS_WIN) // static VideoCaptureDeviceFactory* - VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory( diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_cast_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_cast_BUILD.gn new file mode 100644 index 000000000000..bf00b4fc3501 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_cast_BUILD.gn @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/media/cast/BUILD.gn.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/media/cast/BUILD.gn +@@ -356,7 +356,7 @@ test("cast_unittests") { + } + } + +-if (is_win || is_mac || (is_linux && !is_chromeos)) { ++if (is_win || is_mac || (is_linux && !is_chromeos) || is_bsd) { + # This is a target for the collection of cast development tools. They are + # not built/linked into the Chromium browser. + group("testing_tools") { +@@ -410,7 +410,7 @@ if (is_win || is_mac || (is_linux && !is + "//ui/gfx/geometry", + ] + +- if (is_linux && !is_chromeos && use_x11) { ++ if ((is_linux || is_bsd) && !is_chromeos && use_x11) { + sources += [ + "test/linux_output_window.cc", + "test/linux_output_window.h", +@@ -513,7 +513,7 @@ if (is_win || is_mac || (is_linux && !is + } + } + +-if (is_linux && !is_chromeos) { ++if ((is_linux || is_bsd) && !is_chromeos) { + test("tap_proxy") { + sources = [ + "test/utility/tap_proxy.cc", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_cdm_ppapi_ppapi__cdm__adapter.gni b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_cdm_ppapi_ppapi__cdm__adapter.gni new file mode 100644 index 000000000000..4c87962e9a1b --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_cdm_ppapi_ppapi__cdm__adapter.gni @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/media/cdm/ppapi/ppapi_cdm_adapter.gni.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/media/cdm/ppapi/ppapi_cdm_adapter.gni +@@ -5,7 +5,7 @@ + # This template defines a CDM adapter target. Just use this as you would a + # normal target and everything should work correctly. + template("ppapi_cdm_adapter") { +- if (is_mac || is_linux) { ++ if (is_mac || is_linux || is_bsd) { + _target_type = "loadable_module" + } else { + _target_type = "shared_library" +@@ -57,7 +57,7 @@ template("ppapi_cdm_adapter") { + libs += [ "rt" ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + # CDM adapter depends on a CDM in component and non-component builds. + configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ] + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_ffmpeg_ffmpeg__common.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_ffmpeg_ffmpeg__common.h new file mode 100644 index 000000000000..3f8beb68c1ff --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_ffmpeg_ffmpeg__common.h @@ -0,0 +1,31 @@ +--- src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h.orig 2017-11-08 14:13:31.000000000 -0500 ++++ src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h 2017-12-20 18:54:01.787807000 -0500 +@@ -25,8 +25,8 @@ + // Disable deprecated features which result in spammy compile warnings. This + // list of defines must mirror those in the 'defines' section of FFmpeg's + // BUILD.gn file or the headers below will generate different structures! +-#if !defined(USE_SYSTEM_FFMPEG) +-#define FF_API_CONVERGENCE_DURATION 0 ++// #if !defined(USE_SYSTEM_FFMPEG) ++// #define FF_API_CONVERGENCE_DURATION 0 + // Upstream libavcodec/utils.c still uses the deprecated + // av_dup_packet(), causing deprecation warnings. + // The normal fix for such things is to disable the feature as below, +@@ -34,16 +34,13 @@ + // (In this case, the fix is replacing the call with a new function.) + // In the meantime, we directly disable those warnings in the C file. + //#define FF_API_AVPACKET_OLD_API 0 +-#endif ++// #endif + + // Temporarily disable possible loss of data warning. + // TODO(scherkus): fix and upstream the compiler warnings. + MSVC_PUSH_DISABLE_WARNING(4244); + #include + #include +-#if !defined(USE_SYSTEM_FFMPEG) +-#include +-#endif + #include + #include + #include diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_filters_ffmpeg__demuxer.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_filters_ffmpeg__demuxer.cc new file mode 100644 index 000000000000..15719706148a --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_filters_ffmpeg__demuxer.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc.orig 2017-11-08 14:13:31.000000000 -0500 ++++ src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc 2017-12-20 19:01:30.286801000 -0500 +@@ -1198,26 +1198,6 @@ + // If no estimate is found, the stream entry will be kInfiniteDuration. + std::vector start_time_estimates(format_context->nb_streams, + kInfiniteDuration); +-#if !defined(USE_SYSTEM_FFMPEG) +- const AVFormatInternal* internal = format_context->internal; +- if (internal && internal->packet_buffer && +- format_context->start_time != static_cast(AV_NOPTS_VALUE)) { +- struct AVPacketList* packet_buffer = internal->packet_buffer; +- while (packet_buffer != internal->packet_buffer_end) { +- DCHECK_LT(static_cast(packet_buffer->pkt.stream_index), +- start_time_estimates.size()); +- const AVStream* stream = +- format_context->streams[packet_buffer->pkt.stream_index]; +- if (packet_buffer->pkt.pts != static_cast(AV_NOPTS_VALUE)) { +- const base::TimeDelta packet_pts = +- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts); +- if (packet_pts < start_time_estimates[stream->index]) +- start_time_estimates[stream->index] = packet_pts; +- } +- packet_buffer = packet_buffer->next; +- } +- } +-#endif + std::unique_ptr media_tracks(new MediaTracks()); + + DCHECK(track_id_to_demux_stream_map_.empty()); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_filters_vp9__parser.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_filters_vp9__parser.h index 00b1b7c54a14..001a3ba00d29 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_filters_vp9__parser.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_filters_vp9__parser.h @@ -1,10 +1,10 @@ ---- src/3rdparty/chromium/media/filters/vp9_parser.h.orig 2016-11-07 14:46:18 UTC +--- src/3rdparty/chromium/media/filters/vp9_parser.h.orig 2017-01-26 00:49:15 UTC +++ src/3rdparty/chromium/media/filters/vp9_parser.h @@ -14,6 +14,7 @@ #include #include -+#include ++#include + #include #include - diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_common_offset__byte__queue.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_common_offset__byte__queue.cc new file mode 100644 index 000000000000..2c7f44f21075 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_common_offset__byte__queue.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/media/formats/common/offset_byte_queue.cc.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/media/formats/common/offset_byte_queue.cc +@@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t off + *size = tail() - offset; + } + +-bool OffsetByteQueue::Trim(int64_t max_offset) { +- if (max_offset < head_) return true; +- if (max_offset > tail()) { ++bool OffsetByteQueue::Trim(int64_t _max_offset) { ++ if (_max_offset < head_) return true; ++ if (_max_offset > tail()) { + Pop(size_); + return false; + } +- Pop(max_offset - head_); ++ Pop(_max_offset - head_); + return true; + } + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_common_offset__byte__queue.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_common_offset__byte__queue.h new file mode 100644 index 000000000000..5cc88cf1316b --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_common_offset__byte__queue.h @@ -0,0 +1,22 @@ +--- src/3rdparty/chromium/media/formats/common/offset_byte_queue.h.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/media/formats/common/offset_byte_queue.h +@@ -36,15 +36,15 @@ class MEDIA_EXPORT OffsetByteQueue { + // a null |buf| and a |size| of zero. + void PeekAt(int64_t offset, const uint8_t** buf, int* size); + +- // Marks the bytes up to (but not including) |max_offset| as ready for ++ // Marks the bytes up to (but not including) |_max_offset| as ready for + // deletion. This is relatively inexpensive, but will not necessarily reduce + // the resident buffer size right away (or ever). + // + // Returns true if the full range of bytes were successfully trimmed, +- // including the case where |max_offset| is less than the current head. +- // Returns false if |max_offset| > tail() (although all bytes currently ++ // including the case where |_max_offset| is less than the current head. ++ // Returns false if |_max_offset| > tail() (although all bytes currently + // buffered are still cleared). +- bool Trim(int64_t max_offset); ++ bool Trim(int64_t _max_offset); + + // The head and tail positions, in terms of the file's absolute offsets. + // tail() is an exclusive bound. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_mp2t_es__parser__adts.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_mp2t_es__parser__adts.cc new file mode 100644 index 000000000000..eb78cce4250a --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_mp2t_es__parser__adts.cc @@ -0,0 +1,26 @@ +--- src/3rdparty/chromium/media/formats/mp2t/es_parser_adts.cc.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/media/formats/mp2t/es_parser_adts.cc +@@ -54,11 +54,11 @@ bool EsParserAdts::LookForAdtsFrame(Adts + const uint8_t* es; + es_queue_->Peek(&es, &es_size); + +- int max_offset = es_size - kADTSHeaderMinSize; +- if (max_offset <= 0) ++ int _max_offset = es_size - kADTSHeaderMinSize; ++ if (_max_offset <= 0) + return false; + +- for (int offset = 0; offset < max_offset; offset++) { ++ for (int offset = 0; offset < _max_offset; offset++) { + const uint8_t* cur_buf = &es[offset]; + if (!isAdtsSyncWord(cur_buf)) + continue; +@@ -96,7 +96,7 @@ bool EsParserAdts::LookForAdtsFrame(Adts + return true; + } + +- es_queue_->Pop(max_offset); ++ es_queue_->Pop(_max_offset); + return false; + } + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_mp2t_es__parser__mpeg1audio.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_mp2t_es__parser__mpeg1audio.cc new file mode 100644 index 000000000000..d2e6fe3af12a --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_formats_mp2t_es__parser__mpeg1audio.cc @@ -0,0 +1,26 @@ +--- src/3rdparty/chromium/media/formats/mp2t/es_parser_mpeg1audio.cc.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/media/formats/mp2t/es_parser_mpeg1audio.cc +@@ -109,11 +109,11 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud + const uint8_t* es; + es_queue_->Peek(&es, &es_size); + +- int max_offset = es_size - MPEG1AudioStreamParser::kHeaderSize; +- if (max_offset <= 0) ++ int _max_offset = es_size - MPEG1AudioStreamParser::kHeaderSize; ++ if (_max_offset <= 0) + return false; + +- for (int offset = 0; offset < max_offset; offset++) { ++ for (int offset = 0; offset < _max_offset; offset++) { + const uint8_t* cur_buf = &es[offset]; + if (cur_buf[0] != 0xff) + continue; +@@ -154,7 +154,7 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud + return true; + } + +- es_queue_->Pop(max_offset); ++ es_queue_->Pop(_max_offset); + return false; + } + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_media.gyp b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_media.gyp deleted file mode 100644 index 7f5ced262def..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_media.gyp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/media/media.gyp.orig 2016-11-07 14:46:18 UTC -+++ src/3rdparty/chromium/media/media.gyp -@@ -809,7 +809,7 @@ - 'capture/video/linux/v4l2_capture_delegate_multi_plane.h', - ], - }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'conditions': [ - ['use_x11==1', { - 'dependencies': [ -@@ -1146,7 +1146,7 @@ - 'base/simd/filter_yuv_sse2.cc', - ], - }], -- ['OS!="linux" and OS!="win"', { -+ ['OS!="linux" and OS!="win" and os_bsd!=1', { - 'sources!': [ - 'base/keyboard_event_counter.cc', - 'base/keyboard_event_counter.h', diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_BUILD.gn new file mode 100644 index 000000000000..474b5c3f2024 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/mojo/BUILD.gn.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/mojo/BUILD.gn +@@ -12,7 +12,7 @@ group("mojo") { + "//mojo/common", + ] + +- if (!(is_linux && current_cpu == "x86")) { ++ if (!((is_linux || is_bsd) && current_cpu == "x86")) { + deps += [ "//mojo/public" ] + } + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_edk_test_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_edk_test_BUILD.gn new file mode 100644 index 000000000000..885e1ba02b02 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_edk_test_BUILD.gn @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/mojo/edk/test/BUILD.gn.orig 2017-01-26 00:49:15 UTC ++++ src/3rdparty/chromium/mojo/edk/test/BUILD.gn +@@ -48,7 +48,7 @@ source_set("run_all_unittests") { + "//testing/gtest", + ] + +- if (is_linux && !is_component_build) { ++ if ((is_linux || is_bsd) && !is_component_build) { + public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ] + } + } +@@ -68,7 +68,7 @@ source_set("run_all_perftests") { + "run_all_perftests.cc", + ] + +- if (is_linux && !is_component_build) { ++ if ((is_linux || is_bsd) && !is_component_build) { + public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ] + } + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_native__client__sdk_src_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_native__client__sdk_src_BUILD.gn new file mode 100644 index 000000000000..ccd3bf5c7807 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_native__client__sdk_src_BUILD.gn @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/native_client_sdk/src/BUILD.gn.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/native_client_sdk/src/BUILD.gn +@@ -7,7 +7,7 @@ import("//build/config/features.gni") + declare_args() { + # Set to true if cross compiling trusted (e.g. building sel_ldr_arm on x86) + # binaries is supported. +- enable_cross_trusted = is_linux ++ enable_cross_trusted = is_linux || is_bsd + + # Build the nacl SDK untrusted components. This is disabled by default since + # not all NaCl untrusted compilers are in goma (e.g arm-nacl-glibc) +@@ -28,7 +28,7 @@ if (enable_nacl) { + "//native_client/src/trusted/service_runtime:sel_ldr", + "//native_client/src/trusted/validator/driver:ncval_new", + ] +- if (is_linux) { ++ if (is_linux || is_bsd) { + deps += [ "//native_client/src/nonsfi/loader:nonsfi_loader" ] + } + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn new file mode 100644 index 000000000000..13074fd856ae --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn @@ -0,0 +1,86 @@ +--- src/3rdparty/chromium/net/BUILD.gn.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/net/BUILD.gn +@@ -153,6 +153,11 @@ component("net") { + ] + if (is_android) { + sources -= [ "base/openssl_private_key_store_android.cc" ] ++ } else if (is_bsd) { ++ sources -= [ ++ "base/address_tracker_linux.cc", ++ "base/address_tracker_linux.h", ++ ] + } + } else { + if (is_android) { +@@ -278,6 +283,13 @@ component("net") { + sources -= [ "disk_cache/blockfile/file_posix.cc" ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "base/network_change_notifier_linux.cc", ++ "base/network_change_notifier_linux.h", ++ ] ++ } ++ + if (is_ios || is_mac) { + sources += gypi_values.net_base_mac_ios_sources + } +@@ -966,7 +978,7 @@ if (!is_ios && !is_android) { + } + } + +-if (is_linux || is_mac) { ++if (is_linux || is_bsd || is_mac) { + executable("cachetool") { + testonly = true + sources = [ +@@ -995,7 +1007,7 @@ if (is_linux || is_mac) { + } + } + +-if (is_linux) { ++if (is_linux || is_bsd) { + static_library("epoll_server") { + sources = [ + "tools/epoll_server/epoll_server.cc", +@@ -1098,7 +1110,7 @@ if (is_android) { + } + } + +-if (is_android || is_linux) { ++if (is_android || is_linux || is_bsd) { + executable("disk_cache_memory_test") { + testonly = true + sources = [ +@@ -1276,7 +1288,7 @@ test("net_unittests") { + "third_party/nist-pkits/", + ] + +- if (is_linux || is_mac || is_win) { ++ if (is_linux || is_bsd || is_mac || is_win) { + deps += [ + "//third_party/pyftpdlib/", + "//third_party/pywebsocket/", +@@ -1299,7 +1311,7 @@ test("net_unittests") { + if (is_desktop_linux) { + deps += [ ":epoll_quic_tools" ] + } +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += gypi_values.net_linux_test_sources + deps += [ + ":epoll_quic_tools", +@@ -1319,6 +1331,12 @@ test("net_unittests") { + sources -= [ "proxy/proxy_config_service_linux_unittest.cc" ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "base/address_tracker_linux_unittest.cc", ++ ] ++ } ++ + if (v8_use_external_startup_data) { + deps += [ "//gin" ] + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.h index 8df9c3a550eb..3eb43666a35f 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/net/base/address_tracker_linux.h.orig 2016-11-07 14:46:18 UTC +--- src/3rdparty/chromium/net/base/address_tracker_linux.h.orig 2017-01-26 00:49:16 UTC +++ src/3rdparty/chromium/net/base/address_tracker_linux.h @@ -6,10 +6,12 @@ #define NET_BASE_ADDRESS_TRACKER_LINUX_H_ @@ -13,3 +13,16 @@ #include #include +@@ -34,8 +36,11 @@ namespace internal { + class NET_EXPORT_PRIVATE AddressTrackerLinux : + public base::MessageLoopForIO::Watcher { + public: ++#if !defined(__FreeBSD__) + typedef std::map AddressMap; +- ++#else ++ typedef void* AddressMap; ++#endif + // Non-tracking version constructor: it takes a snapshot of the + // current system configuration. Once Init() returns, the + // configuration is available through GetOnlineLinks() and diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux__unittest.cc new file mode 100644 index 000000000000..9e15151cf15f --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux__unittest.cc @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/net/base/address_tracker_linux_unittest.cc.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/net/base/address_tracker_linux_unittest.cc +@@ -4,7 +4,11 @@ + + #include "net/base/address_tracker_linux.h" + ++#if defined(__linux__) + #include ++#else ++#include ++#endif + + #include + #include diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_mime__util__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_mime__util__unittest.cc new file mode 100644 index 000000000000..6bfc24cc0fc0 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_mime__util__unittest.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/net/base/mime_util_unittest.cc.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/net/base/mime_util_unittest.cc +@@ -243,7 +243,7 @@ TEST(MimeUtilTest, TestGetExtensionsForM + { "MeSsAge/*", 1, "eml" }, + { "image/bmp", 1, "bmp" }, + { "video/*", 6, "mp4" }, +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_IOS) ++#if (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_IOS) + { "video/*", 6, "mpg" }, + #else + { "video/*", 6, "mpeg" }, diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc new file mode 100644 index 000000000000..9e5ba8fa714a --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.cc @@ -0,0 +1,28 @@ +--- src/3rdparty/chromium/net/base/network_change_notifier.cc.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/net/base/network_change_notifier.cc +@@ -533,7 +533,6 @@ NetworkChangeNotifier* NetworkChangeNoti + #elif defined(OS_MACOSX) + return new NetworkChangeNotifierMac(); + #else +- NOTIMPLEMENTED(); + return NULL; + #endif + } +@@ -753,7 +752,7 @@ void NetworkChangeNotifier::LogOperatorC + #endif + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // static + const internal::AddressTrackerLinux* + NetworkChangeNotifier::GetAddressTracker() { +@@ -978,7 +977,7 @@ NetworkChangeNotifier::NetworkChangeNoti + network_change_calculator_->Init(); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + const internal::AddressTrackerLinux* + NetworkChangeNotifier::GetAddressTrackerInternal() const { + return NULL; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.h new file mode 100644 index 000000000000..e50013a86881 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__change__notifier.h @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/net/base/network_change_notifier.h.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/net/base/network_change_notifier.h +@@ -26,7 +26,7 @@ struct NetworkInterface; + typedef std::vector NetworkInterfaceList; + class URLRequest; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + namespace internal { + class AddressTrackerLinux; + } +@@ -332,7 +332,7 @@ class NET_EXPORT NetworkChangeNotifier { + // a large HOSTS file. + static void GetDnsConfig(DnsConfig* config); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Returns the AddressTrackerLinux if present. + static const internal::AddressTrackerLinux* GetAddressTracker(); + #endif +@@ -488,7 +488,7 @@ class NET_EXPORT NetworkChangeNotifier { + const NetworkChangeCalculatorParams& params = + NetworkChangeCalculatorParams()); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Returns the AddressTrackerLinux if present. + // TODO(szym): Retrieve AddressMap from NetworkState. http://crbug.com/144212 + virtual const internal::AddressTrackerLinux* diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__interfaces__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__interfaces__linux.cc new file mode 100644 index 000000000000..ea28e06fa907 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__interfaces__linux.cc @@ -0,0 +1,105 @@ +--- src/3rdparty/chromium/net/base/network_interfaces_linux.cc.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/net/base/network_interfaces_linux.cc +@@ -6,12 +6,14 @@ + + #include + ++#if !defined(OS_FREEBSD) + #if !defined(OS_ANDROID) + #include + #endif // !defined(OS_ANDROID) + #include + #include + #include ++#endif // !defined(OS_FREEBSD) + #include + #include + #include +@@ -49,6 +51,7 @@ bool TryConvertNativeToNetIPAttributes(i + // are still progressing through duplicated address detection (DAD) + // and shouldn't be used by the application layer until DAD process + // is completed. ++#if !defined(OS_FREEBSD) + if (native_attributes & ( + #if !defined(OS_ANDROID) + IFA_F_OPTIMISTIC | IFA_F_DADFAILED | +@@ -66,6 +69,10 @@ bool TryConvertNativeToNetIPAttributes(i + } + + return true; ++#else ++ // the flags tested above are not present on FreeBSD ++ return false; ++#endif // !OS_FREEBSD + } + + } // namespace +@@ -80,13 +87,15 @@ NetworkChangeNotifier::ConnectionType Ge + if (!s.is_valid()) + return NetworkChangeNotifier::CONNECTION_UNKNOWN; + ++#if !defined(OS_FREEBSD) + // Test wireless extensions for CONNECTION_WIFI + struct iwreq pwrq = {}; + strncpy(pwrq.ifr_name, ifname.c_str(), IFNAMSIZ - 1); + if (ioctl(s.get(), SIOCGIWNAME, &pwrq) != -1) + return NetworkChangeNotifier::CONNECTION_WIFI; ++#endif // !defined(OS_FREEBSD) + +-#if !defined(OS_ANDROID) ++#if !defined(OS_ANDROID) && !defined(OS_FREEBSD) + // Test ethtool for CONNECTION_ETHERNET + struct ethtool_cmd ecmd = {}; + ecmd.cmd = ETHTOOL_GSET; +@@ -95,12 +104,13 @@ NetworkChangeNotifier::ConnectionType Ge + strncpy(ifr.ifr_name, ifname.c_str(), IFNAMSIZ - 1); + if (ioctl(s.get(), SIOCETHTOOL, &ifr) != -1) + return NetworkChangeNotifier::CONNECTION_ETHERNET; +-#endif // !defined(OS_ANDROID) ++#endif // !defined(OS_ANDROID) && !defined(OS_FREEBSD) + + return NetworkChangeNotifier::CONNECTION_UNKNOWN; + } + + std::string GetInterfaceSSID(const std::string& ifname) { ++#if !defined(OS_FREEBSD) + base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0)); + if (!ioctl_socket.is_valid()) + return ""; +@@ -112,9 +122,11 @@ std::string GetInterfaceSSID(const std:: + wreq.u.essid.length = IW_ESSID_MAX_SIZE; + if (ioctl(ioctl_socket.get(), SIOCGIWESSID, &wreq) != -1) + return ssid; ++#endif // !defined(OS_FREEBSD) + return ""; + } + ++#if !defined(OS_FREEBSD) + bool GetNetworkListImpl( + NetworkInterfaceList* networks, + int policy, +@@ -183,6 +195,7 @@ bool GetNetworkListImpl( + + return true; + } ++#endif // !defined(OS_FREEBSD) + + std::string GetWifiSSIDFromInterfaceListInternal( + const NetworkInterfaceList& interfaces, +@@ -207,12 +220,16 @@ bool GetNetworkList(NetworkInterfaceList + if (networks == NULL) + return false; + ++#if !defined(OS_FREEBSD) + internal::AddressTrackerLinux tracker; + tracker.Init(); + + return internal::GetNetworkListImpl( + networks, policy, tracker.GetOnlineLinks(), tracker.GetAddressMap(), + &internal::AddressTrackerLinux::GetInterfaceName); ++#else ++ return false; ++#endif + } + + std::string GetWifiSSID() { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__interfaces__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__interfaces__posix.cc index 887c98fbecf2..22ae1b893be9 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__interfaces__posix.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_network__interfaces__posix.cc @@ -1,21 +1,18 @@ -Piggyback on the existing #ifdefs for the definitions of some stub functions. ---- src/3rdparty/chromium/net/base/network_interfaces_posix.cc.orig 2017-04-20 16:49:59 UTC +--- src/3rdparty/chromium/net/base/network_interfaces_posix.cc.orig 2017-01-26 00:49:16 UTC +++ src/3rdparty/chromium/net/base/network_interfaces_posix.cc -@@ -9,7 +9,7 @@ - - #include "base/memory/scoped_ptr.h" - --#if !defined(OS_NACL) -+#if !defined(OS_NACL) && !defined(OS_BSD) - #include "net/base/network_interfaces_posix.h" - #include - #include -@@ -17,7 +17,7 @@ - - namespace net { - --#if !defined(OS_NACL) -+#if !defined(OS_NACL) && !defined(OS_BSD) +@@ -20,6 +20,7 @@ namespace net { + #if !defined(OS_NACL) namespace internal { ++#if !defined(OS_BSD) // The application layer can pass |policy| defined in net_util.h to + // request filtering out certain type of interfaces. + bool ShouldIgnoreInterface(const std::string& name, int policy) { +@@ -33,6 +34,7 @@ bool ShouldIgnoreInterface(const std::st + + return false; + } ++#endif + + // Check if the address is unspecified (i.e. made of zeroes) or loopback. + bool IsLoopbackOrUnspecifiedAddress(const sockaddr* addr) { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_address__sorter__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_address__sorter__posix.cc index 704fb4a04a09..a2e0e52827d6 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_address__sorter__posix.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_address__sorter__posix.cc @@ -1,7 +1,6 @@ -Needed on FreeBSD 10.3. ---- src/3rdparty/chromium/net/dns/address_sorter_posix.cc.orig 2017-04-20 10:17:24 UTC +--- src/3rdparty/chromium/net/dns/address_sorter_posix.cc.orig 2017-01-26 00:49:16 UTC +++ src/3rdparty/chromium/net/dns/address_sorter_posix.cc -@@ -11,6 +11,7 @@ +@@ -13,6 +13,7 @@ #include // Must be included before ifaddrs.h. #include #include diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix__unittest.cc new file mode 100644 index 000000000000..5028a8af4e37 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__config__service__posix__unittest.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/net/dns/dns_config_service_posix_unittest.cc.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/net/dns/dns_config_service_posix_unittest.cc +@@ -2,8 +2,6 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + +-#include +- + #include + + #include "base/cancelable_callback.h" diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.cc index a70775f11d55..5969e2a6e0d9 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_dns_dns__reloader.cc @@ -1,17 +1,13 @@ -Include all headers required by res_init(3) and friends. - -Note that as of base r289315 (present in FreeBSD 11+), the libc resolver -already reloads /etc/resolv.conf when it is changed, so we should also consider -whether to just disable this functionality in Chromium altogether. ---- src/3rdparty/chromium/net/dns/dns_reloader.cc.orig 2016-11-07 14:46:18 UTC +--- src/3rdparty/chromium/net/dns/dns_reloader.cc.orig 2017-01-26 00:49:16 UTC +++ src/3rdparty/chromium/net/dns/dns_reloader.cc -@@ -7,6 +7,9 @@ +@@ -7,6 +7,10 @@ #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ !defined(OS_ANDROID) -+#include ++#if defined(OS_FREEBSD) +#include -+#include ++#endif ++ #include #include "base/lazy_instance.h" diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc new file mode 100644 index 000000000000..c4076443f41a --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_http_http__auth__gssapi__posix.cc @@ -0,0 +1,13 @@ +--- src/3rdparty/chromium/net/http/http_auth_gssapi_posix.cc.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/net/http/http_auth_gssapi_posix.cc +@@ -431,8 +431,8 @@ base::NativeLibrary GSSAPISharedLibrary: + static const char* const kDefaultLibraryNames[] = { + #if defined(OS_MACOSX) + "/System/Library/Frameworks/Kerberos.framework/Kerberos" +-#elif defined(OS_OPENBSD) +- "libgssapi.so" // Heimdal - OpenBSD ++#elif defined(OS_BSD) ++ "libgssapi.so" // Heimdal - OpenBSD / FreeBSD + #else + "libgssapi_krb5.so.2", // MIT Kerberos - FC, Suse10, Debian + "libgssapi.so.4", // Heimdal - Suse10, MDK diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_http_http__network__session.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_http_http__network__session.cc new file mode 100644 index 000000000000..4d3f32fec497 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_http_http__network__session.cc @@ -0,0 +1,12 @@ +--- src/3rdparty/chromium/net/http/http_network_session.cc.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/net/http/http_network_session.cc +@@ -17,7 +17,9 @@ + #include "base/strings/string_util.h" + #include "base/values.h" + #include "net/base/network_throttle_manager.h" ++#if defined(USE_KERBEROS) + #include "net/http/http_auth_handler_factory.h" ++#endif + #include "net/http/http_response_body_drainer.h" + #include "net/http/http_stream_factory_impl.h" + #include "net/http/url_security_manager.h" diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_net.gypi b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_net.gypi deleted file mode 100644 index 587b5007cb84..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_net.gypi +++ /dev/null @@ -1,33 +0,0 @@ ---- src/3rdparty/chromium/net/net.gypi.orig 2017-04-19 19:48:59 UTC -+++ src/3rdparty/chromium/net/net.gypi -@@ -435,8 +435,8 @@ - 'android/network_library.h', - 'android/traffic_stats.cc', - 'android/traffic_stats.h', -- 'base/address_tracker_linux.cc', -- 'base/address_tracker_linux.h', -+ # 'base/address_tracker_linux.cc', -+ # 'base/address_tracker_linux.h', - 'base/backoff_entry.cc', - 'base/backoff_entry.h', - 'base/backoff_entry_serializer.cc', -@@ -497,8 +497,8 @@ - 'base/network_change_notifier.cc', - 'base/network_change_notifier.h', - 'base/network_change_notifier_factory.h', -- 'base/network_change_notifier_linux.cc', -- 'base/network_change_notifier_linux.h', -+ # 'base/network_change_notifier_linux.cc', -+ # 'base/network_change_notifier_linux.h', - 'base/network_change_notifier_mac.cc', - 'base/network_change_notifier_mac.h', - 'base/network_change_notifier_win.cc', -@@ -509,7 +509,7 @@ - 'base/network_delegate.h', - 'base/network_delegate_impl.cc', - 'base/network_delegate_impl.h', -- 'base/network_interfaces_linux.cc', -+ # 'base/network_interfaces_linux.cc', - 'base/network_interfaces_mac.cc', - 'base/network_interfaces_win.cc', - 'base/network_quality_estimator.cc', diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_proxy_proxy__config__service__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_proxy_proxy__config__service__linux.cc new file mode 100644 index 000000000000..adf628e0e550 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_proxy_proxy__config__service__linux.cc @@ -0,0 +1,145 @@ +--- src/3rdparty/chromium/net/proxy/proxy_config_service_linux.cc.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/net/proxy/proxy_config_service_linux.cc +@@ -11,7 +11,14 @@ + #include + #include + #include ++#if defined(OS_FREEBSD) ++#include ++#include ++#include ++#include ++#else + #include ++#endif + #include + + #include +@@ -863,6 +870,7 @@ class SettingGetterImplKDE : public Prox + public: + explicit SettingGetterImplKDE(base::Environment* env_var_getter) + : inotify_fd_(-1), ++ config_fd_(-1), + notify_delegate_(nullptr), + debounce_timer_(new base::OneShotTimer()), + indirect_manual_(false), +@@ -937,9 +945,10 @@ class SettingGetterImplKDE : public Prox + // and pending tasks may then be deleted without being run. + // Here in the KDE version, we can safely close the file descriptor + // anyway. (Not that it really matters; the process is exiting.) +- if (inotify_fd_ >= 0) ++ if (inotify_fd_ >= 0 || config_fd_ >= 0) + ShutDown(); + DCHECK_LT(inotify_fd_, 0); ++ DCHECK_LT(config_fd_, 0); + } + + bool Init(const scoped_refptr& glib_task_runner, +@@ -948,9 +957,17 @@ class SettingGetterImplKDE : public Prox + // This has to be called on the UI thread (http://crbug.com/69057). + base::ThreadRestrictions::ScopedAllowIO allow_io; + DCHECK_LT(inotify_fd_, 0); ++#if defined(OS_BSD) ++ inotify_fd_ = kqueue(); ++#else + inotify_fd_ = inotify_init(); ++#endif + if (inotify_fd_ < 0) { ++#if defined(OS_BSD) ++ PLOG(ERROR) << "kqueue failed"; ++#else + PLOG(ERROR) << "inotify_init failed"; ++#endif + return false; + } + if (!base::SetNonBlocking(inotify_fd_)) { +@@ -974,22 +991,40 @@ class SettingGetterImplKDE : public Prox + close(inotify_fd_); + inotify_fd_ = -1; + } ++ if (config_fd_ >= 0) { ++ close(config_fd_); ++ config_fd_ = -1; ++ } + debounce_timer_.reset(); + } + + bool SetUpNotifications( + ProxyConfigServiceLinux::Delegate* delegate) override { + DCHECK_GE(inotify_fd_, 0); ++ DCHECK_GE(config_fd_, 0); + DCHECK(file_task_runner_->BelongsToCurrentThread()); + // We can't just watch the kioslaverc file directly, since KDE will write + // a new copy of it and then rename it whenever settings are changed and + // inotify watches inodes (so we'll be watching the old deleted file after + // the first change, and it will never change again). So, we watch the + // directory instead. We then act only on changes to the kioslaverc entry. ++#if defined(OS_BSD) ++ config_fd_ = HANDLE_EINTR(open(kde_config_dir_.value().c_str(), O_RDONLY)); ++ ++ if (config_fd_ == -1) ++ return false; ++ ++ struct kevent ev; ++ EV_SET(&ev, config_fd_, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_WRITE, ++ 0, NULL); ++ if (kevent(inotify_fd_, &ev, 1, NULL, 0, NULL) == -1) ++ return false; ++#else + if (inotify_add_watch(inotify_fd_, kde_config_dir_.value().c_str(), + IN_MODIFY | IN_MOVED_TO) < 0) { + return false; + } ++#endif + notify_delegate_ = delegate; + if (!base::MessageLoopForIO::current()->WatchFileDescriptor( + inotify_fd_, true, base::MessageLoopForIO::WATCH_READ, +@@ -1010,7 +1045,19 @@ class SettingGetterImplKDE : public Prox + void OnFileCanReadWithoutBlocking(int fd) override { + DCHECK_EQ(fd, inotify_fd_); + DCHECK(file_task_runner_->BelongsToCurrentThread()); ++#if defined(OS_BSD) ++ struct kevent ev; ++ int rv = kevent(inotify_fd_, NULL, 0, &ev, 1, NULL); ++ ++ if (rv != -1 && (ev.flags & EV_ERROR) == 0) { ++ OnChangeNotification(); ++ } else { ++ LOG(ERROR) << "kevent() failure; no longer watching kioslaverc!"; ++ ShutDown(); ++ } ++#else + OnChangeNotification(); ++#endif + } + void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); } + +@@ -1283,8 +1330,11 @@ class SettingGetterImplKDE : public Prox + void OnChangeNotification() { + DCHECK_GE(inotify_fd_, 0); + DCHECK(file_task_runner_->BelongsToCurrentThread()); +- char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4]; + bool kioslaverc_touched = false; ++#if defined(OS_BSD) ++ kioslaverc_touched = true; ++#else ++ char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4]; + ssize_t r; + while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) { + // inotify returns variable-length structures, which is why we have +@@ -1321,6 +1371,7 @@ class SettingGetterImplKDE : public Prox + inotify_fd_ = -1; + } + } ++#endif + if (kioslaverc_touched) { + // We don't use Reset() because the timer may not yet be running. + // (In that case Stop() is a no-op.) +@@ -1336,6 +1387,7 @@ class SettingGetterImplKDE : public Prox + std::vector > strings_map_type; + + int inotify_fd_; ++ int config_fd_; + base::MessagePumpLibevent::FileDescriptorWatcher inotify_watcher_; + ProxyConfigServiceLinux::Delegate* notify_delegate_; + std::unique_ptr debounce_timer_; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_proxy_proxy__service.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_proxy_proxy__service.cc new file mode 100644 index 000000000000..6c3f26475465 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_proxy_proxy__service.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/net/proxy/proxy_service.cc.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/net/proxy/proxy_service.cc +@@ -49,7 +49,7 @@ + #elif defined(OS_MACOSX) + #include "net/proxy/proxy_config_service_mac.h" + #include "net/proxy/proxy_resolver_mac.h" +-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) + #include "net/proxy/proxy_config_service_linux.h" + #elif defined(OS_ANDROID) + #include "net/proxy/proxy_config_service_android.h" +@@ -1520,7 +1520,7 @@ ProxyService::CreateSystemProxyConfigSer + << "profile_io_data.cc::CreateProxyConfigService and this should " + << "be used only for examples."; + return base::WrapUnique(new UnsetProxyConfigService); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + std::unique_ptr linux_config_service( + new ProxyConfigServiceLinux()); + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_socket_socks5__client__socket.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_socket_socks5__client__socket.cc new file mode 100644 index 000000000000..8273b9ae5c59 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_socket_socks5__client__socket.cc @@ -0,0 +1,13 @@ +--- src/3rdparty/chromium/net/socket/socks5_client_socket.cc.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/net/socket/socks5_client_socket.cc +@@ -4,6 +4,10 @@ + + #include "net/socket/socks5_client_socket.h" + ++#if defined(OS_BSD) ++#include ++#endif ++ + #include + + #include "base/callback_helpers.h" diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc new file mode 100644 index 000000000000..58791f6d5bd6 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_socket_udp__socket__posix.cc @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/net/socket/udp_socket_posix.cc.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/net/socket/udp_socket_posix.cc +@@ -58,7 +58,7 @@ const int kBindRetries = 10; + const int kPortStart = 1024; + const int kPortEnd = 65535; + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_BSD) + + // Returns IPv4 address in network order. + int GetIPv4AddressFromIndex(int socket, uint32_t index, uint32_t* address) { +@@ -762,7 +762,7 @@ int UDPSocketPosix::SetMulticastOptions( + if (multicast_interface_ != 0) { + switch (addr_family_) { + case AF_INET: { +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) + ip_mreqn mreq; + mreq.imr_ifindex = multicast_interface_; + mreq.imr_address.s_addr = htonl(INADDR_ANY); +@@ -837,7 +837,7 @@ int UDPSocketPosix::JoinGroup(const IPAd + if (addr_family_ != AF_INET) + return ERR_ADDRESS_INVALID; + +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) + ip_mreqn mreq; + mreq.imr_ifindex = multicast_interface_; + mreq.imr_address.s_addr = htonl(INADDR_ANY); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_tools_get__server__time_get__server__time.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_tools_get__server__time_get__server__time.cc new file mode 100644 index 000000000000..276ad3483233 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_tools_get__server__time_get__server__time.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/net/tools/get_server_time/get_server_time.cc.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/net/tools/get_server_time/get_server_time.cc +@@ -46,7 +46,7 @@ + + #if defined(OS_MACOSX) + #include "base/mac/scoped_nsautorelease_pool.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #include "net/proxy/proxy_config.h" + #include "net/proxy/proxy_config_service_fixed.h" + #endif +@@ -142,7 +142,7 @@ class PrintingLogObserver : public net:: + std::unique_ptr BuildURLRequestContext( + net::NetLog* net_log) { + net::URLRequestContextBuilder builder; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On Linux, use a fixed ProxyConfigService, since the default one + // depends on glib. + // diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc new file mode 100644 index 000000000000..99e801e11072 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_url__request_url__request__context__builder.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/net/url_request/url_request_context_builder.cc.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/net/url_request/url_request_context_builder.cc +@@ -327,7 +327,7 @@ std::unique_ptr URLRe + if (!proxy_service_) { + // TODO(willchan): Switch to using this code when + // ProxyService::CreateSystemProxyConfigService()'s signature doesn't suck. +-#if !defined(OS_LINUX) && !defined(OS_ANDROID) ++#if !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_BSD) + if (!proxy_config_service_) { + proxy_config_service_ = ProxyService::CreateSystemProxyConfigService( + base::ThreadTaskRunnerHandle::Get().get(), diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc new file mode 100644 index 000000000000..19324e540b38 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc @@ -0,0 +1,65 @@ +--- src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc +@@ -127,7 +127,7 @@ std::vector GetPageNumbersFrom + return page_numbers; + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + + PP_Instance g_last_instance_id; + +@@ -629,7 +629,7 @@ bool InitializeSDK() { + config.m_v8EmbedderSlot = gin::kEmbedderPDFium; + FPDF_InitLibraryWithConfig(&config); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Font loading doesn't work in the renderer sandbox in Linux. + FPDF_SetSystemFontInfo(&g_font_info); + #else +@@ -654,7 +654,7 @@ bool InitializeSDK() { + + void ShutdownSDK() { + FPDF_DestroyLibrary(); +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + delete g_font_info; + #endif + TearDownV8(); +@@ -758,7 +758,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Cl + IFSDK_PAUSE::user = nullptr; + IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // PreviewModeClient does not know its pp::Instance. + pp::Instance* instance = client_->GetPluginInstance(); + if (instance) +@@ -1510,7 +1510,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesA + FPDF_ClosePage(pdf_page); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + g_last_instance_id = client_->GetPluginInstance()->pp_instance(); + #endif + +@@ -2919,7 +2919,7 @@ bool PDFiumEngine::ContinuePaint(int pro + DCHECK_LT(static_cast(progressive_index), progressive_paints_.size()); + DCHECK(image_data); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + g_last_instance_id = client_->GetPluginInstance()->pp_instance(); + #endif + +@@ -3377,7 +3377,7 @@ void PDFiumEngine::SetCurrentPage(int in + FORM_DoPageAAction(old_page, form_, FPDFPAGE_AACTION_CLOSE); + } + most_visible_page_ = index; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + g_last_instance_id = client_->GetPluginInstance()->pp_instance(); + #endif + if (most_visible_page_ != -1 && called_do_document_action_) { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_proxy_file__io__resource.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_proxy_file__io__resource.cc new file mode 100644 index 000000000000..66881cbb641f --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_proxy_file__io__resource.cc @@ -0,0 +1,48 @@ +--- src/3rdparty/chromium/ppapi/proxy/file_io_resource.cc.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/ppapi/proxy/file_io_resource.cc +@@ -285,17 +285,19 @@ int32_t FileIOResource::Write(int64_t of + + if (check_quota_) { + int64_t increase = 0; +- uint64_t max_offset = 0; ++ uint64_t _max_offset = 0; ++ // (rene) avoid name collission with /usr/include/vm/vm_map.h on FreeBSD ++ // which also defines max_offset + bool append = (open_flags_ & PP_FILEOPENFLAG_APPEND) != 0; + if (append) { + increase = bytes_to_write; + } else { +- uint64_t max_offset = offset + bytes_to_write; +- if (max_offset > ++ uint64_t _max_offset = offset + bytes_to_write; ++ if (_max_offset > + static_cast(std::numeric_limits::max())) { + return PP_ERROR_FAILED; // amount calculation would overflow. + } +- increase = static_cast(max_offset) - max_written_offset_; ++ increase = static_cast(_max_offset) - max_written_offset_; + } + + if (increase > 0) { +@@ -319,7 +321,7 @@ int32_t FileIOResource::Write(int64_t of + if (append) + append_mode_write_amount_ += bytes_to_write; + else +- max_written_offset_ = max_offset; ++ max_written_offset_ = _max_offset; + } + } + return WriteValidated(offset, buffer, bytes_to_write, callback); +@@ -597,9 +599,9 @@ void FileIOResource::OnRequestWriteQuota + } else { + DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted); + +- int64_t max_offset = offset + bytes_to_write; +- if (max_written_offset_ < max_offset) +- max_written_offset_ = max_offset; ++ int64_t _max_offset = offset + bytes_to_write; ++ if (max_written_offset_ < _max_offset) ++ max_written_offset_ = _max_offset; + } + + if (callback->is_blocking()) { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_shared__impl_private_net__address__private__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_shared__impl_private_net__address__private__impl.cc index 404c8f1aff24..9140d08deaed 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_shared__impl_private_net__address__private__impl.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_shared__impl_private_net__address__private__impl.cc @@ -1,10 +1,16 @@ ---- src/3rdparty/chromium/ppapi/shared_impl/private/net_address_private_impl.cc.orig 2016-11-07 14:46:18 UTC +--- src/3rdparty/chromium/ppapi/shared_impl/private/net_address_private_impl.cc.orig 2017-01-26 00:49:16 UTC +++ src/3rdparty/chromium/ppapi/shared_impl/private/net_address_private_impl.cc -@@ -24,6 +24,7 @@ - #include - #elif defined(OS_POSIX) && !defined(OS_NACL) +@@ -26,9 +26,12 @@ #include -+#include #include #include ++#if defined(OS_BSD) ++#include ++#endif + #endif + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_BSD) + // This is a bit evil, but it's standard operating procedure for |s6_addr|.... + #define s6_addr16 __u6_addr.__u6_addr16 #endif diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_tests_extensions_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_tests_extensions_BUILD.gn new file mode 100644 index 000000000000..195344509412 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ppapi_tests_extensions_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ppapi/tests/extensions/BUILD.gn.orig 2017-01-26 00:49:16 UTC ++++ src/3rdparty/chromium/ppapi/tests/extensions/BUILD.gn +@@ -20,7 +20,7 @@ group("extensions") { + ":ppapi_tests_extensions_popup($newlib)", + ":ppapi_tests_extensions_socket_permissions($newlib)", + ] +- if ((target_cpu == "x86" || target_cpu == "x64") && is_linux && ++ if ((target_cpu == "x86" || target_cpu == "x64") && (is_linux || is_bsd) && + enable_nacl_nonsfi) { + nonsfi = "//build/toolchain/nacl:newlib_pnacl_nonsfi" + data_deps += [ ":ppapi_tests_extensions_packaged_app($nonsfi)" ] diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_BUILD.gn new file mode 100644 index 000000000000..20449413d722 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_BUILD.gn @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/printing/BUILD.gn.orig 2017-01-26 00:49:17 UTC ++++ src/3rdparty/chromium/printing/BUILD.gn +@@ -129,7 +129,7 @@ component("printing") { + if (use_cups) { + configs += [ ":cups" ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + # rebase_path does not accept an empty string + if (use_sysroot) { + cups_sysroot = rebase_path(sysroot) +@@ -206,7 +206,7 @@ component("printing") { + "printing_context_no_system_dialog.cc", + "printing_context_no_system_dialog.h", + ] +- } else if (is_linux) { # Non-ChromeOS Linux. ++ } else if (is_linux || is_bsd) { # Non-ChromeOS Linux/BSD. + sources += [ + "printed_document_linux.cc", + "printing_context_linux.cc", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_cups__config__helper.py b/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_cups__config__helper.py new file mode 100644 index 000000000000..12d4249093ac --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_cups__config__helper.py @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/printing/cups_config_helper.py.orig 2017-01-26 00:49:17 UTC ++++ src/3rdparty/chromium/printing/cups_config_helper.py +@@ -65,7 +65,7 @@ def main(): + mode = sys.argv[1] + if len(sys.argv) > 2 and sys.argv[2]: + sysroot = sys.argv[2] +- cups_config = os.path.join(sysroot, 'usr', 'bin', 'cups-config') ++ cups_config = os.path.join(sysroot, 'bin', 'cups-config') + if not os.path.exists(cups_config): + print 'cups-config not found: %s' % cups_config + return 1 diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_remoting_host_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_remoting_host_BUILD.gn new file mode 100644 index 000000000000..e9b077ed92a5 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_remoting_host_BUILD.gn @@ -0,0 +1,47 @@ +--- src/3rdparty/chromium/remoting/host/BUILD.gn.orig 2017-01-26 00:49:17 UTC ++++ src/3rdparty/chromium/remoting/host/BUILD.gn +@@ -326,7 +326,7 @@ static_library("host") { + deps += [ "//components/policy:generated" ] + } + +- if (is_linux && !is_chromeos) { ++ if ((is_linux || is_bsd) && !is_chromeos) { + libs += [ "pam" ] + } + +@@ -349,7 +349,7 @@ static_library("host") { + "input_injector_x11.cc", + "local_input_monitor_x11.cc", + ] +- if (is_linux) { ++ if (is_linux || is_bsd) { + # These will already be filtered out on non-Linux. + sources -= [ + "linux/unicode_to_keysym.cc", +@@ -538,7 +538,7 @@ source_set("unit_tests") { + "touch_injector_win_unittest.cc", + ] + +- if (!use_x11 && is_linux) { ++ if (!use_x11 && (is_linux || is_bsd)) { + sources -= [ "linux/unicode_to_keysym_unittest.cc" ] + } + if (use_ozone || is_chromeos) { +@@ -755,7 +755,7 @@ if (enable_me2me_host) { + deps += [ "//build/config/linux/gtk2" ] + } + } +- if ((is_linux && !is_chromeos) || is_mac) { ++ if ((is_linux && !is_chromeos) || is_mac || is_bsd) { + libs = [ "pam" ] + } + +@@ -825,7 +825,7 @@ if (enable_me2me_host) { + } + } + } +- if (is_chrome_branded && enable_me2me_host && is_linux && !is_chromeos) { ++ if (is_chrome_branded && enable_me2me_host && is_linux && is_bsd && !is_chromeos) { + group("remoting_me2me_host_archive") { + deps = [ + "//remoting/host/installer/linux:remoting_me2me_host_archive", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_sdch_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_sdch_BUILD.gn new file mode 100644 index 000000000000..5b4098e52622 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_sdch_BUILD.gn @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/sdch/BUILD.gn.orig 2017-01-26 00:49:17 UTC ++++ src/3rdparty/chromium/sdch/BUILD.gn +@@ -11,7 +11,7 @@ config("sdch_config") { + # from a config and can't be on the target directly. + config("sdch_warnings") { + cflags = [] +- if (is_linux) { ++ if (is_linux || is_bsd) { + # TODO(mostynb): remove this if open-vcdiff is ever updated for c++11: + cflags += [ "-Wno-deprecated-declarations" ] + } +@@ -59,7 +59,7 @@ static_library("sdch") { + "//third_party/zlib", + ] + +- if (is_linux || is_android) { ++ if (is_linux || is_bsd || is_android) { + include_dirs = [ "linux" ] + } else if (is_ios) { + include_dirs = [ "ios" ] diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_runner_host_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_runner_host_BUILD.gn new file mode 100644 index 000000000000..6afa521bdd7b --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_runner_host_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/services/service_manager/runner/host/BUILD.gn.orig 2017-01-26 00:49:17 UTC ++++ src/3rdparty/chromium/services/service_manager/runner/host/BUILD.gn +@@ -51,7 +51,7 @@ source_set("child_process_base") { + "//services/service_manager/runner/common", + ] + +- if (is_linux && !is_android) { ++ if (is_linux && !is_android && !is_bsd) { + sources += [ + "linux_sandbox.cc", + "linux_sandbox.h", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_standalone_context.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_standalone_context.cc new file mode 100644 index 000000000000..49aeb11a0ad2 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_standalone_context.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/services/service_manager/standalone/context.cc.orig 2017-01-26 00:49:17 UTC ++++ src/3rdparty/chromium/services/service_manager/standalone/context.cc +@@ -208,7 +208,7 @@ void Context::Init(std::unique_ptrSetServiceManagerProcessCreationTime( diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_ui_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_ui_BUILD.gn new file mode 100644 index 000000000000..2c58249c9c9c --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_ui_BUILD.gn @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/services/ui/BUILD.gn.orig 2017-01-26 00:49:17 UTC ++++ src/3rdparty/chromium/services/ui/BUILD.gn +@@ -13,7 +13,6 @@ group("all") { + testonly = true + deps = [ + ":ui", +- "//services/ui/ime/test_ime_driver", + "//services/ui/test_wm", + ] + } +@@ -38,7 +37,6 @@ service("ui") { + + data_deps = [ + ":manifest", +- "//services/ui/ime/test_ime_driver", + ] + + resources = [ diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_ui_ime_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_ui_ime_BUILD.gn new file mode 100644 index 000000000000..701307a7f0c7 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_ui_ime_BUILD.gn @@ -0,0 +1,10 @@ +--- src/3rdparty/chromium/services/ui/ime/BUILD.gn.orig 2017-01-26 00:49:17 UTC ++++ src/3rdparty/chromium/services/ui/ime/BUILD.gn +@@ -50,7 +50,6 @@ test("mus_ime_unittests") { + ":test_manifest", + ":lib", + "//services/ui", +- "//services/ui/ime/test_ime_driver", + ] + } + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_ui_public_cpp_gles2__context.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_ui_public_cpp_gles2__context.cc new file mode 100644 index 000000000000..cdb494e5bc4f --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_ui_public_cpp_gles2__context.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/services/ui/public/cpp/gles2_context.cc.orig 2017-02-02 02:02:57 UTC ++++ src/3rdparty/chromium/services/ui/public/cpp/gles2_context.cc +@@ -46,7 +46,7 @@ bool GLES2Context::Initialize( + gpu::CommandBuffer* command_buffer = command_buffer_proxy_impl_.get(); + gpu::GpuControl* gpu_control = command_buffer_proxy_impl_.get(); + +- constexpr gpu::SharedMemoryLimits default_limits; ++ constexpr gpu::SharedMemoryLimits default_limits = gpu::SharedMemoryLimits(); + gles2_helper_.reset(new gpu::gles2::GLES2CmdHelper(command_buffer)); + if (!gles2_helper_->Initialize(default_limits.command_buffer_size)) + return false; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_ui_surfaces_surfaces__context__provider.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_ui_surfaces_surfaces__context__provider.cc new file mode 100644 index 000000000000..c6f9d2bc17fb --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_ui_surfaces_surfaces__context__provider.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/services/ui/surfaces/surfaces_context_provider.cc.orig 2017-02-02 02:02:57 UTC ++++ src/3rdparty/chromium/services/ui/surfaces/surfaces_context_provider.cc +@@ -78,7 +78,7 @@ bool SurfacesContextProvider::BindToCurr + gpu::CommandBuffer* command_buffer = command_buffer_proxy_impl_.get(); + + gles2_helper_.reset(new gpu::gles2::GLES2CmdHelper(command_buffer)); +- constexpr gpu::SharedMemoryLimits default_limits; ++ constexpr gpu::SharedMemoryLimits default_limits = gpu::SharedMemoryLimits(); + if (!gles2_helper_->Initialize(default_limits.command_buffer_size)) + return false; + gles2_helper_->SetAutomaticFlushes(false); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_skia_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_skia_BUILD.gn new file mode 100644 index 000000000000..2419bf2bf1d4 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_skia_BUILD.gn @@ -0,0 +1,46 @@ +--- src/3rdparty/chromium/skia/BUILD.gn.orig 2017-01-26 00:49:17 UTC ++++ src/3rdparty/chromium/skia/BUILD.gn +@@ -135,7 +135,7 @@ config("skia_library_config") { + } + + # Settings for text blitting, chosen to approximate the system browser. +- if (is_linux) { ++ if (is_linux || is_bsd) { + defines += [ + "SK_GAMMA_EXPONENT=1.2", + "SK_GAMMA_CONTRAST=0.2", +@@ -363,7 +363,7 @@ component("skia") { + sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ] + } + +- if (!is_linux) { ++ if (!is_linux && !is_bsd) { + sources -= [ + "//third_party/skia/src/ports/SkFontConfigInterface.cpp", + "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", +@@ -375,14 +375,14 @@ component("skia") { + + # Add the files for the SkFontMgr_Android. This is used to emulate android + # fonts on linux. See content/zygote/zygote_main_linux.cc +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ + "//third_party/skia/src/ports/SkFontMgr_android.cpp", + "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp", + ] + } + +- if (!is_linux && !is_android) { ++ if (!is_linux && !is_bsd && !is_android) { + sources -= [ + "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", + "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", +@@ -421,7 +421,7 @@ component("skia") { + "//base/third_party/dynamic_annotations", + ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + if (use_pango) { + configs += [ "//build/config/linux/pangocairo" ] + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_skia_ext_SkMemory__new__handler.cpp b/www/qt5-webengine/files/patch-src_3rdparty_chromium_skia_ext_SkMemory__new__handler.cpp new file mode 100644 index 000000000000..7d853978fc44 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_skia_ext_SkMemory__new__handler.cpp @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/skia/ext/SkMemory_new_handler.cpp.orig 2017-01-26 00:49:17 UTC ++++ src/3rdparty/chromium/skia/ext/SkMemory_new_handler.cpp +@@ -68,7 +68,7 @@ static void* sk_malloc_nothrow(size_t si + // TODO(b.kelemen): we should always use UncheckedMalloc but currently it + // doesn't work as intended everywhere. + void* result; +-#if defined(OS_IOS) ++#if defined(OS_IOS) || defined(OS_FREEBSD) + result = malloc(size); + #else + // It's the responsibility of the caller to check the return value. +@@ -95,7 +95,7 @@ void* sk_calloc(size_t size) { + // TODO(b.kelemen): we should always use UncheckedCalloc but currently it + // doesn't work as intended everywhere. + void* result; +-#if defined(OS_IOS) ++#if defined(OS_IOS) || defined(OS_FREEBSD) + result = calloc(1, size); + #else + // It's the responsibility of the caller to check the return value. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_skia_skia__chrome.gypi b/www/qt5-webengine/files/patch-src_3rdparty_chromium_skia_skia__chrome.gypi deleted file mode 100644 index 9f69f91897fb..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_skia_skia__chrome.gypi +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/skia/skia_chrome.gypi.orig 2017-04-20 12:39:06 UTC -+++ src/3rdparty/chromium/skia/skia_chrome.gypi -@@ -66,7 +66,7 @@ - 'ext/skia_utils_base.cc', - ], - }], -- [ 'OS != "android" and (OS != "linux" or use_cairo==1)', { -+ [ 'OS != "android" and ((OS != "linux" and os_bsd != 1) or use_cairo==1)', { - 'sources!': [ - 'ext/bitmap_platform_device_skia.cc', - ], diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_testing_gtest_src_gtest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_testing_gtest_src_gtest.cc new file mode 100644 index 000000000000..f7b8132c1802 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_testing_gtest_src_gtest.cc @@ -0,0 +1,22 @@ +--- src/3rdparty/chromium/testing/gtest/src/gtest.cc.orig 2017-01-26 00:50:07 UTC ++++ src/3rdparty/chromium/testing/gtest/src/gtest.cc +@@ -122,6 +122,10 @@ + + #endif // GTEST_OS_LINUX + ++#if GTEST_OS_FREEBSD ++# include ++#endif ++ + #if GTEST_HAS_EXCEPTIONS + # include + #endif +@@ -1930,7 +1934,7 @@ bool String::CaseInsensitiveWideCStringE + + #if GTEST_OS_WINDOWS + return _wcsicmp(lhs, rhs) == 0; +-#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID ++#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID && !GTEST_OS_FREEBSD + return wcscasecmp(lhs, rhs) == 0; + #else + // Android, Mac OS X and Cygwin don't define wcscasecmp. diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp index 9874c530767c..e6b3519dbc77 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp @@ -1,10 +1,10 @@ ---- src/3rdparty/chromium/third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig 2017-04-11 12:57:39 UTC +--- src/3rdparty/chromium/third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig 2017-01-26 00:49:27 UTC +++ src/3rdparty/chromium/third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp -@@ -43,6 +43,8 @@ +@@ -46,6 +46,8 @@ #if OS(WIN) #include -+#elif defined(__FreeBSD__) ++#elif OS(FREEBSD) +#include #else #include diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_core_core.gyp b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_core_core.gyp deleted file mode 100644 index 7c582ba58d39..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_core_core.gyp +++ /dev/null @@ -1,34 +0,0 @@ ---- src/3rdparty/chromium/third_party/WebKit/Source/core/core.gyp.orig 2016-11-07 14:46:18 UTC -+++ src/3rdparty/chromium/third_party/WebKit/Source/core/core.gyp -@@ -458,13 +458,13 @@ - 'layout/LayoutThemeMac.mm', - ], - }], -- ['OS != "linux"', { -+ ['OS != "linux" and os_bsd != 1', { - 'sources!': [ - 'layout/LayoutThemeLinux.cpp', - 'layout/LayoutThemeLinux.h', - ], - }], -- ['OS != "linux" and OS != "android"', { -+ ['OS != "linux" and OS != "android" and os_bsd != 1', { - 'sources!': [ - 'layout/LayoutThemeFontProviderLinux.cpp', - ], -@@ -785,13 +785,13 @@ - 'layout/LayoutThemeMac.mm', - ], - }], -- ['OS != "linux"', { -+ ['OS != "linux" and os_bsd != 1', { - 'sources!': [ - 'layout/LayoutThemeLinux.cpp', - 'layout/LayoutThemeLinux.h', - ], - }], -- ['OS != "linux" and OS != "android"', { -+ ['OS != "linux" and OS != "android" and os_bsd == 1', { - 'sources!': [ - 'layout/LayoutThemeFontProviderLinux.cpp', - ], diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_core_layout_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_core_layout_BUILD.gn new file mode 100644 index 000000000000..da70546a130a --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_core_layout_BUILD.gn @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/WebKit/Source/core/layout/BUILD.gn.orig 2017-01-26 00:49:28 UTC ++++ src/3rdparty/chromium/third_party/WebKit/Source/core/layout/BUILD.gn +@@ -361,7 +361,7 @@ blink_core_sources("layout") { + sources += [ "LayoutThemeFontProviderDefault.cpp" ] + } + +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ + "LayoutThemeLinux.cpp", + "LayoutThemeLinux.h", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_blink__platform.gyp b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_blink__platform.gyp deleted file mode 100644 index 125b0ceb27a5..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_blink__platform.gyp +++ /dev/null @@ -1,38 +0,0 @@ ---- src/3rdparty/chromium/third_party/WebKit/Source/platform/blink_platform.gyp.orig 2016-11-07 14:46:18 UTC -+++ src/3rdparty/chromium/third_party/WebKit/Source/platform/blink_platform.gyp -@@ -203,7 +204,7 @@ - ['include', 'graphics/cpu/x86/WebGLImageConversionSSE\\.h$'], - ], - }], -- ['OS=="linux" or OS=="android" or OS=="win"', { -+ ['OS=="linux" or OS=="android" or OS=="win" or os_bsd==1', { - 'sources/': [ - # Cherry-pick files excluded by the broader regular expressions above. - ['include', 'fonts/opentype/OpenTypeTypes\\.h$'], -@@ -214,7 +215,7 @@ - ], - }, - ], -- ['OS=="linux" or OS=="android"', { -+ ['OS=="linux" or OS=="android" or os_bsd==1', { - 'sources/': [ - ['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'], - ] -@@ -307,7 +308,7 @@ - ['exclude', 'scroll/ScrollbarThemeMac'], - ], - }], -- ['OS != "linux" and OS != "mac" and OS != "win"', { -+ ['OS != "linux" and OS != "mac" and OS != "win" and os_bsd != 1', { - 'sources/': [ - ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], - ], -@@ -350,7 +351,7 @@ - ['exclude', 'Android\\.cpp$'], - ], - }], -- ['OS=="linux"', { -+ ['OS=="linux" or os_bsd==1', { - 'dependencies': [ - '<(DEPTH)/build/linux/system.gyp:fontconfig', - ], diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_FontCache.cpp b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_FontCache.cpp new file mode 100644 index 000000000000..882073361c36 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_FontCache.cpp @@ -0,0 +1,14 @@ +--- src/3rdparty/chromium/third_party/WebKit/Source/platform/fonts/FontCache.cpp.orig 2017-01-26 00:49:28 UTC ++++ src/3rdparty/chromium/third_party/WebKit/Source/platform/fonts/FontCache.cpp +@@ -62,9 +62,9 @@ using namespace WTF; + + namespace blink { + +-#if !OS(WIN) && !OS(LINUX) ++#if !OS(WIN) && !OS(LINUX) && !OS(FREEBSD) && !OS(OPENBSD) + FontCache::FontCache() : m_purgePreventCount(0), m_fontManager(nullptr) {} +-#endif // !OS(WIN) && !OS(LINUX) ++#endif // !OS(WIN) && !OS(LINUX) && !OS(FREEBSD) && !OS(OPENBSD) + + typedef HashMap, diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_FontCache.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_FontCache.h new file mode 100644 index 000000000000..a75eecd8fdae --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_FontCache.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/third_party/WebKit/Source/platform/fonts/FontCache.h.orig 2017-01-26 00:49:28 UTC ++++ src/3rdparty/chromium/third_party/WebKit/Source/platform/fonts/FontCache.h +@@ -121,7 +121,7 @@ class PLATFORM_EXPORT FontCache { + #else + static const AtomicString& legacySystemFontFamily(); + #endif +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) + static void setSystemFontFamily(const AtomicString&); + #endif + +@@ -231,7 +231,7 @@ class PLATFORM_EXPORT FontCache { + const FontFaceCreationParams&, + CString& name); + +-#if OS(ANDROID) || OS(LINUX) ++#if OS(ANDROID) || OS(LINUX) || OS(FREEBSD) || OS(OPENBSD) + static AtomicString getFamilyNameForCharacter(SkFontMgr*, + UChar32, + const FontDescription&, diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp index 8f17c643774d..863957cd4433 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp @@ -1,11 +1,47 @@ ---- src/3rdparty/chromium/third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2017-04-11 14:26:52 UTC +--- src/3rdparty/chromium/third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig 2017-01-26 00:49:28 UTC +++ src/3rdparty/chromium/third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp -@@ -357,7 +357,7 @@ PassRefPtr FontPlatformData::openTypeTab - { - RefPtr buffer; +@@ -99,7 +99,7 @@ FontPlatformData::FontPlatformData(const + m_syntheticBold(source.m_syntheticBold), + m_syntheticItalic(source.m_syntheticItalic), + m_orientation(source.m_orientation), +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) + m_style(source.m_style), + #endif + m_harfBuzzFace(nullptr), +@@ -122,7 +122,7 @@ FontPlatformData::FontPlatformData(const + m_syntheticBold(src.m_syntheticBold), + m_syntheticItalic(src.m_syntheticItalic), + m_orientation(src.m_orientation), +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) + m_style(FontRenderStyle::querySystem(m_family, + m_textSize, + m_typeface->style())), +@@ -155,7 +155,7 @@ FontPlatformData::FontPlatformData(sk_sp + m_syntheticBold(syntheticBold), + m_syntheticItalic(syntheticItalic), + m_orientation(orientation), +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) | OS(BSD) + m_style(FontRenderStyle::querySystem(m_family, + m_textSize, + m_typeface->style())), +@@ -200,7 +200,7 @@ const FontPlatformData& FontPlatformData + m_syntheticItalic = other.m_syntheticItalic; + m_harfBuzzFace = nullptr; + m_orientation = other.m_orientation; +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) | OS(BSD) + m_style = other.m_style; + #endif -- SkFontTableTag tag = WTF::bswap32(table); -+ SkFontTableTag tag = bswap32(table); - const size_t tableSize = m_typeface->getTableSize(tag); - if (tableSize) { - Vector tableBuffer(tableSize); +@@ -226,7 +226,7 @@ bool FontPlatformData::operator==(const + m_isHashTableDeletedValue == a.m_isHashTableDeletedValue && + m_syntheticBold == a.m_syntheticBold && + m_syntheticItalic == a.m_syntheticItalic +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) + && m_style == a.m_style + #endif + && m_orientation == a.m_orientation; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_FontPlatformData.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_FontPlatformData.h new file mode 100644 index 000000000000..f74dc37a31a3 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_FontPlatformData.h @@ -0,0 +1,32 @@ +--- src/3rdparty/chromium/third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig 2017-01-26 00:49:28 UTC ++++ src/3rdparty/chromium/third_party/WebKit/Source/platform/fonts/FontPlatformData.h +@@ -47,9 +47,9 @@ + #include "wtf/text/CString.h" + #include "wtf/text/StringImpl.h" + +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) + #include "platform/fonts/linux/FontRenderStyle.h" +-#endif // OS(LINUX) || OS(ANDROID) ++#endif // OS(LINUX) || OS(ANDROID) || OS(BSD) + + #if OS(MACOSX) + OBJC_CLASS NSFont; +@@ -149,7 +149,7 @@ class PLATFORM_EXPORT FontPlatformData { + PassRefPtr verticalData() const; + PassRefPtr openTypeTable(SkFontTableTag) const; + +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) + // The returned styles are all actual styles without + // FontRenderStyle::NoPreference. + const FontRenderStyle& getFontRenderStyle() const { return m_style; } +@@ -177,7 +177,7 @@ class PLATFORM_EXPORT FontPlatformData { + FontOrientation m_orientation; + + private: +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) + FontRenderStyle m_style; + #endif + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp new file mode 100644 index 000000000000..8f88409bc701 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp @@ -0,0 +1,29 @@ +--- src/3rdparty/chromium/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp.orig 2017-01-26 00:49:28 UTC ++++ src/3rdparty/chromium/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp +@@ -50,7 +50,7 @@ namespace blink { + const float smallCapsFontSizeMultiplier = 0.7f; + const float emphasisMarkFontSizeMultiplier = 0.5f; + +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) + // This is the largest VDMX table which we'll try to load and parse. + static const size_t maxVDMXTableSize = 1024 * 1024; // 1 MB + #endif +@@ -105,7 +105,7 @@ void SimpleFontData::platformInit(bool s + int vdmxAscent = 0, vdmxDescent = 0; + bool isVDMXValid = false; + +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) + // Manually digging up VDMX metrics is only applicable when bytecode hinting + // using FreeType. With DirectWrite or CoreText, no bytecode hinting is ever + // done. This code should be pushed into FreeType (hinted font metrics). +@@ -149,7 +149,7 @@ void SimpleFontData::platformInit(bool s + ascent = SkScalarRoundToScalar(-metrics.fAscent); + descent = SkScalarRoundToScalar(metrics.fDescent); + } +-#if OS(LINUX) || OS(ANDROID) ++#if OS(LINUX) || OS(ANDROID) || OS(BSD) + // When subpixel positioning is enabled, if the descent is rounded down, the + // descent part of the glyph may be truncated when displayed in a 'overflow: + // hidden' container. To avoid that, borrow 1 unit from the ascent when diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp new file mode 100644 index 000000000000..9676f9353e6b --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig 2017-01-26 00:49:28 UTC ++++ src/3rdparty/chromium/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp +@@ -63,7 +63,7 @@ static sk_sp typefaceForFont + + namespace blink { + +-#if OS(ANDROID) || OS(LINUX) ++#if OS(ANDROID) || OS(LINUX) || OS(BSD) + // Android special locale for retrieving the color emoji font + // based on the proposed changes in UTR #51 for introducing + // an Emoji script code: +@@ -230,7 +230,7 @@ sk_sp FontCache::createTypef + } + #endif + +-#if OS(LINUX) || OS(WIN) ++#if OS(LINUX) || OS(WIN) || OS(BSD) + // On linux if the fontManager has been overridden then we should be calling + // the embedder provided font Manager rather than calling + // SkTypeface::CreateFromName which may redirect the call to the default font diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_heap_GCInfo.cpp b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_heap_GCInfo.cpp new file mode 100644 index 000000000000..0503c5b3628b --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_heap_GCInfo.cpp @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/WebKit/Source/platform/heap/GCInfo.cpp.orig 2017-01-26 00:49:28 UTC ++++ src/3rdparty/chromium/third_party/WebKit/Source/platform/heap/GCInfo.cpp +@@ -7,6 +7,8 @@ + #include "platform/heap/Handle.h" + #include "platform/heap/Heap.h" + ++#include ++ + namespace blink { + + // GCInfo indices start from 1 for heap objects, with 0 being treated diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp index 09b881e07fe2..608e9ab05b52 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig 2017-04-11 14:08:45 UTC +--- src/3rdparty/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig 2017-01-26 00:49:28 UTC +++ src/3rdparty/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp @@ -6,6 +6,8 @@ diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_web_PopupMenuImpl.cpp b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_web_PopupMenuImpl.cpp new file mode 100644 index 000000000000..7171e8175cdc --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_WebKit_Source_web_PopupMenuImpl.cpp @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/WebKit/Source/web/PopupMenuImpl.cpp.orig 2017-01-26 00:49:28 UTC ++++ src/3rdparty/chromium/third_party/WebKit/Source/web/PopupMenuImpl.cpp +@@ -154,7 +154,7 @@ class PopupMenuImpl::ItemIterationContex + m_isInGroup(false), + m_buffer(buffer) { + DCHECK(m_buffer); +-#if OS(LINUX) ++#if OS(LINUX) || OS(BSD) + // On other platforms, the