Attachment #176813 for bug #214355

View | Details | Raw Unified | Return to bug 214355
Collapse All | Expand All




MASTER_SITES_QSCI2=	SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
			GENTOO

SIP_VERSION=		4.18
QSCI2_VERSION=		2.9.1
PYQT4_VERSION=		4.11.4
PYQT5_VERSION=		5.6

SIP_DISTNAME=		sip-${SIP_VERSION}
PYQT4_DISTNAME=		PyQt-x11-gpl-${PYQT4_VERSION}
PYQT4_DISTINFO_FILE=	${.CURDIR}/../../devel/${PYQT_RELNAME}/distinfo
PYQT5_DISTNAME=		PyQt5_gpl-${PYQT5_VERSION}
PYQT5_DISTINFO_FILE=	${.CURDIR}/../../devel/py-qt5/distinfo
QSCI2_DISTNAME=		QScintilla-gpl-${QSCI2_VERSION}


Lines 1-2 Link Here

(-)devel/py-qt5/distinfo (-2 / +3 lines)
1	SHA256 (PyQt-gpl-5.5.1.tar.gz) = 0a70ef94fbffcf674b0dde024aae2a2a7a3f5a8c42806109ff7df2c941bd8386	1	TIMESTAMP = 1477759251
2	SIZE (PyQt-gpl-5.5.1.tar.gz) = 3705749	2	SHA256 (PyQt5_gpl-5.6.tar.gz) = 2e481a6c4c41b96ed3b33449e5f9599987c63a5c8db93313bd57a6acbf20f0e1
		3	SIZE (PyQt5_gpl-5.6.tar.gz) = 3720782

Lines 3-11 Link Here

(-)devel/py-qt5-core/files/patch-configure.py (-15 / +30 lines)
3	It works by conditionally building and installing some tools (such as	3	It works by conditionally building and installing some tools (such as
4	pylupdate5 and pyrcc5), replacing the all-encompassing PyQt5.api file that	4	pylupdate5 and pyrcc5), replacing the all-encompassing PyQt5.api file that
5	depends on different modules with module-specific .api files.	5	depends on different modules with module-specific .api files.
6	--- configure.py.orig 2015-10-25 11:42:16 UTC	6
7	+++ configure.py	7	Also fixes a bug where dbus support drops multiple -I flags produced
8	@@ -1458,13 +1458,13 @@ def generate_makefiles(target_config, ve	8	by pkg-config --cflags dbus-1 .
		9
		10	--- configure.py.orig 2016-04-24 10:55:08.000000000 +0000
		11	+++ configure.py 2016-10-30 22:16:19.159104000 +0000
		12	@@ -1482,13 +1482,13 @@
9		13
10	generate_sip_module_code(target_config, verbose, no_timestamp, parts,	14	generate_sip_module_code(target_config, verbose, no_timestamp, parts,
11	tracing, 'Qt', sip_flags)	15	tracing, 'Qt', sip_flags)
Lines 24-30 Link Here
24		28
25	# Generate the pyuic5 wrapper.	29	# Generate the pyuic5 wrapper.
26	pyuic_wrapper = generate_pyuic5_wrapper(target_config)	30	pyuic_wrapper = generate_pyuic5_wrapper(target_config)
27	@@ -1483,22 +1483,6 @@ def generate_makefiles(target_config, ve	31	@@ -1507,22 +1507,6 @@
28	source_path('examples', 'quick', 'tutorials', 'extending',	32	source_path('examples', 'quick', 'tutorials', 'extending',
29	'chapter6-plugins'))	33	'chapter6-plugins'))
30		34
Lines 47-65 Link Here
47	# Generate the Python dbus module.	51	# Generate the Python dbus module.
48	if target_config.pydbus_module_dir != '':	52	if target_config.pydbus_module_dir != '':
49	mname = 'dbus'	53	mname = 'dbus'
50	@@ -1526,21 +1510,24 @@ def generate_makefiles(target_config, ve	54	@@ -1548,21 +1532,24 @@
51	out_f.write('''TEMPLATE = subdirs	55	out_f.write('''TEMPLATE = subdirs
52	CONFIG += ordered nostrip	56	CONFIG += ordered nostrip
53	SUBDIRS = %s	57	SUBDIRS = %s
54	+''' % (' '.join(subdirs)))	58	+''' % ' '.join(subdirs))
55		59
56	+ if "QtCore" in target_config.pyqt_modules:	60	+ if "QtCore" in target_config.pyqt_modules:
57	+ out_f.write('''	61	+ out_f.write('''
58	init_py.files = %s	62	init_py.files = %s
59	init_py.path = %s/PyQt5	63	init_py.path = %s
60	INSTALLS += init_py	64	INSTALLS += init_py
61	-''' % (' '.join(subdirs), source_path('__init__.py'), target_config.pyqt_module_dir))	65	-''' % (' '.join(subdirs), source_path('__init__.py'), qmake_quote(target_config.pyqt_module_dir + '/PyQt5')))
62	+''' % (source_path('__init__.py'), target_config.pyqt_module_dir))	66	+''' % (source_path('__init__.py'), qmake_quote(target_config.pyqt_module_dir + '/PyQt5')))
63		67
64	- # Install the uic module and the pyuic5 wrapper.	68	- # Install the uic module and the pyuic5 wrapper.
65	- out_f.write('''	69	- out_f.write('''
Lines 66-74 Link Here
66	+ # Install the uic module and the pyuic5 wrapper.	70	+ # Install the uic module and the pyuic5 wrapper.
67	+ out_f.write('''	71	+ out_f.write('''
68	uic_package.files = %s	72	uic_package.files = %s
69	uic_package.path = %s/PyQt5	73	uic_package.path = %s
70	INSTALLS += uic_package	74	INSTALLS += uic_package
71	''' % (source_path('pyuic', 'uic'), target_config.pyqt_module_dir))	75	''' % (source_path('pyuic', 'uic'), qmake_quote(target_config.pyqt_module_dir + '/PyQt5')))
72		76
73	- if not target_config.no_tools:	77	- if not target_config.no_tools:
74	- out_f.write('''	78	- out_f.write('''
Lines 77-83 Link Here
77	pyuic5.files = %s	81	pyuic5.files = %s
78	pyuic5.path = %s	82	pyuic5.path = %s
79	INSTALLS += pyuic5	83	INSTALLS += pyuic5
80	@@ -1548,11 +1535,12 @@ INSTALLS += pyuic5	84	@@ -1579,11 +1566,12 @@
81		85
82	# Install the QScintilla .api file.	86	# Install the QScintilla .api file.
83	if target_config.qsci_api:	87	if target_config.qsci_api:
Lines 85-94 Link Here
85	out_f.write('''	89	out_f.write('''
86	-qscintilla_api.files = PyQt5.api	90	-qscintilla_api.files = PyQt5.api
87	+qscintilla_api.files = %s	91	+qscintilla_api.files = %s
88	qscintilla_api.path = %s/api/python	92	qscintilla_api.path = %s
89	INSTALLS += qscintilla_api	93	INSTALLS += qscintilla_api
90	-''' % target_config.qsci_api_dir)	94	-''' % qmake_quote(target_config.qsci_api_dir + '/api/python'))
91	+''' % (api_list, target_config.qsci_api_dir))	95	+''' % (api_list, qmake_quote(target_config.qsci_api_dir + '/api/python')))
92		96
93	out_f.close()	97	out_f.close()
94		98
		99	@@ -2140,7 +2128,9 @@
		100	else:
		101	dlist = target_config.dbus_inc_dirs
		102
		103	- target_config.dbus_inc_dirs = []
		104	+ # Don't reset dbus_inc_dirs, because it will forget the flags
		105	+ # found for dbus, above (which might require multiple -I flags).
		106	+ # target_config.dbus_inc_dirs = []
		107
		108	for d in dlist:
		109	if os.access(os.path.join(d, 'dbus', 'dbus-python.h'), os.F_OK):

Lines 213-218 Link Here

(-)devel/py-qt5-core/pkg-plist (+1 lines)
213	%%PYQT_SIPDIR%%/QtCore/quuid.sip	213	%%PYQT_SIPDIR%%/QtCore/quuid.sip
214	%%PYQT_SIPDIR%%/QtCore/qvariant.sip	214	%%PYQT_SIPDIR%%/QtCore/qvariant.sip
215	%%PYQT_SIPDIR%%/QtCore/qvariantanimation.sip	215	%%PYQT_SIPDIR%%/QtCore/qvariantanimation.sip
		216	%%PYQT_SIPDIR%%/QtCore/qversionnumber.sip
216	%%PYQT_SIPDIR%%/QtCore/qwaitcondition.sip	217	%%PYQT_SIPDIR%%/QtCore/qwaitcondition.sip
217	%%PYQT_SIPDIR%%/QtCore/qwineventnotifier.sip	218	%%PYQT_SIPDIR%%/QtCore/qwineventnotifier.sip
218	%%PYQT_SIPDIR%%/QtCore/qxmlstream.sip	219	%%PYQT_SIPDIR%%/QtCore/qxmlstream.sip

Lines 1-2 Link Here

(-)devel/py-sip/distinfo (-2 / +3 lines)
1	SHA256 (sip-4.17.tar.gz) = 603026822adf8673fca6e0ea20b02c3c4a2dccb309647656f7269adc8de89060	1	TIMESTAMP = 1473848835
2	SIZE (sip-4.17.tar.gz) = 959835	2	SHA256 (sip-4.18.tar.gz) = f1dc5c81c07a9ad97edcd4a0af964a41e420024ba7ca165afd2b351efd249cb6
		3	SIZE (sip-4.18.tar.gz) = 991980

Lines 1-6 Link Here

(-)devel/py-sip/pkg-plist (+1 lines)
1	bin/sip	1	bin/sip
2	%%PYTHON_INCLUDEDIR%%/sip.h	2	%%PYTHON_INCLUDEDIR%%/sip.h
3	%%PYTHON_SITELIBDIR%%/sip.so	3	%%PYTHON_SITELIBDIR%%/sip.so
		4	%%PYTHON_SITELIBDIR%%/sip.pyi
4	%%PYTHON_SITELIBDIR%%/sipconfig.py	5	%%PYTHON_SITELIBDIR%%/sipconfig.py
5	%%PYTHON_SITELIBDIR%%/sipconfig.pyc	6	%%PYTHON_SITELIBDIR%%/sipconfig.pyc
6	%%PYTHON_SITELIBDIR%%/sipconfig.pyo	7	%%PYTHON_SITELIBDIR%%/sipconfig.pyo

Lines 1068-1074 Link Here

(-)misc/py-qt5-demo/pkg-plist (-1 lines)
1068	%%EXAMPLESDIR%%/webkit/domtraversal/ui_window.pyc	1068	%%EXAMPLESDIR%%/webkit/domtraversal/ui_window.pyc
1069	%%EXAMPLESDIR%%/webkit/domtraversal/ui_window.pyo	1069	%%EXAMPLESDIR%%/webkit/domtraversal/ui_window.pyo
1070	%%EXAMPLESDIR%%/webkit/domtraversal/window.ui	1070	%%EXAMPLESDIR%%/webkit/domtraversal/window.ui
1071	%%EXAMPLESDIR%%/webkit/fancybrowser/__pycache__/jquery_rc.cpython-34.pyc
1072	%%EXAMPLESDIR%%/webkit/fancybrowser/fancybrowser.py	1071	%%EXAMPLESDIR%%/webkit/fancybrowser/fancybrowser.py
1073	%%EXAMPLESDIR%%/webkit/fancybrowser/fancybrowser.pyc	1072	%%EXAMPLESDIR%%/webkit/fancybrowser/fancybrowser.pyc
1074	%%EXAMPLESDIR%%/webkit/fancybrowser/fancybrowser.pyo	1073	%%EXAMPLESDIR%%/webkit/fancybrowser/fancybrowser.pyo




%%DOCSDIR%%/html/_sources/api/qqmlpropertyvaluesource.txt
%%DOCSDIR%%/html/_sources/api/qqmlscriptstring.txt
%%DOCSDIR%%/html/_sources/api/qquaternion.txt
%%DOCSDIR%%/html/_sources/api/qquickasyncimageprovider.txt
%%DOCSDIR%%/html/_sources/api/qquickframebufferobject.txt
%%DOCSDIR%%/html/_sources/api/qquickimageprovider.txt
%%DOCSDIR%%/html/_sources/api/qquickimageresponse.txt
%%DOCSDIR%%/html/_sources/api/qquickitem.txt
%%DOCSDIR%%/html/_sources/api/qquickitemgrabresult.txt
%%DOCSDIR%%/html/_sources/api/qquickpainteditem.txt

%%DOCSDIR%%/html/_sources/api/qregularexpressionvalidator.txt
%%DOCSDIR%%/html/_sources/api/qresizeevent.txt
%%DOCSDIR%%/html/_sources/api/qresource.txt
%%DOCSDIR%%/html/_sources/api/qrgba64.txt
%%DOCSDIR%%/html/_sources/api/qrotationfilter.txt
%%DOCSDIR%%/html/_sources/api/qrotationreading.txt
%%DOCSDIR%%/html/_sources/api/qrotationsensor.txt

%%DOCSDIR%%/html/_sources/api/qwebelement.txt
%%DOCSDIR%%/html/_sources/api/qwebelementcollection.txt
%%DOCSDIR%%/html/_sources/api/qwebenginecertificateerror.txt
%%DOCSDIR%%/html/_sources/api/qwebenginecookiestore.txt
%%DOCSDIR%%/html/_sources/api/qwebenginedownloaditem.txt
%%DOCSDIR%%/html/_sources/api/qwebenginehistory.txt
%%DOCSDIR%%/html/_sources/api/qwebenginehistoryitem.txt

%%DOCSDIR%%/html/_sources/api/qwebenginescript.txt
%%DOCSDIR%%/html/_sources/api/qwebenginescriptcollection.txt
%%DOCSDIR%%/html/_sources/api/qwebenginesettings.txt
%%DOCSDIR%%/html/_sources/api/qwebengineurlrequestinfo.txt
%%DOCSDIR%%/html/_sources/api/qwebengineurlrequestinterceptor.txt
%%DOCSDIR%%/html/_sources/api/qwebengineurlrequestjob.txt
%%DOCSDIR%%/html/_sources/api/qwebengineurlschemehandler.txt
%%DOCSDIR%%/html/_sources/api/qwebengineview.txt
%%DOCSDIR%%/html/_sources/api/qwebframe.txt
%%DOCSDIR%%/html/_sources/api/qwebhistory.txt

%%DOCSDIR%%/html/api/qqmlpropertyvaluesource.html
%%DOCSDIR%%/html/api/qqmlscriptstring.html
%%DOCSDIR%%/html/api/qquaternion.html
%%DOCSDIR%%/html/api/qquickasyncimageprovider.html
%%DOCSDIR%%/html/api/qquickframebufferobject.html
%%DOCSDIR%%/html/api/qquickimageprovider.html
%%DOCSDIR%%/html/api/qquickimageresponse.html
%%DOCSDIR%%/html/api/qquickitem.html
%%DOCSDIR%%/html/api/qquickitemgrabresult.html
%%DOCSDIR%%/html/api/qquickpainteditem.html

%%DOCSDIR%%/html/api/qregularexpressionvalidator.html
%%DOCSDIR%%/html/api/qresizeevent.html
%%DOCSDIR%%/html/api/qresource.html
%%DOCSDIR%%/html/api/qrgba64.html
%%DOCSDIR%%/html/api/qrotationfilter.html
%%DOCSDIR%%/html/api/qrotationreading.html
%%DOCSDIR%%/html/api/qrotationsensor.html

%%DOCSDIR%%/html/api/qwebelement.html
%%DOCSDIR%%/html/api/qwebelementcollection.html
%%DOCSDIR%%/html/api/qwebenginecertificateerror.html
%%DOCSDIR%%/html/api/qwebenginecookiestore.html
%%DOCSDIR%%/html/api/qwebenginedownloaditem.html
%%DOCSDIR%%/html/api/qwebenginehistory.html
%%DOCSDIR%%/html/api/qwebenginehistoryitem.html

%%DOCSDIR%%/html/api/qwebenginescript.html
%%DOCSDIR%%/html/api/qwebenginescriptcollection.html
%%DOCSDIR%%/html/api/qwebenginesettings.html
%%DOCSDIR%%/html/api/qwebengineurlrequestinfo.html
%%DOCSDIR%%/html/api/qwebengineurlrequestinterceptor.html
%%DOCSDIR%%/html/api/qwebengineurlrequestjob.html
%%DOCSDIR%%/html/api/qwebengineurlschemehandler.html
%%DOCSDIR%%/html/api/qwebengineview.html
%%DOCSDIR%%/html/api/qwebframe.html
%%DOCSDIR%%/html/api/qwebhistory.html

Lines 65-70 Link Here

(-)x11-toolkits/py-qt5-gui/pkg-plist (+1 lines)
65	%%PYQT_SIPDIR%%/QtGui/qrawfont.sip	65	%%PYQT_SIPDIR%%/QtGui/qrawfont.sip
66	%%PYQT_SIPDIR%%/QtGui/qregion.sip	66	%%PYQT_SIPDIR%%/QtGui/qregion.sip
67	%%PYQT_SIPDIR%%/QtGui/qrgb.sip	67	%%PYQT_SIPDIR%%/QtGui/qrgb.sip
		68	%%PYQT_SIPDIR%%/QtGui/qrgba64.sip
68	%%PYQT_SIPDIR%%/QtGui/qscreen.sip	69	%%PYQT_SIPDIR%%/QtGui/qscreen.sip
69	%%PYQT_SIPDIR%%/QtGui/qsessionmanager.sip	70	%%PYQT_SIPDIR%%/QtGui/qsessionmanager.sip
70	%%PYQT_SIPDIR%%/QtGui/qstandarditemmodel.sip	71	%%PYQT_SIPDIR%%/QtGui/qstandarditemmodel.sip

Return to bug 214355

Lines 61-75 Link Here

(-)Mk/Uses/pyqt.mk (-3 / +3 lines)
61	MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \	61	MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \
62	GENTOO	62	GENTOO
63		63
64	SIP_VERSION= 4.17	64	SIP_VERSION= 4.18
65	QSCI2_VERSION= 2.9.1	65	QSCI2_VERSION= 2.9.1
66	PYQT4_VERSION= 4.11.4	66	PYQT4_VERSION= 4.11.4
67	PYQT5_VERSION= 5.5.1	67	PYQT5_VERSION= 5.6
68		68
69	SIP_DISTNAME= sip-${SIP_VERSION}	69	SIP_DISTNAME= sip-${SIP_VERSION}
70	PYQT4_DISTNAME= PyQt-x11-gpl-${PYQT4_VERSION}	70	PYQT4_DISTNAME= PyQt-x11-gpl-${PYQT4_VERSION}
71	PYQT4_DISTINFO_FILE= ${.CURDIR}/../../devel/${PYQT_RELNAME}/distinfo	71	PYQT4_DISTINFO_FILE= ${.CURDIR}/../../devel/${PYQT_RELNAME}/distinfo
72	PYQT5_DISTNAME= PyQt-gpl-${PYQT5_VERSION}	72	PYQT5_DISTNAME= PyQt5_gpl-${PYQT5_VERSION}
73	PYQT5_DISTINFO_FILE= ${.CURDIR}/../../devel/py-qt5/distinfo	73	PYQT5_DISTINFO_FILE= ${.CURDIR}/../../devel/py-qt5/distinfo
74	QSCI2_DISTNAME= QScintilla-gpl-${QSCI2_VERSION}	74	QSCI2_DISTNAME= QScintilla-gpl-${QSCI2_VERSION}
75		75

Lines 610-617 Link Here

(-)misc/py-qt5-doc/pkg-plist (+16 lines)
610	%%DOCSDIR%%/html/_sources/api/qqmlpropertyvaluesource.txt	610	%%DOCSDIR%%/html/_sources/api/qqmlpropertyvaluesource.txt
611	%%DOCSDIR%%/html/_sources/api/qqmlscriptstring.txt	611	%%DOCSDIR%%/html/_sources/api/qqmlscriptstring.txt
612	%%DOCSDIR%%/html/_sources/api/qquaternion.txt	612	%%DOCSDIR%%/html/_sources/api/qquaternion.txt
		613	%%DOCSDIR%%/html/_sources/api/qquickasyncimageprovider.txt
613	%%DOCSDIR%%/html/_sources/api/qquickframebufferobject.txt	614	%%DOCSDIR%%/html/_sources/api/qquickframebufferobject.txt
614	%%DOCSDIR%%/html/_sources/api/qquickimageprovider.txt	615	%%DOCSDIR%%/html/_sources/api/qquickimageprovider.txt
		616	%%DOCSDIR%%/html/_sources/api/qquickimageresponse.txt
615	%%DOCSDIR%%/html/_sources/api/qquickitem.txt	617	%%DOCSDIR%%/html/_sources/api/qquickitem.txt
616	%%DOCSDIR%%/html/_sources/api/qquickitemgrabresult.txt	618	%%DOCSDIR%%/html/_sources/api/qquickitemgrabresult.txt
617	%%DOCSDIR%%/html/_sources/api/qquickpainteditem.txt	619	%%DOCSDIR%%/html/_sources/api/qquickpainteditem.txt
Lines 640-645 Link Here
640	%%DOCSDIR%%/html/_sources/api/qregularexpressionvalidator.txt	642	%%DOCSDIR%%/html/_sources/api/qregularexpressionvalidator.txt
641	%%DOCSDIR%%/html/_sources/api/qresizeevent.txt	643	%%DOCSDIR%%/html/_sources/api/qresizeevent.txt
642	%%DOCSDIR%%/html/_sources/api/qresource.txt	644	%%DOCSDIR%%/html/_sources/api/qresource.txt
		645	%%DOCSDIR%%/html/_sources/api/qrgba64.txt
643	%%DOCSDIR%%/html/_sources/api/qrotationfilter.txt	646	%%DOCSDIR%%/html/_sources/api/qrotationfilter.txt
644	%%DOCSDIR%%/html/_sources/api/qrotationreading.txt	647	%%DOCSDIR%%/html/_sources/api/qrotationreading.txt
645	%%DOCSDIR%%/html/_sources/api/qrotationsensor.txt	648	%%DOCSDIR%%/html/_sources/api/qrotationsensor.txt
Lines 889-894 Link Here
889	%%DOCSDIR%%/html/_sources/api/qwebelement.txt	892	%%DOCSDIR%%/html/_sources/api/qwebelement.txt
890	%%DOCSDIR%%/html/_sources/api/qwebelementcollection.txt	893	%%DOCSDIR%%/html/_sources/api/qwebelementcollection.txt
891	%%DOCSDIR%%/html/_sources/api/qwebenginecertificateerror.txt	894	%%DOCSDIR%%/html/_sources/api/qwebenginecertificateerror.txt
		895	%%DOCSDIR%%/html/_sources/api/qwebenginecookiestore.txt
892	%%DOCSDIR%%/html/_sources/api/qwebenginedownloaditem.txt	896	%%DOCSDIR%%/html/_sources/api/qwebenginedownloaditem.txt
893	%%DOCSDIR%%/html/_sources/api/qwebenginehistory.txt	897	%%DOCSDIR%%/html/_sources/api/qwebenginehistory.txt
894	%%DOCSDIR%%/html/_sources/api/qwebenginehistoryitem.txt	898	%%DOCSDIR%%/html/_sources/api/qwebenginehistoryitem.txt
Lines 897-902 Link Here
897	%%DOCSDIR%%/html/_sources/api/qwebenginescript.txt	901	%%DOCSDIR%%/html/_sources/api/qwebenginescript.txt
898	%%DOCSDIR%%/html/_sources/api/qwebenginescriptcollection.txt	902	%%DOCSDIR%%/html/_sources/api/qwebenginescriptcollection.txt
899	%%DOCSDIR%%/html/_sources/api/qwebenginesettings.txt	903	%%DOCSDIR%%/html/_sources/api/qwebenginesettings.txt
		904	%%DOCSDIR%%/html/_sources/api/qwebengineurlrequestinfo.txt
		905	%%DOCSDIR%%/html/_sources/api/qwebengineurlrequestinterceptor.txt
		906	%%DOCSDIR%%/html/_sources/api/qwebengineurlrequestjob.txt
		907	%%DOCSDIR%%/html/_sources/api/qwebengineurlschemehandler.txt
900	%%DOCSDIR%%/html/_sources/api/qwebengineview.txt	908	%%DOCSDIR%%/html/_sources/api/qwebengineview.txt
901	%%DOCSDIR%%/html/_sources/api/qwebframe.txt	909	%%DOCSDIR%%/html/_sources/api/qwebframe.txt
902	%%DOCSDIR%%/html/_sources/api/qwebhistory.txt	910	%%DOCSDIR%%/html/_sources/api/qwebhistory.txt
Lines 1623-1630 Link Here
1623	%%DOCSDIR%%/html/api/qqmlpropertyvaluesource.html	1631	%%DOCSDIR%%/html/api/qqmlpropertyvaluesource.html
1624	%%DOCSDIR%%/html/api/qqmlscriptstring.html	1632	%%DOCSDIR%%/html/api/qqmlscriptstring.html
1625	%%DOCSDIR%%/html/api/qquaternion.html	1633	%%DOCSDIR%%/html/api/qquaternion.html
		1634	%%DOCSDIR%%/html/api/qquickasyncimageprovider.html
1626	%%DOCSDIR%%/html/api/qquickframebufferobject.html	1635	%%DOCSDIR%%/html/api/qquickframebufferobject.html
1627	%%DOCSDIR%%/html/api/qquickimageprovider.html	1636	%%DOCSDIR%%/html/api/qquickimageprovider.html
		1637	%%DOCSDIR%%/html/api/qquickimageresponse.html
1628	%%DOCSDIR%%/html/api/qquickitem.html	1638	%%DOCSDIR%%/html/api/qquickitem.html
1629	%%DOCSDIR%%/html/api/qquickitemgrabresult.html	1639	%%DOCSDIR%%/html/api/qquickitemgrabresult.html
1630	%%DOCSDIR%%/html/api/qquickpainteditem.html	1640	%%DOCSDIR%%/html/api/qquickpainteditem.html
Lines 1653-1658 Link Here
1653	%%DOCSDIR%%/html/api/qregularexpressionvalidator.html	1663	%%DOCSDIR%%/html/api/qregularexpressionvalidator.html
1654	%%DOCSDIR%%/html/api/qresizeevent.html	1664	%%DOCSDIR%%/html/api/qresizeevent.html
1655	%%DOCSDIR%%/html/api/qresource.html	1665	%%DOCSDIR%%/html/api/qresource.html
		1666	%%DOCSDIR%%/html/api/qrgba64.html
1656	%%DOCSDIR%%/html/api/qrotationfilter.html	1667	%%DOCSDIR%%/html/api/qrotationfilter.html
1657	%%DOCSDIR%%/html/api/qrotationreading.html	1668	%%DOCSDIR%%/html/api/qrotationreading.html
1658	%%DOCSDIR%%/html/api/qrotationsensor.html	1669	%%DOCSDIR%%/html/api/qrotationsensor.html
Lines 1902-1907 Link Here
1902	%%DOCSDIR%%/html/api/qwebelement.html	1913	%%DOCSDIR%%/html/api/qwebelement.html
1903	%%DOCSDIR%%/html/api/qwebelementcollection.html	1914	%%DOCSDIR%%/html/api/qwebelementcollection.html
1904	%%DOCSDIR%%/html/api/qwebenginecertificateerror.html	1915	%%DOCSDIR%%/html/api/qwebenginecertificateerror.html
		1916	%%DOCSDIR%%/html/api/qwebenginecookiestore.html
1905	%%DOCSDIR%%/html/api/qwebenginedownloaditem.html	1917	%%DOCSDIR%%/html/api/qwebenginedownloaditem.html
1906	%%DOCSDIR%%/html/api/qwebenginehistory.html	1918	%%DOCSDIR%%/html/api/qwebenginehistory.html
1907	%%DOCSDIR%%/html/api/qwebenginehistoryitem.html	1919	%%DOCSDIR%%/html/api/qwebenginehistoryitem.html
Lines 1910-1915 Link Here
1910	%%DOCSDIR%%/html/api/qwebenginescript.html	1922	%%DOCSDIR%%/html/api/qwebenginescript.html
1911	%%DOCSDIR%%/html/api/qwebenginescriptcollection.html	1923	%%DOCSDIR%%/html/api/qwebenginescriptcollection.html
1912	%%DOCSDIR%%/html/api/qwebenginesettings.html	1924	%%DOCSDIR%%/html/api/qwebenginesettings.html
		1925	%%DOCSDIR%%/html/api/qwebengineurlrequestinfo.html
		1926	%%DOCSDIR%%/html/api/qwebengineurlrequestinterceptor.html
		1927	%%DOCSDIR%%/html/api/qwebengineurlrequestjob.html
		1928	%%DOCSDIR%%/html/api/qwebengineurlschemehandler.html
1913	%%DOCSDIR%%/html/api/qwebengineview.html	1929	%%DOCSDIR%%/html/api/qwebengineview.html
1914	%%DOCSDIR%%/html/api/qwebframe.html	1930	%%DOCSDIR%%/html/api/qwebframe.html
1915	%%DOCSDIR%%/html/api/qwebhistory.html	1931	%%DOCSDIR%%/html/api/qwebhistory.html